diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
index e96446a551a..9ce63fe3db6 100644
--- a/.github/actionlint.yaml
+++ b/.github/actionlint.yaml
@@ -1,5 +1,4 @@
 self-hosted-runner:
   labels:
-    - aws-lambda-powertools_ubuntu-latest_4-core
-    - aws-lambda-powertools_ubuntu-latest_8-core
-    - aws-lambda-powertools_ubuntu-latest_16-core
+    - aws-powertools_ubuntu-latest_4-core 
+    - aws-powertools_ubuntu-latest_8-core
diff --git a/.github/workflows/publish_v2_layer.yml b/.github/workflows/publish_v2_layer.yml
index 90e8a010ab0..2af7bed3511 100644
--- a/.github/workflows/publish_v2_layer.yml
+++ b/.github/workflows/publish_v2_layer.yml
@@ -57,7 +57,7 @@ jobs:
       id-token: write
       pages: none
       pull-requests: none
-    runs-on: aws-lambda-powertools_ubuntu-latest_8-core
+    runs-on: aws-powertools_ubuntu-latest_8-core
     defaults:
       run:
         working-directory: ./layer
diff --git a/.github/workflows/run-e2e-tests.yml b/.github/workflows/run-e2e-tests.yml
index a85b578a5c6..7648eb77c53 100644
--- a/.github/workflows/run-e2e-tests.yml
+++ b/.github/workflows/run-e2e-tests.yml
@@ -37,7 +37,7 @@ concurrency: e2e
 
 jobs:
   run:
-    runs-on: aws-lambda-powertools_ubuntu-latest_8-core
+    runs-on: aws-powertools_ubuntu-latest_8-core
     permissions:
       id-token: write # needed to request JWT with GitHub's OIDC Token endpoint. docs: https://bit.ly/3MNgQO9
       contents: read  # checkout code