diff --git a/.github/workflows/tpp-benchmark.yml b/.github/workflows/tpp-benchmark.yml
index 4c212ed42..a8dd5a0d6 100644
--- a/.github/workflows/tpp-benchmark.yml
+++ b/.github/workflows/tpp-benchmark.yml
@@ -6,9 +6,9 @@ on:
       RUN_SPR_BENCH:
         description: "Run on Sapphire Rapids"
         default: 1
-#      RUN_ZEN_BENCH:
-#        description: "Run on Zen4"
-#        default: 0
+      RUN_ZEN_BENCH:
+        description: "Run on Zen4"
+        default: 0
       RUN_ADL_BENCH:
         description: "Run on Raptor Lake"
         default: 0
@@ -38,10 +38,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Sapphire Rapids Base
-        run: echo "${{ inputs.RUN_SPR_BENCH }}"
-#        run: "${{ secrets.SRUN }} --partition=spr --time=2:00:00 --constraint=\"notrb\" -- \
-#              'KIND=Release COMPILER=clang LINKER=lld \
-#              ${{ github.workspace }}/scripts/buildkite/benchmark.sh -b -p'"
+        run: "${{ secrets.SRUN }} --partition=spr --time=2:00:00 --constraint=\"notrb\" -- \
+              'KIND=Release COMPILER=clang LINKER=lld \
+              ${{ github.workspace }}/scripts/buildkite/benchmark.sh -b -p'"
 
   TPP-MLIR-SPR-OMP:
     runs-on: pcl-tiergarten
@@ -50,32 +49,31 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Sapphire Rapids OpenMP
-        run: echo "${{ inputs.RUN_SPR_BENCH }}"
-#        run: "${{ secrets.SRUN }} --partition=spr --time=2:00:00 --constraint=\"notrb\" -- \
-#              'KIND=Release COMPILER=clang LINKER=lld \
-#              ${{ github.workspace }}/scripts/buildkite/benchmark.sh -o'"
+        run: "${{ secrets.SRUN }} --partition=spr --time=2:00:00 --constraint=\"notrb\" -- \
+              'KIND=Release COMPILER=clang LINKER=lld \
+              ${{ github.workspace }}/scripts/buildkite/benchmark.sh -o'"
+
+  TPP-MLIR-ZEN-BASE:
+    runs-on: pcl-tiergarten
+    if: inputs.RUN_ZEN_BENCH == 1
+    needs: Check_LLVM
+    steps:
+      - uses: actions/checkout@v4
+      - name: Zen4 Base
+        run: "${{ secrets.SRUN }} --partition=zen4 --time=2:00:00 --constraint=\"notrb\" -- \
+              'KIND=Release COMPILER=clang LINKER=lld \
+              ${{ github.workspace }}/scripts/buildkite/benchmark.sh -b -p'"
 
-#  TPP-MLIR-ZEN-BASE:
-#    runs-on: pcl-tiergarten
-#    if: ${{ inputs.RUN_ZEN_BENCH }} == 1
-#    needs: Check_LLVM
-#    steps:
-#      - uses: actions/checkout@v4
-#      - name: Zen4 Base
-#        run: "${{ secrets.SRUN }} --partition=zen4 --time=2:00:00 --constraint=\"notrb\" -- \
-#              'KIND=Release COMPILER=clang LINKER=lld \
-#              ${{ github.workspace }}/scripts/buildkite/benchmark.sh -b -p'"
-#
-#  TPP-MLIR-ZEN-OMP:
-#    runs-on: pcl-tiergarten
-#    if: ${{ inputs.RUN_ZEN_BENCH }} == 1
-#    needs: Check_LLVM
-#    steps:
-#      - uses: actions/checkout@v4
-#      - name: Zen4 OpenMP
-#        run: "${{ secrets.SRUN }} --partition=zen4 --time=2:00:00 --constraint=\"notrb\" -- \
-#              'KIND=Release COMPILER=clang LINKER=lld \
-#              ${{ github.workspace }}/scripts/buildkite/benchmark.sh -o'"
+  TPP-MLIR-ZEN-OMP:
+    runs-on: pcl-tiergarten
+    if: inputs.RUN_ZEN_BENCH == 1
+    needs: Check_LLVM
+    steps:
+      - uses: actions/checkout@v4
+      - name: Zen4 OpenMP
+        run: "${{ secrets.SRUN }} --partition=zen4 --time=2:00:00 --constraint=\"notrb\" -- \
+              'KIND=Release COMPILER=clang LINKER=lld \
+              ${{ github.workspace }}/scripts/buildkite/benchmark.sh -o'"
 
   TPP-MLIR-CLX-BASE:
     runs-on: pcl-tiergarten
