diff --git a/.github/workflows/pr-build-and-e2e-tests.yml b/.github/workflows/pr-build-and-e2e-tests.yml
index eccff31af19..6eb7e52f3a2 100644
--- a/.github/workflows/pr-build-and-e2e-tests.yml
+++ b/.github/workflows/pr-build-and-e2e-tests.yml
@@ -51,10 +51,6 @@ jobs:
                   npm install -g pnpm
                   pnpm install
 
-            - name: Load docker images and start containers.
-              working-directory: package/woocommerce/plugins/woocommerce
-              run: pnpx wc-e2e docker:up
-
             - name: Move current directory to code. We will install zip file in this dir later.
               run: mv ./package/woocommerce/plugins/woocommerce/* ./code/woocommerce
 
@@ -76,6 +72,10 @@ jobs:
                   npm install -g pnpm
                   pnpm install
 
+            - name: Load docker images and start containers.
+              working-directory: package/woocommerce/plugins/woocommerce
+              run: pnpx wc-e2e docker:up && pnpx wc-e2e docker:wait
+
             - name: Run tests command.
               working-directory: package/woocommerce/plugins/woocommerce
               env:
@@ -176,10 +176,6 @@ jobs:
               run: |
                   cp init-sample-products.sh initialize.sh
 
-            - name: Load docker images and start containers.
-              working-directory: package/woocommerce/plugins/woocommerce
-              run: pnpx wc-e2e docker:up
-
             - name: Move current directory to code. We will install zip file in this dir later.
               run: mv ./package/woocommerce/plugins/woocommerce/* ./code/woocommerce
 
@@ -200,10 +196,10 @@ jobs:
               run: |
                   npm install -g pnpm
                   pnpm install
-
-            - name: Wait for the Docker container to be built
+            
+            - name: Load docker images and start containers.
               working-directory: package/woocommerce/plugins/woocommerce
-              run: pnpx wc-e2e docker:wait
+              run: pnpx wc-e2e docker:up && pnpx wc-e2e docker:wait
 
             - name: Install k6
               run: |