diff --git a/templates/drupal-cron/default.Dockerfile b/templates/drupal-cron/default.Dockerfile
index 4c93d72..4eebb8c 100644
--- a/templates/drupal-cron/default.Dockerfile
+++ b/templates/drupal-cron/default.Dockerfile
@@ -15,8 +15,8 @@ ENV APP_ROOT=/var/www/html
 ENV DOCROOT_SUBDIR=drupal
 
 ENV DRUPAL_SITE=default
-ENV DRUPAL_ROOT=${APP_ROOT}/${DRUPAL_ROOT}
-ENV DRUPAL_SITE_DIR=$(DRUPAL_ROOT)/sites/$(DRUPAL_SITE)
+ENV DRUPAL_ROOT=${APP_ROOT}/${DOCROOT_SUBDIR}
+ENV DRUPAL_SITE_DIR=${DRUPAL_ROOT}/sites/${DRUPAL_SITE}
 ENV DRUPAL_FILES_DIR=${DRUPAL_SITE_DIR}/files
 ENV DRUPAL_FILES_SYNC_SALT=not-in-use-but-required
 ENV DRUPAL_PHP_STORAGE_DIR=/tmp/php
diff --git a/templates/drupal-php/default.Dockerfile b/templates/drupal-php/default.Dockerfile
index 756034f..0bbf11d 100644
--- a/templates/drupal-php/default.Dockerfile
+++ b/templates/drupal-php/default.Dockerfile
@@ -12,8 +12,8 @@ ENV APP_ROOT=/var/www/html
 ENV DOCROOT_SUBDIR=drupal
 
 ENV DRUPAL_SITE=default
-ENV DRUPAL_ROOT=${APP_ROOT}/${DRUPAL_ROOT}
-ENV DRUPAL_SITE_DIR=$(DRUPAL_ROOT)/sites/$(DRUPAL_SITE)
+ENV DRUPAL_ROOT=${APP_ROOT}/${DOCROOT_SUBDIR}
+ENV DRUPAL_SITE_DIR=${DRUPAL_ROOT}/sites/${DRUPAL_SITE}
 ENV DRUPAL_FILES_DIR=${DRUPAL_SITE_DIR}/files
 ENV DRUPAL_FILES_SYNC_SALT=not-in-use-but-required
 ENV DRUPAL_PHP_STORAGE_DIR=/tmp/php