diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index cb68b4c9881..dba1d18fc02 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -289,3 +289,74 @@ jobs:
           git rev-parse HEAD
           sed -i 's/PHP_SAPI/"cli-server"/g' var/cache/dev/App_KernelDevDebugContainer.preload.php
           php -d opcache.preload=var/cache/dev/App_KernelDevDebugContainer.preload.php public/index.php
+  OPCACHE_VARIATION:
+    needs: GENERATE_MATRIX
+    if: ${{ needs.GENERATE_MATRIX.outputs.branches != '[]' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
+    name: "${{ matrix.branch.name }}_OPCACHE_VARIATION"
+    runs-on: ubuntu-20.04
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ matrix.branch.ref }}
+      - name: Create MSSQL container
+        uses: ./.github/actions/setup-mssql
+      - name: Create Oracle container
+        uses: ./.github/actions/setup-oracle
+      - name: apt
+        uses: ./.github/actions/apt-x64
+      - name: ./configure
+        uses: ./.github/actions/configure-x64
+        with:
+          configurationParameters: >-
+            --enable-debug --disable-zts
+      - name: make
+        run: make -j$(/usr/bin/nproc) >/dev/null
+      - name: make install
+        uses: ./.github/actions/install-linux
+      - name: Setup
+        uses: ./.github/actions/setup-x64
+      - name: Test File Cache (prime shm)
+        uses: ./.github/actions/test-linux
+        with:
+          runTestsParameters: >-
+            -d zend_extension=opcache.so
+            -d opcache.enable_cli=1
+            --file-cache-prime
+      - name: Test File Cache (prime shm, use shm)
+        uses: ./.github/actions/test-linux
+        with:
+          runTestsParameters: >-
+            -d zend_extension=opcache.so
+            -d opcache.enable_cli=1
+            --file-cache-use
+      - name: Test File Cache (prime shm, use file)
+        uses: ./.github/actions/test-linux
+        with:
+          runTestsParameters: >-
+            -d zend_extension=opcache.so
+            -d opcache.enable_cli=1
+            --file-cache-use
+            -d opcache.file_cache_only=1
+      - name: Test File Cache Only (prime)
+        uses: ./.github/actions/test-linux
+        with:
+          runTestsParameters: >-
+            -d zend_extension=opcache.so
+            -d opcache.enable_cli=1
+            --file-cache-prime
+            -d opcache.file_cache_only=1
+      - name: Test File Cache Only (use)
+        uses: ./.github/actions/test-linux
+        with:
+          runTestsParameters: >-
+            -d zend_extension=opcache.so
+            -d opcache.enable_cli=1
+            --file-cache-use
+            -d opcache.file_cache_only=1
+      - name: Verify generated files are up to date
+        uses: ./.github/actions/verify-generated-files
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4455fb1deb5..bfaecc4f125 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -50,11 +50,6 @@ jobs:
         configurationParameters: '--enable-debug --enable-zts'
         runTestsParameters: --msan
         timeoutInMinutes: 90
-    - template: azure/opcache_variation_job.yml
-      parameters:
-        configurationName: DEBUG_NTS_OPCACHE
-        configurationParameters: '--enable-debug --disable-zts'
-        timeoutInMinutes: 120
     - template: azure/job.yml
       parameters:
         configurationName: DEBUG_NTS_REPEAT
diff --git a/azure/opcache_variation_job.yml b/azure/opcache_variation_job.yml
deleted file mode 100644
index 2d4cd2bd868..00000000000
--- a/azure/opcache_variation_job.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-parameters:
-  configurationName: ''
-  configurationParameters: ''
-  runTestsParameters: ''
-  timeoutInMinutes: 60
-
-jobs:
-  - job: ${{ parameters.configurationName }}
-    timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
-    pool:
-      vmImage: 'ubuntu-20.04'
-    steps:
-    - template: mssql.yml
-    - template: apt.yml
-    - template: configure.yml
-      parameters:
-        configurationParameters: ${{ parameters.configurationParameters }}
-    - script: make -j$(/usr/bin/nproc) >/dev/null
-      displayName: 'Make Build'
-    - template: install.yml
-    - template: setup.yml
-    - template: test.yml
-      parameters:
-        configurationName: ${{ parameters.configurationName }}
-        runTestsName: 'File Cache (prime shm)'
-        runTestsParameters: >-
-          ${{ parameters.runTestsParameters }}
-          -d zend_extension=opcache.so
-          --file-cache-prime
-    - template: test.yml
-      parameters:
-        configurationName: ${{ parameters.configurationName }}
-        runTestsName: 'File Cache (prime shm, use shm)'
-        runTestsParameters: >-
-          ${{ parameters.runTestsParameters }}
-          -d zend_extension=opcache.so
-          --file-cache-use
-    - template: test.yml
-      parameters:
-        configurationName: ${{ parameters.configurationName }}
-        runTestsName: 'File Cache (prime shm, use file)'
-        runTestsParameters: >-
-          ${{ parameters.runTestsParameters }}
-          -d zend_extension=opcache.so
-          --file-cache-use
-          -d opcache.file_cache_only=1
-    - template: test.yml
-      parameters:
-        configurationName: ${{ parameters.configurationName }}
-        runTestsName: 'File Cache (prime file)'
-        runTestsParameters: >-
-          ${{ parameters.runTestsParameters }}
-          -d zend_extension=opcache.so
-          --file-cache-prime
-          -d opcache.file_cache_only=1
-    - template: test.yml
-      parameters:
-        configurationName: ${{ parameters.configurationName }}
-        runTestsName: 'File Cache (prime file, use file)'
-        runTestsParameters: >-
-          ${{ parameters.runTestsParameters }}
-          -d zend_extension=opcache.so
-          --file-cache-use
-          -d opcache.file_cache_only=1
-    - template: test.yml
-      parameters:
-        configurationName: ${{ parameters.configurationName }}
-        runTestsName: 'File Cache (prime file, use shm)'
-        runTestsParameters: >-
-          ${{ parameters.runTestsParameters }}
-          -d zend_extension=opcache.so
-          --file-cache-use
-    - template: test.yml
-      parameters:
-        configurationName: ${{ parameters.configurationName }}
-        runTestsName: 'Without interned strings'
-        runTestsParameters: >-
-          ${{ parameters.runTestsParameters }}
-          -d zend_extension=opcache.so
-          -d opcache.interned_strings_buffer=0
-    - template: test.yml
-      parameters:
-        configurationName: ${{ parameters.configurationName }}
-        runTestsName: 'Preload'
-        runTestsParameters: >-
-          ${{ parameters.runTestsParameters }}
-          -d zend_extension=opcache.so
-          --preload