diff --git a/test-and-deploy.yml b/test-and-deploy.yml
index bf18d0632ada90d81ff8884f48bd30e8509c0c5c..b7019c381c14635a28ada25522ddbbbc8f1744fb 100644
--- a/test-and-deploy.yml
+++ b/test-and-deploy.yml
@@ -419,7 +419,7 @@ Debug:
     name: ${ENVIRONMENT_NAME}
     url: ${ENVIRONMENT_URL}
   script:
-    - cd /data/app
+    - cd /data/${CI_COMMIT_REF_NAME}/app
     - drush -y sset system.maintenance_mode 1
     - cd -
     - cd web/sites/default
@@ -428,10 +428,10 @@ Debug:
     - ln -s /data/default/public files
     - ln -s /data/default/private private
     - cd -
-    - rsync -rlDzq --delete ./ /data/app
-    - cd /data/files/public
+    - rsync -rlDzq --delete ./ /data/${CI_COMMIT_REF_NAME}/app
+    - cd /data/${CI_COMMIT_REF_NAME}/files/public
     - if [[ ! -L config ]]; then ln -s /var/www/html/config/default config; fi
-    - cd /data/app
+    - cd /data/${CI_COMMIT_REF_NAME}/app
     - PROXYIP=$(docker inspect traefik-traefik-1 | jq -r '.[0].NetworkSettings.Networks."traefik-public".IPAddress')
     - sed -i "s/TRAEFIK-IP-PLACEHOLDER/${PROXYIP}/g" docker-compose.yml
     - sed -i "s/TRAEFIK-IP-PLACEHOLDER/${PROXYIP}/g" settings/default/settings.docker.php