diff --git a/deployment/ansible/development/group_vars/all.sample.yml b/deployment/ansible/development/group_vars/all.sample.yml
index 6d811b8..b2fea99 100644
--- a/deployment/ansible/development/group_vars/all.sample.yml
+++ b/deployment/ansible/development/group_vars/all.sample.yml
@@ -20,7 +20,7 @@ inasafe:
   depth: 1
 
 inasafe_headless_worker:
-  command: /docker-entrypoint.sh dev
+  command: dev
   # Settings to specify broker url manually
   broker_url:
   # Optional settings to specify path mount
diff --git a/deployment/ansible/development/group_vars/all.travis.yml b/deployment/ansible/development/group_vars/all.travis.yml
index ac04a70..7d5bd3b 100644
--- a/deployment/ansible/development/group_vars/all.travis.yml
+++ b/deployment/ansible/development/group_vars/all.travis.yml
@@ -20,7 +20,7 @@ inasafe:
   depth: 1
 
 inasafe_headless_worker:
-  command: /docker-entrypoint.sh prod inasafe-headless-worker
+  command: prod inasafe-headless-worker
   environment:
     task_always_eager: "${TASK_ALWAYS_EAGER}"
     on_travis: "${ON_TRAVIS}"
diff --git a/deployment/docker-headless/Dockerfile b/deployment/docker-headless/Dockerfile
index 4b3a9ac..21275ed 100644
--- a/deployment/docker-headless/Dockerfile
+++ b/deployment/docker-headless/Dockerfile
@@ -1,5 +1,5 @@
 #--------- Generic stuff all our Dockerfiles should start with so we get caching ------------
-FROM kartoza/qgis-desktop:LTR
+FROM kartoza/qgis-desktop:2.18
 
 RUN apt-get -y update; apt-get -y --force-yes install pwgen git inotify-tools
 
@@ -37,4 +37,5 @@ ADD docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
 
 # Environment variable
-CMD ["/docker-entrypoint.sh", "prod", "inasafe-headless-worker"]
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["prod", "inasafe-headless-worker"]
diff --git a/deployment/docker-headless/docker-entrypoint.sh b/deployment/docker-headless/docker-entrypoint.sh
index 9669697..d3c7622 100644
--- a/deployment/docker-headless/docker-entrypoint.sh
+++ b/deployment/docker-headless/docker-entrypoint.sh
@@ -13,3 +13,5 @@ if [ $# -eq 2 ] && [ $1 = "prod" ] && [ $2 = "inasafe-headless-worker" ]; then
 elif [ $# -eq 1 ] && [ $1 = "dev" ]; then
 	/usr/sbin/sshd -D
 fi
+
+exec "$@"
diff --git a/deployment/production/docker/headless/Dockerfile b/deployment/production/docker/headless/Dockerfile
index 1f093d1..53abbf5 100644
--- a/deployment/production/docker/headless/Dockerfile
+++ b/deployment/production/docker/headless/Dockerfile
@@ -1,5 +1,5 @@
 #--------- Generic stuff all our Dockerfiles should start with so we get caching ------------
-FROM kartoza/qgis-desktop:LTR
+FROM kartoza/qgis-desktop:2.18
 
 RUN apt-get -y update; apt-get -y --force-yes install pwgen git inotify-tools
 
@@ -33,4 +33,5 @@ ARG INASAFE_HEADLESS_TAG=develop
 RUN git clone --branch ${INASAFE_HEADLESS_TAG} --depth 1 https://github.com/inasafe/inasafe-headless.git source
 RUN ln -s source/src/headless headless
 
-CMD ["/docker-entrypoint.sh"]
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["prod", "inasafe-headless-worker"]
diff --git a/deployment/production/docker/headless/docker-entrypoint.sh b/deployment/production/docker/headless/docker-entrypoint.sh
index 5fab147..c0fafb3 100644
--- a/deployment/production/docker/headless/docker-entrypoint.sh
+++ b/deployment/production/docker/headless/docker-entrypoint.sh
@@ -8,4 +8,10 @@ done
 
 cp -n /home/app/headless/celeryconfig_sample.py /home/app/headless/celeryconfig.py
 
-/usr/local/bin/celery -A headless.celery_app worker -l info -Q inasafe-headless -n inasafe-headless.%h
+if [ $# -eq 2 ] && [ $1 = "prod" ] && [ $2 = "inasafe-headless-worker" ]; then
+    /usr/local/bin/celery -A headless.celery_app worker -l info -Q inasafe-headless -n inasafe-headless.%h
+elif [ $# -eq 1 ]; then
+	/usr/local/bin/celery -A headless.celery_app worker -l info -Q inasafe-headless -n inasafe-headless.%h
+fi
+
+exec "$@"