diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 5c07a24..a4c2210 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -8,44 +8,30 @@ on:
 jobs:
   unit:
     name: Unit tests
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
-
-      - name: Set up Go
-        uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6
-        with:
-          go-version: '1.25'
-
-      - name: Show Go env
-        run: |
-          go version
-          go env
-
-      - name: Tidy modules
-        run: make tidy
-
-      - name: Run unit tests
-        run: make test
+    uses: cloudoperators/common/.github/workflows/shared-go-test.yaml@main
+    with:
+      test-target: test
 
   e2e:
     name: E2E tests (k3d)
     needs: unit
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       - name: Set up Go
-        uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
         with:
-          go-version: '1.25'
+          go-version-file: go.mod
+          cache: true
 
       - name: Install kubectl
         uses: azure/setup-kubectl@776406bce94f63e41d621b960d78ee25c8b76ede # v4
         with:
-          version: 'v1.29.0' # any modern kubectl compatible with k3d's default
+          version: 'v1.29.0'
 
       - name: Install k3d
         run: |
@@ -57,11 +43,5 @@ jobs:
 
       - name: Run E2E tests
         env:
-          # Optional: customize e2e settings via Makefile variables if needed
-          # E2E_CLUSTER_NAME: cloudctl-e2e
-          # E2E_TAGS: e2e
-          # E2E_KUBECONFIG: ${{ github.workspace }}/e2e/e2e-kubeconfig
-          # E2E_BIN: ${{ github.workspace }}/bin/cloudctl
-          # Increase verbosity by adding GOFLAGS=-v or similar if desired
           GOFLAGS: ""
         run: make e2e