diff --git a/.github/actions/k-bench/action.yml b/.github/actions/e2e_kbench/action.yml
similarity index 88%
rename from .github/actions/k-bench/action.yml
rename to .github/actions/e2e_kbench/action.yml
index 51d5396e0..1c20946fe 100644
--- a/.github/actions/k-bench/action.yml
+++ b/.github/actions/e2e_kbench/action.yml
@@ -19,7 +19,7 @@ runs:
 
     - name: Install evaluation dependencies
       shell: bash
-      run: pip install -r .github/actions/k-bench/evaluate/requirements.txt
+      run: pip install -r .github/actions/e2e_kbench/evaluate/requirements.txt
 
     - name: Checkout patched K-Bench
       uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3.1.0
@@ -46,19 +46,19 @@ runs:
       run: |
         mkdir -p ./out
         kubectl create namespace kbench-pod-namespace --dry-run=client -o yaml | kubectl apply -f -
-        kubectl apply -f ../.github/actions/k-bench/encrypted_storage.yml
+        kubectl apply -f ../.github/actions/e2e_kbench/encrypted_storage.yml
         ./run.sh -r "kbench-constellation-${{ inputs.cloudProvider }}" -t "default" -o "./out/"
         kubectl delete namespace kbench-pod-namespace --wait=true || true
         kubectl create namespace kbench-pod-namespace --dry-run=client -o yaml |  kubectl apply -f -
-        kubectl apply -f ../.github/actions/k-bench/encrypted_storage.yml
+        kubectl apply -f ../.github/actions/e2e_kbench/encrypted_storage.yml
         ./run.sh -r "kbench-constellation-${{ inputs.cloudProvider }}" -t "dp_fio" -o "./out/"
         kubectl delete namespace kbench-pod-namespace --wait=true || true
         kubectl create namespace kbench-pod-namespace --dry-run=client -o yaml |  kubectl apply -f -
-        kubectl apply -f ../.github/actions/k-bench/encrypted_storage.yml
+        kubectl apply -f ../.github/actions/e2e_kbench/encrypted_storage.yml
         ./run.sh -r "kbench-constellation-${{ inputs.cloudProvider }}" -t "dp_network_internode" -o "./out/"
         kubectl delete namespace kbench-pod-namespace --wait=true || true
         kubectl create namespace kbench-pod-namespace --dry-run=client -o yaml |  kubectl apply -f -
-        kubectl apply -f ../.github/actions/k-bench/encrypted_storage.yml
+        kubectl apply -f ../.github/actions/e2e_kbench/encrypted_storage.yml
         ./run.sh -r "kbench-constellation-${{ inputs.cloudProvider }}" -t "dp_network_intranode" -o "./out/"
       env:
         KUBECONFIG: ${{ inputs.kubeconfig }}
@@ -81,7 +81,7 @@ runs:
 
     - name: Parse test results and create diagrams
       shell: bash
-      run: python .github/actions/k-bench/evaluate/main.py
+      run: python .github/actions/e2e_kbench/evaluate/main.py
       env:
         KBENCH_RESULTS: ${{ github.workspace }}/k-bench/out/
         CSP: ${{ inputs.cloudProvider }}
