diff --git a/docker/images/davrods/Dockerfile b/docker/images/davrods/Dockerfile
index 4eb6559d4..7fbf6fdd1 100644
--- a/docker/images/davrods/Dockerfile
+++ b/docker/images/davrods/Dockerfile
@@ -62,4 +62,5 @@ COPY footer.html /etc/httpd/irods/footer.html
 VOLUME [ "/sys/fs/cgroup" ]
 COPY davrods_init.sh /var/lib/irods/scripts/davrods_init.sh
 RUN chmod 0755 /var/lib/irods/scripts/davrods_init.sh
-CMD ["/var/lib/irods/scripts/davrods_init.sh", "${TAG}"]
+ENV TAG=${TAG}
+CMD exec /var/lib/irods/scripts/davrods_init.sh $TAG
diff --git a/docker/images/yoda_eus/Dockerfile b/docker/images/yoda_eus/Dockerfile
index a2544f9dd..2fa2fcde2 100644
--- a/docker/images/yoda_eus/Dockerfile
+++ b/docker/images/yoda_eus/Dockerfile
@@ -71,4 +71,5 @@ RUN cp -Rdp /var/www/extuser /var/www/extuser-copy
 VOLUME [ "/sys/fs/cgroup" ]
 COPY yoda_eus_init.sh /var/lib/irods/scripts/yoda_eus_init.sh
 RUN chmod 0755 /var/lib/irods/scripts/yoda_eus_init.sh
-CMD ["/var/lib/irods/scripts/yoda_eus_init.sh", "${TAG}"]
+ENV TAG=${TAG}
+CMD exec /var/lib/irods/scripts/yoda_eus_init.sh $TAG
diff --git a/docker/images/yoda_irods_icat/Dockerfile b/docker/images/yoda_irods_icat/Dockerfile
index b3e8fb29e..a841c7711 100644
--- a/docker/images/yoda_irods_icat/Dockerfile
+++ b/docker/images/yoda_irods_icat/Dockerfile
@@ -183,4 +183,5 @@ COPY irods-icat-init.sh /var/lib/irods/scripts/irods-icat-init.sh
 RUN chmod 0755 /var/lib/irods/scripts/irods-icat-init.sh
 
 VOLUME [ "/sys/fs/cgroup" ]
-CMD ["/var/lib/irods/scripts/irods-icat-init.sh", "${TAG}"]
+ENV TAG=${TAG}
+CMD exec /var/lib/irods/scripts/irods-icat-init.sh $TAG
diff --git a/docker/images/yoda_portal/Dockerfile b/docker/images/yoda_portal/Dockerfile
index a5b06681f..e460f710d 100644
--- a/docker/images/yoda_portal/Dockerfile
+++ b/docker/images/yoda_portal/Dockerfile
@@ -56,4 +56,5 @@ RUN cp -Rdp /var/www/yoda /var/www/yoda-copy
 VOLUME [ "/sys/fs/cgroup" ]
 COPY yoda_portal_init.sh /var/lib/irods/scripts/yoda_portal_init.sh
 RUN chmod 0755 /var/lib/irods/scripts/yoda_portal_init.sh
-CMD ["/var/lib/irods/scripts/yoda_portal_init.sh", "${TAG}"]
+ENV TAG=${TAG}
+CMD exec /var/lib/irods/scripts/yoda_portal_init.sh $TAG
diff --git a/docker/images/yoda_public/Dockerfile b/docker/images/yoda_public/Dockerfile
index d94167630..83c12efe8 100644
--- a/docker/images/yoda_public/Dockerfile
+++ b/docker/images/yoda_public/Dockerfile
@@ -97,4 +97,5 @@ RUN cp -Rdp /var/www/moai/yoda-moai /var/www/moai/yoda-moai-copy
 VOLUME [ "/sys/fs/cgroup" ]
 COPY yoda_public_init.sh /yoda_public_init.sh
 RUN chmod 0755 /yoda_public_init.sh
-CMD ["/yoda_public_init.sh", "${TAG}"]
+ENV TAG=${TAG}
+CMD exec /yoda_public_init.sh $TAG
diff --git a/docker/images/yoda_web_mock/Dockerfile b/docker/images/yoda_web_mock/Dockerfile
index 38efce94b..ee469e7ce 100644
--- a/docker/images/yoda_web_mock/Dockerfile
+++ b/docker/images/yoda_web_mock/Dockerfile
@@ -59,4 +59,6 @@ RUN cp -Rdp /var/www/webmock/yoda-web-mock /var/www/webmock/yoda-web-mock-copy
 VOLUME [ "/sys/fs/cgroup" ]
 COPY yoda_web_mock_init.sh /yoda_web_mock_init.sh
 RUN chmod 0755 /yoda_web_mock_init.sh
-CMD ["/yoda_web_mock_init.sh", "${TAG}"]
+ENV TAG=${TAG}
+CMD exec /yoda_web_mock_init.sh $TAG
+