diff --git a/.github/workflows/extdn-integration-tests-pre-install.sh b/.github/workflows/extdn-integration-tests-pre-install.sh
index 059ba0b..5eba56d 100755
--- a/.github/workflows/extdn-integration-tests-pre-install.sh
+++ b/.github/workflows/extdn-integration-tests-pre-install.sh
@@ -2,9 +2,8 @@
 composer config minimum-stability dev
 composer config prefer-stable false
 
-composer require yireo/magento2-integration-test-helper --no-update
+composer require --dev yireo/magento2-integration-test-helper --no-update
 
 composer require yireo/magento2-replace-bundled:^4.0 --no-update
 composer require yireo/magento2-replace-inventory:^4.0 --no-update
 composer require yireo/magento2-replace-pagebuilder:^4.0 --no-update
-
diff --git a/.github/workflows/extdn-integration-tests.yml b/.github/workflows/extdn-integration-tests.yml
index 4077671..938559e 100644
--- a/.github/workflows/extdn-integration-tests.yml
+++ b/.github/workflows/extdn-integration-tests.yml
@@ -30,11 +30,12 @@ jobs:
     env:
       MAGENTO_MARKETPLACE_USERNAME: ${{ secrets.MAGENTO_MARKETPLACE_USERNAME }}
       MAGENTO_MARKETPLACE_PASSWORD: ${{ secrets.MAGENTO_MARKETPLACE_PASSWORD }}
+      REPOSITORY_URL: https://repo.magento.com/
       MODULE_NAME: ${{ secrets.MODULE_NAME }}
       COMPOSER_NAME: ${{ secrets.COMPOSER_NAME }}
+      MAGENTO_POST_INSTALL_SCRIPT: .github/workflows/extdn-integration-tests-post-install.sh
     steps:
       - uses: actions/checkout@v2
-
       - name: Cache Composer dependencies
         uses: actions/cache@v2
         with:
@@ -43,8 +44,7 @@ jobs:
 
       - uses: extdn/github-actions-m2/magento-integration-tests/8.3@master
         env:
-          MAGENTO_VERSION: '2.4.7-p1'
-          COMPOSER_VERSION: 2
+          MAGENTO_VERSION: '2.4.7'
         with:
           magento_pre_install_script: .github/workflows/extdn-integration-tests-pre-install.sh
           magento_post_install_script: .github/workflows/extdn-integration-tests-post-install.sh
diff --git a/.github/workflows/extdn-phpstan-tests-pre-install.sh b/.github/workflows/extdn-phpstan-pre-install.sh
old mode 100644
new mode 100755
similarity index 67%
rename from .github/workflows/extdn-phpstan-tests-pre-install.sh
rename to .github/workflows/extdn-phpstan-pre-install.sh
index 9f250f4..2dafffc
--- a/.github/workflows/extdn-phpstan-tests-pre-install.sh
+++ b/.github/workflows/extdn-phpstan-pre-install.sh
@@ -3,6 +3,12 @@ composer config minimum-stability dev
 composer config prefer-stable false
 
 composer require yireo/magento2-integration-test-helper --no-update
+
+composer config --no-plugins allow-plugins true
+
+composer require --dev phpstan/extension-installer --no-update
+composer require --dev bitexpert/phpstan-magento --no-update
+
 composer require yireo/magento2-replace-bundled:^4.0 --no-update
 composer require yireo/magento2-replace-inventory:^4.0 --no-update
 composer require yireo/magento2-replace-pagebuilder:^4.0 --no-update
diff --git a/.github/workflows/extdn-phpstan.yml b/.github/workflows/extdn-phpstan.yml
index 57dabeb..d48bc02 100644
--- a/.github/workflows/extdn-phpstan.yml
+++ b/.github/workflows/extdn-phpstan.yml
@@ -8,15 +8,19 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: "Determine composer cache directory"
+        id: "determine-composer-cache-directory"
+        run: "echo \"::set-output name=directory::$(composer config cache-dir)\""
+
       - name: Cache Composer dependencies
         uses: actions/cache@v2
         with:
-          path: /tmp/composer-cache
+          path: "${{ steps.determine-composer-cache-directory.outputs.directory }}"
           key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
 
       - uses: extdn/github-actions-m2/magento-phpstan/8.3@master
         with:
-          composer_name: ${{ secrets.COMPOSER_NAME }}
+          composer_name: yireo/magento2-next-gen-images
           composer_version: 2
-          phpstan_level: 1
-          magento_pre_install_script: .github/workflows/extdn-phpstan-tests-pre-install.sh
+          phpstan_level: 2
+          magento_pre_install_script: .github/workflows/extdn-phpstan-pre-install.sh
diff --git a/.github/workflows/extdn-phpcs.yml b/.github/workflows/extdn-static-tests.yml
similarity index 52%
rename from .github/workflows/extdn-phpcs.yml
rename to .github/workflows/extdn-static-tests.yml
index 96aa0e6..ebc1850 100644
--- a/.github/workflows/extdn-phpcs.yml
+++ b/.github/workflows/extdn-static-tests.yml
@@ -1,10 +1,14 @@
-name: ExtDN Coding Standard
+name: ExtDN Static Tests
 on: [push]
 
 jobs:
   static:
-    name: Coding Standard
+    name: Static Code Analysis
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: extdn/github-actions-m2/magento-coding-standard/8.3@master
+        with:
+          phpcs_severity: 8
+          phpcs_report: full
+          phpcs_extensions: php
diff --git a/.github/workflows/extdn-unit-tests.yml b/.github/workflows/extdn-unit-tests.yml
index e039d61..68126c8 100644
--- a/.github/workflows/extdn-unit-tests.yml
+++ b/.github/workflows/extdn-unit-tests.yml
@@ -21,5 +21,5 @@ jobs:
 
       - uses: extdn/github-actions-m2/magento-unit-tests/8.3@master
         env:
-          MAGENTO_VERSION: '2.4.7-p1'
-          COMPOSER_VERSION: 2
+          MAGENTO_VERSION: '2.4.7'
+          COMPOSER_VERSION: 2
\ No newline at end of file