diff --git a/Dockerfile.zammad b/Dockerfile.zammad
index a089eec..a61dea1 100644
--- a/Dockerfile.zammad
+++ b/Dockerfile.zammad
@@ -3,7 +3,6 @@ MAINTAINER Zammad <info@zammad.org>
 ARG BUILD_DATE
 
 ENV ZAMMAD_DIR /home/zammad
-ENV ZAMMAD_DEBUG no
 ENV RAILS_ENV production
 ENV RAILS_SERVER puma
 ENV GIT_URL https://github.com/zammad/zammad.git
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 63fe679..a05a688 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -30,12 +30,4 @@ if [ "$1" = 'zammad' ]; then
 	bundle exec unicorn -p 3000 -c config/unicorn.rb -E ${RAILS_ENV}
     fi
 
-    if [ "${ZAMMAD_DEBUG}" == "yes" ]; then
-	# keepalive if error
-	while true; do
-    	    echo "debugging..."
-    	    sleep 600
-	done
-    fi
-
 fi