diff --git a/.github/workflows/acceptance-tests-v4.yml b/.github/workflows/acceptance-tests-v4.yml
new file mode 100644
index 000000000..56c38227a
--- /dev/null
+++ b/.github/workflows/acceptance-tests-v4.yml
@@ -0,0 +1,118 @@
+name: Acceptance Tests (v4)
+
+on:
+  schedule:
+    - cron: "0 3 * * *"
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  acceptance_tests:
+    runs-on: ubuntu-latest
+
+    strategy:
+      max-parallel: 5
+      fail-fast: false
+      matrix:
+        pkg: [
+          kafka,
+          kafkatopic,
+          kafkaschema,
+          account,
+          cassandra,
+          clickhouse,
+          connectionpool,
+          flink,
+          pg,
+          grafana,
+          influxdb,
+          m3db,
+          mysql,
+          opensearch,
+          organization,
+          project,
+          redis,
+          servicecomponent,
+          staticip,
+          serviceintegration,
+          vpc
+        ]
+
+    steps:
+      - uses: softprops/turnstyle@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          same-branch-only: true
+
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: v4
+      - uses: actions/setup-go@v4
+        with:
+          go-version-file: go.mod
+
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
+      - run: make test-acc
+        env:
+          AIVEN_TOKEN: ${{ secrets.AIVEN_TOKEN }}
+          AIVEN_PROJECT_NAME: ${{ secrets.AIVEN_PROJECT_NAME }}
+          AIVEN_ORGANIZATION_NAME: ${{ secrets.AIVEN_ORGANIZATION_NAME }}
+          AIVEN_ACCOUNT_NAME: ${{ secrets.AIVEN_ORGANIZATION_NAME }}
+          PKG: ${{ matrix.pkg }}
+
+  sweep:
+    if: always()
+    needs: acceptance_tests
+
+    runs-on: ubuntu-latest
+    steps:
+
+      - uses: softprops/turnstyle@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          same-branch-only: true
+
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: v4
+      - uses: actions/setup-go@v4
+        with:
+          go-version-file: go.mod
+
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
+      - uses: nick-invision/retry@v2
+        if: always()
+        with:
+          timeout_minutes: 15
+          max_attempts: 15
+          command: make sweep
+        env:
+          AIVEN_TOKEN: ${{ secrets.AIVEN_TOKEN }}
+          AIVEN_PROJECT_NAME: ${{ secrets.AIVEN_PROJECT_NAME }}
+          AIVEN_ORGANIZATION_NAME: ${{ secrets.AIVEN_ORGANIZATION_NAME }}
+          AIVEN_ACCOUNT_NAME: ${{ secrets.AIVEN_ORGANIZATION_NAME }}
diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
index c1ce5db57..cfe94d0b7 100644
--- a/.github/workflows/acceptance-tests.yml
+++ b/.github/workflows/acceptance-tests.yml
@@ -52,6 +52,8 @@ jobs:
           same-branch-only: true
 
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - uses: actions/setup-go@v4
         with:
           go-version-file: go.mod
@@ -71,11 +73,12 @@ jobs:
           AIVEN_PROJECT_NAME: ${{ secrets.AIVEN_PROJECT_NAME }}
           AIVEN_ORGANIZATION_NAME: ${{ secrets.AIVEN_ORGANIZATION_NAME }}
           AIVEN_ACCOUNT_NAME: ${{ secrets.AIVEN_ORGANIZATION_NAME }}
-          PKG: ${{matrix.pkg}}
+          PKG: ${{ matrix.pkg }}
 
   sweep:
-    if: ${{ always() }}
+    if: always()
     needs: acceptance_tests
+
     runs-on: ubuntu-latest
     steps:
 
@@ -86,6 +89,8 @@ jobs:
           same-branch-only: true
 
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - uses: actions/setup-go@v4
         with:
           go-version-file: go.mod