diff --git a/.github/checkgroup.yml b/.github/checkgroup.yml
index 5d9b03a08052a..7c14c25180284 100644
--- a/.github/checkgroup.yml
+++ b/.github/checkgroup.yml
@@ -47,9 +47,9 @@ subprojects:
       - "!*.md"
       - "!**/*.md"
     checks:
-      - "pytorch.yml / Lit Job (nvidia/cuda:12.1.1-runtime-ubuntu22.04, pytorch, 3.10, L4_X_2)"
-      - "pytorch.yml / Lit Job (nvidia/cuda:12.6.3-runtime-ubuntu22.04, lightning, 3.12, L4_X_2)"
-      - "pytorch.yml / Lit Job (nvidia/cuda:12.6.3-runtime-ubuntu22.04, pytorch, 3.12, L4_X_2)"
+      - "pytorch.yml / Lit Job (nvidia/cuda:12.1.1-runtime-ubuntu22.04, pytorch, 3.10)"
+      - "pytorch.yml / Lit Job (lightning, 3.12)"
+      - "pytorch.yml / Lit Job (pytorch, 3.12)"
 
   - id: "Benchmarks"
     paths:
@@ -148,9 +148,9 @@ subprojects:
       - "!*.md"
       - "!**/*.md"
     checks:
-      - "fabric.yml / Lit Job (nvidia/cuda:12.1.1-runtime-ubuntu22.04, fabric, 3.10, L4_X_2)"
-      - "fabric.yml / Lit Job (nvidia/cuda:12.6.3-runtime-ubuntu22.04, fabric, 3.12, L4_X_2)"
-      - "fabric.yml / Lit Job (nvidia/cuda:12.6.3-runtime-ubuntu22.04, lightning, 3.12, L4_X_2)"
+      - "fabric.yml / Lit Job (nvidia/cuda:12.1.1-runtime-ubuntu22.04, fabric, 3.10)"
+      - "fabric.yml / Lit Job (fabric, 3.12)"
+      - "fabric.yml / Lit Job (lightning, 3.12)"
 
   # Temporarily disabled
   #  - id: "lightning_fabric: TPU workflow"
diff --git a/.lightning/workflows/fabric.yml b/.lightning/workflows/fabric.yml
index 525b184feb35f..a62776aa9ffab 100644
--- a/.lightning/workflows/fabric.yml
+++ b/.lightning/workflows/fabric.yml
@@ -5,6 +5,8 @@ trigger:
     branches: ["master", "release/stable"]
 
 timeout: "60" # minutes
+machine: "L4_X_2"
+image: "nvidia/cuda:12.6.3-runtime-ubuntu22.04"
 parametrize:
   matrix: {}
   include:
@@ -12,17 +14,12 @@ parametrize:
     - image: "nvidia/cuda:12.1.1-runtime-ubuntu22.04"
       PACKAGE_NAME: "fabric"
       python_version: "3.10"
-      machine: "L4_X_2"
-    - image: "nvidia/cuda:12.6.3-runtime-ubuntu22.04"
-      PACKAGE_NAME: "fabric"
+    - PACKAGE_NAME: "fabric"
       python_version: "3.12"
-      machine: "L4_X_2"
     # - image: "nvidia/cuda:12.6-runtime-ubuntu22.04"
     #   PACKAGE_NAME: "fabric"
-    - image: "nvidia/cuda:12.6.3-runtime-ubuntu22.04"
-      PACKAGE_NAME: "lightning"
+    - PACKAGE_NAME: "lightning"
       python_version: "3.12"
-      machine: "L4_X_2"
   exclude: []
 
 env:
diff --git a/.lightning/workflows/pytorch.yml b/.lightning/workflows/pytorch.yml
index 18724eeb896ca..a1177e6521f06 100644
--- a/.lightning/workflows/pytorch.yml
+++ b/.lightning/workflows/pytorch.yml
@@ -5,6 +5,8 @@ trigger:
     branches: ["master", "release/stable"]
 
 timeout: "60" # minutes
+machine: "L4_X_2"
+image: "nvidia/cuda:12.6.3-runtime-ubuntu22.04"
 parametrize:
   matrix: {}
   include:
@@ -12,17 +14,12 @@ parametrize:
     - image: "nvidia/cuda:12.1.1-runtime-ubuntu22.04"
       PACKAGE_NAME: "pytorch"
       python_version: "3.10"
-      machine: "L4_X_2"
-    - image: "nvidia/cuda:12.6.3-runtime-ubuntu22.04"
-      PACKAGE_NAME: "pytorch"
+    - PACKAGE_NAME: "pytorch"
       python_version: "3.12"
-      machine: "L4_X_2"
     # - image: "nvidia/cuda:12.6.3-runtime-ubuntu22.04"
     #   PACKAGE_NAME: "pytorch"
-    - image: "nvidia/cuda:12.6.3-runtime-ubuntu22.04"
-      PACKAGE_NAME: "lightning"
+    - PACKAGE_NAME: "lightning"
       python_version: "3.12"
-      machine: "L4_X_2"
   exclude: []
 
 env: