diff --git a/.github/workflows/dispatch_module.yaml b/.github/workflows/dispatch_module.yaml
index 835e251..b45ddb1 100644
--- a/.github/workflows/dispatch_module.yaml
+++ b/.github/workflows/dispatch_module.yaml
@@ -8,12 +8,17 @@ on:
         type: choice
         options:
           - 'no'
-          - 'PHP8.1/MySQL5.7'
-          - 'PHP8.1/MySQL8.0'
           - 'PHP8.2/MySQL5.7'
           - 'PHP8.2/MySQL8.0'
-        default: 'PHP8.1/MySQL5.7'
+          - 'PHP8.3/MySQL5.7'
+          - 'PHP8.3/MySQL8.0'
+        default: 'PHP8.2/MySQL8.0'
         description: 'Limit to one PHP/MySQL combination'
+      use_dev_version:
+        type: choice
+        options: ['no', 'v0']
+        description: 'Use the dev version of github actions'
+        default: 'no'
 
 jobs:
   build_testplan:
@@ -28,19 +33,20 @@ jobs:
           # shellcheck disable=SC2088
           case "${{ inputs.limit }}" in
             "no") LIMIT='';;
-            "PHP8.1/MySQL5.7") LIMIT='~/defaults/php8.1_mysql5.7_only.yaml,' ;;
-            "PHP8.1/MySQL8.0") LIMIT='~/defaults/php8.1_mysql8.0_only.yaml,' ;;
             "PHP8.2/MySQL5.7") LIMIT='~/defaults/php8.2_mysql5.7_only.yaml,' ;;
             "PHP8.2/MySQL8.0") LIMIT='~/defaults/php8.2_mysql8.0_only.yaml,' ;;
+            "PHP8.3/MySQL5.7") LIMIT='~/defaults/php8.3_mysql5.7_only.yaml,' ;;
+            "PHP8.3/MySQL8.0") LIMIT='~/defaults/php8.3_mysql8.0_only.yaml,' ;;
             *) echo "Illegal choice, fix the workflow"
               exit 1
               ;;
           esac
           # shellcheck disable=SC2088
-          TESTPLAN="~/defaults/7.1.x.yaml,${LIMIT}~/module-template.yaml"
+          TESTPLAN="~/defaults/7.2.x.yaml,${LIMIT}~/module-template.yaml"
           echo "testplan=${TESTPLAN}" | tee -a "${GITHUB_OUTPUT}"
 
   dispatch_stable:
+    if: ${{ inputs.use_dev_version == 'no' }}
     needs: build_testplan
     uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v4
     with:
@@ -57,3 +63,22 @@ jobs:
       enterprise_github_token: ${{ secrets.enterprise_github_token }}
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+
+  dispatch_v0:
+    if: ${{ inputs.use_dev_version == 'v0' }}
+    needs: build_testplan
+    uses: oxid-eSales/github-actions/.github/workflows/call-universal_test_workflow.yml@v0
+    with:
+      testplan: ${{ needs.build_testplan.outputs.testplan }}
+      runs_on: '"ubuntu-latest"'
+      defaults: 'v0'
+      plan_folder: '.github/oxid-esales'
+    secrets:
+      DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
+      DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
+      CACHE_ENDPOINT: ${{ secrets.CACHE_ENDPOINT }}
+      CACHE_ACCESS_KEY: ${{ secrets.CACHE_ACCESS_KEY }}
+      CACHE_SECRET_KEY: ${{ secrets.CACHE_SECRET_KEY }}
+      enterprise_github_token: ${{ secrets.enterprise_github_token }}
+      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml
index e5b21ae..de2a2df 100644
--- a/.github/workflows/scheduled.yaml
+++ b/.github/workflows/scheduled.yaml
@@ -11,7 +11,7 @@ jobs:
     if: always()
     uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v4
     with:
-      testplan: '~/defaults/7.1.x.yaml,~/defaults/scheduled.yaml,~/module-template.yaml'
+      testplan: '~/defaults/7.2.x.yaml,~/defaults/scheduled.yaml,~/module-template.yaml'
       runs_on: '"ubuntu-latest"'
       defaults: 'v4'
       plan_folder: '.github/oxid-esales'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ee93e4..f2dc2c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [v3.1.0] - Unreleased
+
+### Removed
+- PHP 8.0 support removed
+
 ## [v3.0.0] - 2024-06-27
 
 This is the stable release for v3.0.0. No changes have been made since v3.0.0-rc.1.
diff --git a/composer.json b/composer.json
index 5302c70..bfb6c3e 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         "phpstan/phpstan": "^1.9.14",
         "squizlabs/php_codesniffer": "3.*",
         "phpmd/phpmd": "^2.11",
-        "oxid-esales/oxideshop-ce": "dev-b-7.1.x",
+        "oxid-esales/oxideshop-ce": "dev-b-7.2.x",
         "phpunit/phpunit": "~10.5.17",
         "mikey179/vfsstream": "~1.6.8",
         "codeception/codeception": "*",