diff --git a/test-and-deploy.yml b/test-and-deploy.yml
index a6a54084cb2b5de29a9392ec37d1912f5a4b524d..d28a105f071799df62bedfd74c3c77e260755535 100644
--- a/test-and-deploy.yml
+++ b/test-and-deploy.yml
@@ -304,8 +304,8 @@ Debug:
     - !reference [.preparecomposerplugins, before_script]
   script:
     - /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
+    - composer install --no-interaction --no-progress --no-dev --optimize-autoloader
+    - composer show --path drupal/core-vendor-hardening >/dev/null 2>&1 || composer require --update-no-dev --no-interaction --no-progress --optimize-autoloader drupal/core-vendor-hardening
   artifacts:
     name: build-prod
     when: always
@@ -329,8 +329,8 @@ Debug:
     LAKEDROPS_BUILD_NG: 'yes'
     COMPOSE_PROJECT_NAME: drupal_$COMPOSE_PROJECT_NAME
   script:
-    - 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 show --path lakedrops/drupal-environment >/dev/null 2>&1 || composer require --update-no-dev --no-interaction --no-progress --optimize-autoloader lakedrops/drupal-environment
+    - composer show --path lakedrops/docker4drupal >/dev/null 2>&1 || composer require --update-no-dev --no-interaction --no-progress --optimize-autoloader lakedrops/docker4drupal
     - composer lakedrops:config
     - composer lakedrops:docker4drupal
   artifacts:
@@ -352,8 +352,8 @@ Debug:
     - !reference [.preparecomposerplugins, before_script]
   script:
     # Run the following twice to ensure new patches get applied.
-    - composer install --no-interaction --no-progress
-    - composer install --no-interaction --no-progress
+    - composer install --no-interaction --no-progress --optimize-autoloader
+    - composer install --no-interaction --no-progress --optimize-autoloader
     - composer lakedrops:scaffold --no-interaction
     - composer lakedrops:docker4drupal --no-interaction
     - docker compose pull --quiet
@@ -723,7 +723,7 @@ Debug:
     - if [[ $EC -ne 0 ]]; then DOUPDATE=1; fi
     - rm /tmp/test.log >/dev/null 2>&1 || true
     - if [[ $DOUPDATE -eq 0 ]]; then exit 0; fi
-    - composer update --with-all-dependencies --no-interaction --no-progress --no-dev
+    - composer update --with-all-dependencies --no-interaction --no-progress --no-dev --optimize-autoloader
   only:
     variables:
       - $CHECKUPDATES