diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml
index a98825c9e..18db909ed 100644
--- a/.github/docker-compose.yml
+++ b/.github/docker-compose.yml
@@ -41,7 +41,7 @@ services:
       MAGENTO_HOST: magento2.test.com
       VIRTUAL_HOST: magento2.test.com
       COMPOSER_MEMORY_LIMIT: -1
-      DEPLOY_SAMPLEDATA: 1
+      DEPLOY_SAMPLEDATA:
       DONATION_ACCOUNT:
       ADMIN_USERNAME:
       ADMIN_PASSWORD:
@@ -50,8 +50,6 @@ services:
       ADYEN_CLIENT_KEY:
       PHP_VERSION:
       MAGENTO_VERSION:
-      WEBHOOK_PASSWORD:
-      WEBHOOK_USERNAME:
     depends_on:
       - db
       - elastic
diff --git a/.github/workflows/e2e-test-dispatch.yml b/.github/workflows/e2e-test-dispatch.yml
index 8586405e5..52a9e97fa 100644
--- a/.github/workflows/e2e-test-dispatch.yml
+++ b/.github/workflows/e2e-test-dispatch.yml
@@ -31,8 +31,13 @@ jobs:
     env:
       PHP_VERSION: "8.1"
       MAGENTO_VERSION: "2.4.5"
+      ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}}
+      ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}}
+      ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}}
       ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}}
       ADMIN_PASSWORD: ${{secrets.MAGENTO_ADMIN_PASSWORD}}
+      DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}}
+      DEPLOY_SAMPLEDATA: 1
     steps:
       - uses: actions/checkout@v3
 
@@ -41,12 +46,7 @@ jobs:
 
       - name: Start web server in background
         run: docker-compose -f .github/docker-compose.yml up -d web
-        env:
-          DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}}
-          ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}}
-          ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}}
-          ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}}
-
+        
       - name: Setup permissions
         run: docker exec magento2-container make fs
 
@@ -102,9 +102,6 @@ jobs:
           MAGENTO_BASE_URL: ${{secrets.MAGENTO_BASE_URL}}
           PAYPAL_USERNAME: ${{secrets.PLAYWRIGHT_PAYPAL_USERNAME}}
           PAYPAL_PASSWORD: ${{secrets.PLAYWRIGHT_PAYPAL_PASSWORD}}
-          ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}}
-          ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}}
-          ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}}
           GOOGLE_USERNAME: ${{secrets.GOOGLE_USERNAME}}
           GOOGLE_PASSWORD: ${{secrets.GOOGLE_PASSWORD}}
           WEBHOOK_USERNAME: admin
diff --git a/.github/workflows/e2e-test-express-checkout.yml b/.github/workflows/e2e-test-express-checkout.yml
index 2442526a3..91e505b3f 100644
--- a/.github/workflows/e2e-test-express-checkout.yml
+++ b/.github/workflows/e2e-test-express-checkout.yml
@@ -21,8 +21,13 @@ jobs:
     env:
       PHP_VERSION: "8.1"
       MAGENTO_VERSION: "2.4.5"
+      ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}}
+      ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}}
+      ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}}
       ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}}
       ADMIN_PASSWORD: ${{secrets.MAGENTO_ADMIN_PASSWORD}}
+      DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}}
+      DEPLOY_SAMPLEDATA: 1
     steps:
       - uses: actions/checkout@v3
 
@@ -31,11 +36,6 @@ jobs:
 
       - name: Start web server in background
         run: docker-compose -f .github/docker-compose.yml up -d web
-        env:
-          DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}}
-          ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}}
-          ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}}
-          ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}}
 
       - name: Setup permissions
         run: docker exec magento2-container make fs
@@ -67,9 +67,6 @@ jobs:
           MAGENTO_BASE_URL: ${{secrets.MAGENTO_BASE_URL}}
           PAYPAL_USERNAME: ${{secrets.PLAYWRIGHT_PAYPAL_USERNAME}}
           PAYPAL_PASSWORD: ${{secrets.PLAYWRIGHT_PAYPAL_PASSWORD}}
-          ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}}
-          ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}}
-          ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}}
           GOOGLE_USERNAME: ${{secrets.GOOGLE_USERNAME}}
           GOOGLE_PASSWORD: ${{secrets.GOOGLE_PASSWORD}}
           WEBHOOK_USERNAME: admin
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
index efdfe971c..35550df3b 100644
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -18,8 +18,13 @@ jobs:
     env:
       PHP_VERSION: "8.1"
       MAGENTO_VERSION: "2.4.5"
