diff --git a/.github/workflows/devcontainer.yml b/.github/workflows/devcontainer.yml
index 9613883..c32e492 100644
--- a/.github/workflows/devcontainer.yml
+++ b/.github/workflows/devcontainer.yml
@@ -6,11 +6,14 @@ on:
     branches:
       - 'main'
   pull_request:
-    branches:
-      - 'main'
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - labeled
 
 concurrency:
-  group: ci-buildtrain-${{ github.ref }}-1
+  group: ci-buildtrain-${{ github.ref }}-devcontainer
   cancel-in-progress: true
 
 permissions:
@@ -19,6 +22,7 @@ permissions:
 
 jobs:
   build:
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'devcontainer:build'))
     strategy:
       matrix:
         arch: [ linux/arm64 , linux/amd64 ]
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index fa98514..bf55a1e 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -12,7 +12,7 @@ on:
 
 # Allow to stop obsolete workflows
 concurrency:
-  group: ci-buildtrain-${{ github.ref }}-1
+  group: ci-buildtrain-${{ github.ref }}-image
   cancel-in-progress: true
 
 # permissions are needed if pushing to ghcr.io