diff --git a/.github/actions/k-bench/encrypted_storage.yml b/.github/actions/e2e_kbench/encrypted_storage.yml
similarity index 100%
rename from .github/actions/k-bench/encrypted_storage.yml
rename to .github/actions/e2e_kbench/encrypted_storage.yml
diff --git a/.github/actions/k-bench/evaluate/evaluators/__init__.py b/.github/actions/e2e_kbench/evaluate/evaluators/__init__.py
similarity index 100%
rename from .github/actions/k-bench/evaluate/evaluators/__init__.py
rename to .github/actions/e2e_kbench/evaluate/evaluators/__init__.py
diff --git a/.github/actions/k-bench/evaluate/evaluators/default.py b/.github/actions/e2e_kbench/evaluate/evaluators/default.py
similarity index 100%
rename from .github/actions/k-bench/evaluate/evaluators/default.py
rename to .github/actions/e2e_kbench/evaluate/evaluators/default.py
diff --git a/.github/actions/k-bench/evaluate/evaluators/fio.py b/.github/actions/e2e_kbench/evaluate/evaluators/fio.py
similarity index 100%
rename from .github/actions/k-bench/evaluate/evaluators/fio.py
rename to .github/actions/e2e_kbench/evaluate/evaluators/fio.py
diff --git a/.github/actions/k-bench/evaluate/evaluators/network.py b/.github/actions/e2e_kbench/evaluate/evaluators/network.py
similarity index 100%
rename from .github/actions/k-bench/evaluate/evaluators/network.py
rename to .github/actions/e2e_kbench/evaluate/evaluators/network.py
diff --git a/.github/actions/k-bench/evaluate/main.py b/.github/actions/e2e_kbench/evaluate/main.py
similarity index 100%
rename from .github/actions/k-bench/evaluate/main.py
rename to .github/actions/e2e_kbench/evaluate/main.py
diff --git a/.github/actions/k-bench/evaluate/requirements.txt b/.github/actions/e2e_kbench/evaluate/requirements.txt
similarity index 100%
rename from .github/actions/k-bench/evaluate/requirements.txt
rename to .github/actions/e2e_kbench/evaluate/requirements.txt
diff --git a/.github/actions/e2e_test/action.yml b/.github/actions/e2e_test/action.yml
index efc73b6c5..8bcee852f 100644
--- a/.github/actions/e2e_test/action.yml
+++ b/.github/actions/e2e_test/action.yml
@@ -124,7 +124,7 @@ runs:
 
     - name: Login to GCP
       if: inputs.cloudProvider == 'gcp'
-      uses: ./.github/actions/gcp_login
+      uses: ./.github/actions/login_gcp
       with:
         gcp_service_account_json: ${{ inputs.gcp_service_account_json }}
 
@@ -180,7 +180,7 @@ runs:
 
     - name: Run K-Bench
       if: inputs.test == 'k-bench'
-      uses: ./.github/actions/k-bench
+      uses: ./.github/actions/e2e_kbench
       with:
         cloudProvider: ${{ inputs.cloudProvider }}
         kubeconfig: ${{ steps.constellation-create.outputs.kubeconfig }}
diff --git a/.github/actions/generate_measurements/action.yml b/.github/actions/generate_measurements/action.yml
index e40b5b81b..5ef15db57 100644
--- a/.github/actions/generate_measurements/action.yml
+++ b/.github/actions/generate_measurements/action.yml
@@ -89,7 +89,7 @@ runs:
       if: ${{ inputs.isDebugImage == 'true' }}
 
     - name: Login to GCP
-      uses: ./.github/actions/gcp_login
+      uses: ./.github/actions/login_gcp
       with:
         gcp_service_account_json: ${{ inputs.gcp_service_account_json }}
       if: ${{ inputs.cloudProvider == 'gcp' }}
diff --git a/.github/actions/azure_login/action.yml b/.github/actions/login_azure/action.yml
similarity index 100%
rename from .github/actions/azure_login/action.yml
rename to .github/actions/login_azure/action.yml
diff --git a/.github/actions/gcp_login/action.yml b/.github/actions/login_gcp/action.yml
similarity index 100%
rename from .github/actions/gcp_login/action.yml
rename to .github/actions/login_gcp/action.yml
diff --git a/.github/workflows/build-os-image.yml b/.github/workflows/build-os-image.yml
index 889fca012..b58dcc262 100644
--- a/.github/workflows/build-os-image.yml
+++ b/.github/workflows/build-os-image.yml
@@ -285,12 +285,12 @@ jobs:
           aws-region: eu-central-1
 
       - name: Login to Azure
-        uses: ./.github/actions/azure_login
+        uses: ./.github/actions/login_azure
         with:
           azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
 
       - name: Login to GCP
-        uses: ./.github/actions/gcp_login
+        uses: ./.github/actions/login_gcp
         if: ${{ matrix.csp == 'gcp' }}
         with:
           gcp_service_account_json: ${{ secrets.GCP_IMAGE_UPLOAD_SERVICE_ACCOUNT }}
