diff --git a/aem-start.sh b/aem-start.sh
index 569d0b6..5e75792 100644
--- a/aem-start.sh
+++ b/aem-start.sh
@@ -7,8 +7,10 @@ aem_stop() {
 
 trap aem_stop INT TERM EXIT
 
-ln -sf /proc/1/fd/1 /opt/aem/home/var/instance/${RUNMODE}/crx-quickstart/logs/error.log
+# link stdout to container output
+ln -sf /proc/1/fd/1 /opt/aem/home/var/instance/${RUNMODE}/crx-quickstart/logs/stdout.log
 
 /usr/local/bin/aem instance --instance-${RUNMODE} start
 
-(cat)
\ No newline at end of file
+# tail error log in subshell to keep container running and allow for graceful shutdown
+(tail -F /opt/aem/home/var/instance/${RUNMODE}/crx-quickstart/logs/error.log)
diff --git a/aem/default/etc/aem.yml b/aem/default/etc/aem.yml
index 7ce5a53..513f1e6 100644
--- a/aem/default/etc/aem.yml
+++ b/aem/default/etc/aem.yml
@@ -43,4 +43,5 @@ instance:
         - --add-opens=java.base/java.net=ALL-UNNAMED
         - -Dnashorn.args=--no-deprecation-warning"
         - -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=[[.Env.AEM_PUBLISH_DEBUG_ADDR | default "0.0.0.0:14503" ]]
-
+  check:
+    done_threshold: 1