diff --git a/test-and-deploy.yml b/test-and-deploy.yml
index d626ce5a13febc266de289541562f6a207941c61..5a5a746925d0c2ed113a6979c63832e4b1f6107f 100644
--- a/test-and-deploy.yml
+++ b/test-and-deploy.yml
@@ -280,7 +280,6 @@ Debug:
     - !reference [.prepareaccess, before_script]
     - !reference [.preparecomposerplugins, before_script]
   script:
-    - if [[ -n $DOWNGRADE_COMPOSER ]]; then composer self-update --$DOWNGRADE_COMPOSER; fi
     - /usr/local/bin/update-env
     - composer install --no-interaction --no-progress --no-dev
     - composer show --path drupal/core-vendor-hardening >/dev/null 2>&1 || composer require --update-no-dev --no-interaction --no-progress drupal/core-vendor-hardening
@@ -304,8 +303,8 @@ Debug:
     - !reference [.preparecomposerplugins, before_script]
   variables:
     LAKEDROPS_BUILD_NG: 'yes'
+    COMPOSE_PROJECT_NAME: drupal_$COMPOSE_PROJECT_NAME
   script:
-    - if [[ -n $DOWNGRADE_COMPOSER ]]; then composer self-update --$DOWNGRADE_COMPOSER; fi
     - composer show --path lakedrops/drupal-environment >/dev/null 2>&1 || composer require --update-no-dev --no-interaction --no-progress lakedrops/drupal-environment
     - composer show --path lakedrops/docker4drupal >/dev/null 2>&1 || composer require --update-no-dev --no-interaction --no-progress lakedrops/docker4drupal
     - composer lakedrops:config
@@ -327,7 +326,6 @@ Debug:
     - !reference [.prepareaccess, before_script]
     - !reference [.preparecomposerplugins, before_script]
   script:
-    - if [[ -n $DOWNGRADE_COMPOSER ]]; then composer self-update --$DOWNGRADE_COMPOSER; fi
     # Run the following twice to ensure new patches get applied.
     - composer install --no-interaction --no-progress
     - composer install --no-interaction --no-progress