+      ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}}
+      ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}}
+      ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}}
       ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}}
       ADMIN_PASSWORD: ${{secrets.MAGENTO_ADMIN_PASSWORD}}
+      DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}}
+      DEPLOY_SAMPLEDATA: 1
     steps:
       - uses: actions/checkout@v3
 
@@ -28,11 +33,6 @@ jobs:
 
       - name: Start web server in background
         run: docker-compose -f .github/docker-compose.yml up -d web
-        env:
-          DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}}
-          ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}}
-          ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}}
-          ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}}
 
       - name: Setup permissions
         run: docker exec magento2-container make fs
@@ -80,9 +80,6 @@ jobs:
           MAGENTO_BASE_URL: ${{secrets.MAGENTO_BASE_URL}}
           PAYPAL_USERNAME: ${{secrets.PLAYWRIGHT_PAYPAL_USERNAME}}
           PAYPAL_PASSWORD: ${{secrets.PLAYWRIGHT_PAYPAL_PASSWORD}}
-          ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}}
-          ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}}
-          ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}}
           WEBHOOK_USERNAME: admin
           WEBHOOK_PASSWORD: 1234
 
diff --git a/.github/workflows/graphql-test.yml b/.github/workflows/graphql-test.yml
index 5e48cf430..2193cea74 100644
--- a/.github/workflows/graphql-test.yml
+++ b/.github/workflows/graphql-test.yml
@@ -15,6 +15,11 @@ jobs:
       MAGENTO_VERSION: ${{ matrix.magento-version }}
       ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}}
       ADMIN_PASSWORD: ${{secrets.MAGENTO_ADMIN_PASSWORD}}
+      DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}}
+      ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}}
+      ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}}
+      ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}}
+      DEPLOY_SAMPLEDATA: 1
 
     steps:
       - uses: actions/checkout@v3
@@ -24,11 +29,6 @@ jobs:
 
       - name: Start web server in background
         run: docker-compose -f .github/docker-compose.yml up -d web
-        env:
-          DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}}
-          ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}}
-          ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}}
-          ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}}
 
       - name: Setup permissions
         run: docker exec magento2-container make fs
diff --git a/.github/workflows/mftf-test.yml b/.github/workflows/mftf-test.yml
index 74b27cb0b..a413c452b 100644
--- a/.github/workflows/mftf-test.yml
+++ b/.github/workflows/mftf-test.yml
@@ -2,7 +2,7 @@ name: Functional Tests
 on:
   workflow_dispatch:
   pull_request:
-    branches: [main]
+    branches: [main, develop]
 
 jobs:
   build:
@@ -17,16 +17,16 @@ jobs:
       MAGENTO_VERSION: ${{ matrix.magento-version }}
       ADMIN_USERNAME: ${{ secrets.MAGENTO_ADMIN_USERNAME }}
       ADMIN_PASSWORD: ${{ secrets.MAGENTO_ADMIN_PASSWORD }}
+      DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}}
+      ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}}
+      ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}}
+      ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}}
+      ADMIN_URLEXT: admin
     steps:
       - uses: actions/checkout@v3
 
       - name: Start services
         run: docker-compose -f .github/docker-compose.yml -f .github/docker-compose.mftf.yml up -d
-        env:
-          DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}}
-          ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}}
-          ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}}
-          ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}}
 
       # Temp solution to wait for install script to run
       - name: Sleep for 120 seconds
diff --git a/.github/workflows/restapi-test.yml b/.github/workflows/restapi-test.yml
index 7e72f6752..ee855613c 100644
--- a/.github/workflows/restapi-test.yml
+++ b/.github/workflows/restapi-test.yml
@@ -15,6 +15,11 @@ jobs:
       MAGENTO_VERSION: ${{ matrix.magento-version }}
       ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}}
       ADMIN_PASSWORD: ${{secrets.MAGENTO_ADMIN_PASSWORD}}
+      DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}}
+      ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}}
+      ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}}
+      ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}}
+      DEPLOY_SAMPLEDATA: 1
 
     steps:
       - uses: actions/checkout@v3
@@ -24,11 +29,6 @@ jobs:
 
       - name: Start web server in background
         run: docker-compose -f .github/docker-compose.yml up -d web
-        env:
-          DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}}
-          ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}}
-          ADYEN_API_KEY: ${{secrets.ADYEN_API_KEY}}
-          ADYEN_CLIENT_KEY: ${{secrets.ADYEN_CLIENT_KEY}}
 
       - name: Setup permissions
         run: docker exec magento2-container make fs