@@ -84,10 +82,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Coffee Lake Base
-        run: echo "${{ inputs.RUN_CLX_BENCH }}"
-#        run: "${{ secrets.SRUN }} --partition=spr --time=2:00:00 --constraint=\"notrb\" -- \
-#              'KIND=Release COMPILER=clang LINKER=lld \
-#              ${{ github.workspace }}/scripts/buildkite/benchmark.sh -b -p'"
+        run: "${{ secrets.SRUN }} --partition=spr --time=2:00:00 --constraint=\"notrb\" -- \
+              'KIND=Release COMPILER=clang LINKER=lld \
+              ${{ github.workspace }}/scripts/buildkite/benchmark.sh -b -p'"
 
   TPP-MLIR-CLX-OMP:
     runs-on: pcl-tiergarten
@@ -96,10 +93,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Coffee Lake OpenMP
-        run: echo "${{ inputs.RUN_CLX_BENCH }}"
-#        run: "${{ secrets.SRUN }} --partition=spr --time=2:00:00 --constraint=\"notrb\" -- \
-#              'KIND=Release COMPILER=clang LINKER=lld \
-#              ${{ github.workspace }}/scripts/buildkite/benchmark.sh -o'"
+        run: "${{ secrets.SRUN }} --partition=spr --time=2:00:00 --constraint=\"notrb\" -- \
+              'KIND=Release COMPILER=clang LINKER=lld \
+              ${{ github.workspace }}/scripts/buildkite/benchmark.sh -o'"
 
   TPP-MLIR-ADL-BASE:
     runs-on: pcl-tiergarten
@@ -108,10 +104,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Raptor Lake Base
-        run: echo "${{ inputs.RUN_ADL_BENCH }}"
-#        run: "${{ secrets.SRUN }} --partition=spr --time=2:00:00 --constraint=\"notrb\" -- \
-#              'KIND=Release COMPILER=clang LINKER=lld \
-#              ${{ github.workspace }}/scripts/buildkite/benchmark.sh -b -p'"
+        run: "${{ secrets.SRUN }} --partition=spr --time=2:00:00 --constraint=\"notrb\" -- \
+              'KIND=Release COMPILER=clang LINKER=lld \
+              ${{ github.workspace }}/scripts/buildkite/benchmark.sh -b -p'"
 
   TPP-MLIR-ADL-OMP:
     runs-on: pcl-tiergarten
@@ -120,7 +115,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Raptor Lake OpenMP
-        run: echo "${{ inputs.RUN_ADL_BENCH }}"
-#        run: "${{ secrets.SRUN }} --partition=spr --time=2:00:00 --constraint=\"notrb\" -- \
-#              'KIND=Release COMPILER=clang LINKER=lld \
-#              ${{ github.workspace }}/scripts/buildkite/benchmark.sh -o'"
+        run: "${{ secrets.SRUN }} --partition=spr --time=2:00:00 --constraint=\"notrb\" -- \
+              'KIND=Release COMPILER=clang LINKER=lld \
+              ${{ github.workspace }}/scripts/buildkite/benchmark.sh -o'"