diff --git a/.github/workflows/e2e-test-daily.yml b/.github/workflows/e2e-test-daily.yml
index 4d6e95d1a..6b6a2da43 100644
--- a/.github/workflows/e2e-test-daily.yml
+++ b/.github/workflows/e2e-test-daily.yml
@@ -30,7 +30,7 @@ jobs:
 
       - name: Login to Azure
         if: matrix.provider == 'azure'
-        uses: ./.github/actions/azure_login
+        uses: ./.github/actions/login_azure
         with:
           azure_credentials: ${{ secrets.AZURE_E2E_CREDENTIALS }}
 
diff --git a/.github/workflows/e2e-test-manual-macos.yml b/.github/workflows/e2e-test-manual-macos.yml
index c9f8d7315..99f271081 100644
--- a/.github/workflows/e2e-test-manual-macos.yml
+++ b/.github/workflows/e2e-test-manual-macos.yml
@@ -102,7 +102,7 @@ jobs:
 
       - name: Login to Azure
         if: ${{ github.event.inputs.cloudProvider == 'azure' }}
-        uses: ./.github/actions/azure_login
+        uses: ./.github/actions/login_azure
         with:
           azure_credentials: ${{ secrets.AZURE_E2E_CREDENTIALS }}
 
diff --git a/.github/workflows/e2e-test-manual.yml b/.github/workflows/e2e-test-manual.yml
index ac0d4f981..234238b96 100644
--- a/.github/workflows/e2e-test-manual.yml
+++ b/.github/workflows/e2e-test-manual.yml
@@ -70,7 +70,7 @@ jobs:
 
       - name: Login to Azure
         if: ${{ github.event.inputs.cloudProvider == 'azure' }}
-        uses: ./.github/actions/azure_login
+        uses: ./.github/actions/login_azure
         with:
           azure_credentials: ${{ secrets.AZURE_E2E_CREDENTIALS }}
 
diff --git a/.github/workflows/e2e-test-weekly.yml b/.github/workflows/e2e-test-weekly.yml
index a50371719..a31f3d270 100644
--- a/.github/workflows/e2e-test-weekly.yml
+++ b/.github/workflows/e2e-test-weekly.yml
@@ -46,7 +46,7 @@ jobs:
 
       - name: Login to Azure
         if: matrix.provider == 'azure'
-        uses: ./.github/actions/azure_login
+        uses: ./.github/actions/login_azure
         with:
           azure_credentials: ${{ secrets.AZURE_E2E_CREDENTIALS }}
 
diff --git a/.github/workflows/generate-measurements.yml b/.github/workflows/generate-measurements.yml
index 2f04337de..50a7d6de2 100644
--- a/.github/workflows/generate-measurements.yml
+++ b/.github/workflows/generate-measurements.yml
@@ -40,7 +40,7 @@ jobs:
 
       - name: Login to Azure
         if: ${{ github.event.inputs.cloudProvider == 'azure' }}
-        uses: ./.github/actions/azure_login
+        uses: ./.github/actions/login_azure
         with:
           azure_credentials: ${{ secrets.AZURE_E2E_CREDENTIALS }}
 
diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml
index d7c86abcb..4a70439ad 100644
--- a/.github/workflows/release-cli.yml
+++ b/.github/workflows/release-cli.yml
@@ -57,11 +57,11 @@ jobs:
           cosignPassword: ${{ startsWith(github.ref, 'refs/tags/v') && secrets.COSIGN_PASSWORD || secrets.COSIGN_DEV_PASSWORD }}
 
       - name: Login to Azure
-        uses: ./.github/actions/azure_login
+        uses: ./.github/actions/login_azure
         with:
           azure_credentials: ${{ secrets.AZURE_CREDENTIALS }}
       - name: Login to GCP
-        uses: ./.github/actions/gcp_login
+        uses: ./.github/actions/login_gcp
         with:
           gcp_service_account_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}