diff --git a/.github/workflows/cel-test.yml b/.github/workflows/cel-test.yml
index 578358566..826a79f0a 100644
--- a/.github/workflows/cel-test.yml
+++ b/.github/workflows/cel-test.yml
@@ -27,9 +27,6 @@ jobs:
           - name: v1.31
             version: v1.31.0
         tests:
-          - ^argo-cel$
-          - ^aws-cel$
-          - ^best-practices-cel$
           - ^consul-cel$
           - ^flux-cel$
           - ^istio-cel$
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c286d54a0..7d6df9609 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -34,6 +34,24 @@ jobs:
       with:
         path: argo
 
+  argo-cel:
+    strategy:
+      fail-fast: false
+      matrix:
+        k8s-version: [v1.28.13,v1.29.8,v1.30.4,v1.31.0]
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+    - name: Setup Environment
+      uses: ./.github/actions/setup-env
+      with:
+        k8s-version: ${{ matrix.k8s-version }}
+    - name: Run Tests
+      uses: ./.github/actions/run-tests
+      with:
+        path: argo-cel
+
   aws:
     strategy:
       fail-fast: false
@@ -52,6 +70,24 @@ jobs:
       with:
         path: aws
 
+  aws-cel:
+    strategy:
+      fail-fast: false
+      matrix:
+        k8s-version: [v1.28.13,v1.29.8,v1.30.4,v1.31.0]
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+    - name: Setup Environment
+      uses: ./.github/actions/setup-env
+      with:
+        k8s-version: ${{ matrix.k8s-version }}
+    - name: Run Tests
+      uses: ./.github/actions/run-tests
+      with:
+        path: aws-cel
+
   best-practices:
     strategy:
       fail-fast: false
@@ -73,6 +109,27 @@ jobs:
         shard-index: ${{ matrix.shard-index }}
         shard-count: 2
 
+  best-practices-cel:
+    strategy:
+      fail-fast: false
+      matrix:
+        k8s-version: [v1.28.13,v1.29.8,v1.30.4,v1.31.0]
+        shard-index: [0,1]
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+    - name: Setup Environment
+      uses: ./.github/actions/setup-env
+      with:
+        k8s-version: ${{ matrix.k8s-version }}
+    - name: Run Tests
+      uses: ./.github/actions/run-tests
+      with:
+        path: best-practices-cel
+        shard-index: ${{ matrix.shard-index }}
+        shard-count: 2
+
   castai:
     strategy:
       fail-fast: false
diff --git a/.hack/restructure.sh b/.hack/restructure.sh
deleted file mode 100644
index 93f207c7c..000000000
--- a/.hack/restructure.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-SED=sed
-
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    SED=gsed
-fi
-
-rm -rf ".policies/"
-rm -rf ".kyverno-tests/"
-
-# for FILE in $(find . -name "artifacthub-pkg.yml")
-# do
-#     FOLDER=$(dirname "$FILE")
-#     POLICY=$(basename "$FOLDER")
-#     POLICY_FILE="$FOLDER/$POLICY.yaml"
-#     mkdir -p ".policies/${FOLDER/.\//}"
-#     cp $POLICY_FILE ".policies/${FOLDER/.\//}"
-#     cp $FILE ".policies/${FOLDER/.\//}"
-# done
-
-for FILE in $(find . -name "kyverno-test.yaml")
-do
-    FOLDER=$(dirname "$FILE")
-    TARGET_FOLDER="$FOLDER/.kyverno-test"
-    POLICY=$(basename "$FOLDER")
-    POLICY_FILE="$POLICY.yaml"
-    echo "$TARGET_FOLDER"
-    rm -rf "$TARGET_FOLDER"
-    mkdir -p $TARGET_FOLDER
-    mv $FILE $TARGET_FOLDER
-    for NEEDED in $(cat "$TARGET_FOLDER/kyverno-test.yaml" | grep -oE "(\w|-)+\.yaml")
-    do
-        if [[ $NEEDED == $POLICY_FILE ]]; then
-            $SED -i "s@$POLICY_FILE@../$POLICY_FILE@" "$TARGET_FOLDER/kyverno-test.yaml"
-        else
-            mv "$FOLDER/$NEEDED" $TARGET_FOLDER || true
-        fi
-    done
-done
\ No newline at end of file