diff --git a/.github/workflows/pull-verify/integration-tests.yaml b/.github/workflows/pull-integration-tests.yaml
similarity index 100%
rename from .github/workflows/pull-verify/integration-tests.yaml
rename to .github/workflows/pull-integration-tests.yaml
diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/pull-unit-tests.yaml
similarity index 100%
rename from .github/workflows/unit-tests.yaml
rename to .github/workflows/pull-unit-tests.yaml
diff --git a/.github/workflows/pull-verify/unit-tests.yaml b/.github/workflows/pull-verify/unit-tests.yaml
deleted file mode 100644
index 15b43c6b9..000000000
--- a/.github/workflows/pull-verify/unit-tests.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Unit tests
-
-on: [ workflow_call ]
-
-jobs:
-  operator-unit-tests:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ../.github/actions/setup-go
-      - name: run test
-        run: make -C components/operator test
-
-  serverless-unit-tests:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ../.github/actions/setup-go
-      - uses: ../.github/actions/setup-libgit2
-      - name: run test
-        run: make -C components/serverless test
-
diff --git a/.github/workflows/push-verify/integration-tests.yaml b/.github/workflows/push-integration-tests.yaml
similarity index 100%
rename from .github/workflows/push-verify/integration-tests.yaml
rename to .github/workflows/push-integration-tests.yaml
diff --git a/.github/workflows/push-verify/upgrade-tests.yaml b/.github/workflows/push-upgrade-tests.yaml
similarity index 100%
rename from .github/workflows/push-verify/upgrade-tests.yaml
rename to .github/workflows/push-upgrade-tests.yaml
diff --git a/.github/workflows/push-verify.yaml b/.github/workflows/push-verify.yaml
deleted file mode 100644
index d3b04fb07..000000000
--- a/.github/workflows/push-verify.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: Push verify
-
-on:
-  push:
-    branches: [ "main", "release-*" ]
-
-jobs:
-  call-integration-tests:
-    uses: ./.github/workflows/push-verify/integration-tests.yaml
-
-  call-upgrade-tests:
-    uses: ./.github/workflows/push-verify/upgrade-tests.yaml
diff --git a/.github/workflows/pull-verify.yaml b/.github/workflows/verify-pull.yaml
similarity index 58%
rename from .github/workflows/pull-verify.yaml
rename to .github/workflows/verify-pull.yaml
index ccd304978..fc4a60b49 100644
--- a/.github/workflows/pull-verify.yaml
+++ b/.github/workflows/verify-pull.yaml
@@ -14,11 +14,8 @@ on:
 
 jobs:
   call-unit-tests:
-    uses: ./.github/workflows/pull-verify/unit-tests.yaml
+    uses: ./.github/workflows/pull-unit-tests.yaml
 
   call-integration-tests:
-    uses: ./.github/workflows/pull-verify/integration-tests.yaml
-
-  call-unit-tests-2:
-    uses: ./.github/workflows/unit-tests.yaml
+    uses: ./.github/workflows/pull-integration-tests.yaml
 
diff --git a/.github/workflows/verify-push.yaml b/.github/workflows/verify-push.yaml
new file mode 100644
index 000000000..8f477f4cc
--- /dev/null
+++ b/.github/workflows/verify-push.yaml
@@ -0,0 +1,12 @@
+name: Push verify
+
+on:
+  push:
+    branches: [ "main", "release-*" ]
+
+jobs:
+  call-integration-tests:
+    uses: ./.github/workflows/push-integration-tests.yaml
+
+  call-upgrade-tests:
+    uses: ./.github/workflows/push-upgrade-tests.yaml