diff --git a/.github/workflows/acquia_cms_ci.workflow.yml b/.github/workflows/acquia_cms_ci.workflow.yml
index a17943db9..582916811 100644
--- a/.github/workflows/acquia_cms_ci.workflow.yml
+++ b/.github/workflows/acquia_cms_ci.workflow.yml
@@ -51,9 +51,13 @@ jobs:
       - name: Download ORCA
         run: |
           composer self-update
-          composer create-project --no-dev --ignore-platform-req=php acquia/orca ../orca "$ORCA_VERSION" -n
+          composer create-project --no-dev --ignore-platform-req=php acquia/orca ../orca "$ORCA_VERSION" -n --no-install
+          sed -i '/phploc.phar/d' ../orca/composer.json && sed -i '/vendor\/bin\/phploc/d' ../orca/composer.json
+          composer install -d ../orca
+          curl https://phar.phpunit.de/phploc-7.0.2.phar -o ../orca/vendor/bin/phploc && chmod u+x ../orca/vendor/bin/phploc
           curl https://gist.githubusercontent.com/rajeshreeputra/170586f217b422eb9cdfd9ca9457a2e3/raw/c2f277ba9005b91d7f662cacf37b3940a66a9b8c/sut-path-reposories.patch | git -C ../orca apply
           curl https://gist.githubusercontent.com/rajeshreeputra/efe6fd50fc839e0e05480a5eb58d1ba4/raw/c5e81aa3c0fba9f4abe42460f3d24c7ca976a527/remove-local-settings.patch | git -C ../orca apply
+          composer config extra."drupal-scaffold".file-mapping {} -d ${ORCA_SUT_DIR}
       - name: Before Install
         run: ../orca/bin/ci/before_install.sh
       - name: Install
@@ -148,9 +152,13 @@ jobs:
       - name: Download ORCA
         run: |
           composer self-update
-          composer create-project --no-dev --ignore-platform-req=php acquia/orca ../orca "$ORCA_VERSION" -n
+          composer create-project --no-dev --ignore-platform-req=php acquia/orca ../orca "$ORCA_VERSION" -n --no-install
+          sed -i '/phploc.phar/d' ../orca/composer.json && sed -i '/vendor\/bin\/phploc/d' ../orca/composer.json
+          composer install -d ../orca
+          curl https://phar.phpunit.de/phploc-7.0.2.phar -o ../orca/vendor/bin/phploc && chmod u+x ../orca/vendor/bin/phploc
           curl https://gist.githubusercontent.com/rajeshreeputra/170586f217b422eb9cdfd9ca9457a2e3/raw/c2f277ba9005b91d7f662cacf37b3940a66a9b8c/sut-path-reposories.patch | git -C ../orca apply
           curl https://gist.githubusercontent.com/rajeshreeputra/efe6fd50fc839e0e05480a5eb58d1ba4/raw/c5e81aa3c0fba9f4abe42460f3d24c7ca976a527/remove-local-settings.patch | git -C ../orca apply
+          composer config extra."drupal-scaffold".file-mapping {} -d ${ORCA_SUT_DIR}
       # - name: Configure AWS Credentials
       #   uses: aws-actions/configure-aws-credentials@v1
       #   with:
@@ -253,8 +261,12 @@ jobs:
       - name: Download ORCA
         run: |
           composer self-update
-          composer create-project --no-dev --ignore-platform-req=php acquia/orca ../orca "$ORCA_VERSION" -n
+          composer create-project --no-dev --ignore-platform-req=php acquia/orca ../orca "$ORCA_VERSION" -n --no-install
+          sed -i '/phploc.phar/d' ../orca/composer.json && sed -i '/vendor\/bin\/phploc/d' ../orca/composer.json
+          composer install -d ../orca
+          curl https://phar.phpunit.de/phploc-7.0.2.phar -o ../orca/vendor/bin/phploc && chmod u+x ../orca/vendor/bin/phploc
           curl https://gist.githubusercontent.com/rajeshreeputra/170586f217b422eb9cdfd9ca9457a2e3/raw/c2f277ba9005b91d7f662cacf37b3940a66a9b8c/sut-path-reposories.patch | git -C ../orca apply
+          composer config extra."drupal-scaffold".file-mapping {} -d ${ORCA_SUT_DIR}
       - name: Before Install
         run: |
           # Remove all ExistingSite test in CI.
@@ -344,8 +356,12 @@ jobs:
       - name: Download ORCA
         run: |
           composer self-update
-          composer create-project --no-dev --ignore-platform-req=php acquia/orca ../orca "$ORCA_VERSION" -n
+          composer create-project --no-dev --ignore-platform-req=php acquia/orca ../orca "$ORCA_VERSION" -n --no-install
+          sed -i '/phploc.phar/d' ../orca/composer.json && sed -i '/vendor\/bin\/phploc/d' ../orca/composer.json
+          composer install -d ../orca
+          curl https://phar.phpunit.de/phploc-7.0.2.phar -o ../orca/vendor/bin/phploc && chmod u+x ../orca/vendor/bin/phploc
           curl https://gist.githubusercontent.com/rajeshreeputra/170586f217b422eb9cdfd9ca9457a2e3/raw/c2f277ba9005b91d7f662cacf37b3940a66a9b8c/sut-path-reposories.patch | git -C ../orca apply
+          composer config extra."drupal-scaffold".file-mapping {} -d ${ORCA_SUT_DIR}
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
         with: