diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ef688b136..a56b2ed11 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,6 +4,10 @@ on:
   pull_request:
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 permissions:
   contents: write
   packages: write
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 158419890..7a997b47f 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -13,6 +13,9 @@ on:
     paths-ignore:
     - 'docs/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   CodeQL-Build:
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index ee49ed33c..e8ce28a22 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -9,8 +9,7 @@ jobs:
       fail-fast: false
       matrix:
         browser: [firefox, chrome]
-    runs-on:
-      group: zitadel-public
+    runs-on: ubuntu-latest
     steps:
       - 
         name: Checkout Repository