diff --git a/.github/workflows/build-bake.yaml b/.github/workflows/build-bake.yaml
index 61922b661..a3c82e91a 100644
--- a/.github/workflows/build-bake.yaml
+++ b/.github/workflows/build-bake.yaml
@@ -9,6 +9,13 @@ name: Build Docker Images with Bake
 jobs:
   build:
     runs-on: ubuntu-latest-4x
+    strategy:
+      matrix:
+        targets: [
+            "default",
+            "workbench-for-google-cloud-workstations",
+            "workbench-for-microsoft-azure-ml",
+        ]
     steps:
      - name: Checkout
        uses: actions/checkout@v4
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 32a2ea535..d2fea3b63 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -81,8 +81,6 @@ group "default" {
         "package-manager", 
         "r-session-complete",
         "workbench", 
-        "workbench-for-google-cloud-workstations", 
-        "workbench-for-microsoft-azure-ml",
     ]
 }