diff --git a/.github/workflows/image-pr.yaml b/.github/workflows/image-pr.yaml
index dd89424108..4d179bda66 100644
--- a/.github/workflows/image-pr.yaml
+++ b/.github/workflows/image-pr.yaml
@@ -10,66 +10,66 @@ concurrency:
 env:
   FORCE_COLOR: 1
 jobs:
-  build:
+  core:
     uses: kairos-io/kairos/.github/workflows/reusable-build-flavor.yaml@1556-pr-one-flavor-pt2
     with:
       flavor: ubuntu
 
   install:
-    uses: kairos-io/kairos/.github/workflows/reusable-build-flavor.yaml@1556-pr-one-flavor-pt2
+    uses: kairos-io/kairos/.github/workflows/reusable-install-test.yaml@1556-pr-one-flavor-pt2
     with:
       flavor: ubuntu
     needs:
-      - build
+      - core
 
   zfs:
     uses: kairos-io/kairos/.github/workflows/reusable-zfs-test.yaml@1556-pr-one-flavor-pt2
     with:
       flavor: ubuntu
     needs:
-      - build
+      - core
 
   acceptance:
     uses: kairos-io/kairos/.github/workflows/reusable-qemu-acceptance-test.yaml@1556-pr-one-flavor-pt2
     with:
       flavor: ubuntu
     needs:
-      - build
+      - core
 
   bundles:
     uses: kairos-io/kairos/.github/workflows/reusable-qemu-bundles-test.yaml@1556-pr-one-flavor-pt2
     with:
       flavor: ubuntu
     needs:
-      - build
+      - core
 
   reset:
     uses: kairos-io/kairos/.github/workflows/reusable-qemu-reset-test.yaml@1556-pr-one-flavor-pt2
     with:
       flavor: ubuntu
     needs:
-      - build
+      - core
 
   netboot:
     uses: kairos-io/kairos/.github/workflows/reusable-qemu-netboot-test.yaml@1556-pr-one-flavor-pt2
     with:
       flavor: ubuntu
     needs:
-      - build
+      - core
 
   upgrade:
     uses: kairos-io/kairos/.github/workflows/reusable-upgrade-with-cli-test.yaml@1556-pr-one-flavor-pt2
     with:
       flavor: ubuntu
     needs:
-      - build
+      - core
 
   upgrade-latest:
     uses: kairos-io/kairos/.github/workflows/reusable-upgrade-latest-test.yaml@1556-pr-one-flavor-pt2
     with:
       flavor: ubuntu
     needs:
-    - build
+    - core
 
   encryption:
     uses: kairos-io/kairos/.github/workflows/reusable-encryption-test.yaml@1556-pr-one-flavor-pt2
@@ -77,7 +77,7 @@ jobs:
       flavor: ubuntu
       label: ${{ matrix.label }}
     needs:
-      - build
+      - core
     strategy:
       fail-fast: true
       matrix:
@@ -89,7 +89,7 @@ jobs:
           - "remote-https-bad-cert"
 
   # TODO: remove from PR if green
-  provider:
+  standard:
     uses: kairos-io/kairos/.github/workflows/reusable-build-provider.yaml@1556-pr-one-flavor-pt2
     with:
       flavor: ${{ matrix.flavor }}
@@ -105,7 +105,7 @@ jobs:
       flavor: ${{ matrix.flavor }}
       label: ${{ matrix.label }}
     needs:
-      - provider
+      - standard
     strategy:
       fail-fast: false
       max-parallel: 2
@@ -128,7 +128,7 @@ jobs:
     with:
       flavor: ${{ matrix.flavor }}
     needs:
-      - provider
+      - standard
     strategy:
       fail-fast: false
       max-parallel: 2
diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
index a2f049f084..08a9b5d6d4 100644
--- a/.github/workflows/image.yaml
+++ b/.github/workflows/image.yaml
@@ -53,7 +53,7 @@ jobs:
           # end of optional handling for multi line json
           echo "::set-output name=matrix::{\"include\": $content }"
 
-  build:
+  core:
     uses: kairos-io/kairos/.github/workflows/reusable-build-flavor.yaml@1556-pr-one-flavor-pt2
     with:
       flavor: ${{ matrix.flavor }}
@@ -79,7 +79,7 @@ jobs:
     with:
       flavor: ${{ matrix.flavor }}
     needs:
-      - build
+      - core
     strategy:
       fail-fast: true
       matrix:
@@ -91,7 +91,7 @@ jobs:
     with:
       flavor: ${{ matrix.flavor }}
     needs:
-      - build
+      - core
     strategy:
       fail-fast: false
       matrix:
@@ -103,7 +103,7 @@ jobs:
     with:
       flavor: ${{ matrix.flavor }}
     needs:
-      - build
+      - core
     strategy:
       fail-fast: false
       matrix:
@@ -121,7 +121,7 @@ jobs:
     with:
       flavor: ${{ matrix.flavor }}
     needs:
-      - build
+      - core
     strategy:
       fail-fast: false
       matrix:
@@ -133,7 +133,7 @@ jobs:
     with:
       flavor: ${{ matrix.flavor }}
     needs:
-      - build
+      - core
     strategy:
       fail-fast: false
       matrix:
@@ -146,7 +146,7 @@ jobs:
     with:
       flavor: ${{ matrix.flavor }}
     needs:
-      - build
+      - core
     strategy:
       fail-fast: false
       matrix:
@@ -160,7 +160,7 @@ jobs:
     with:
       flavor: ${{ matrix.flavor }}
     needs:
-      - build
+      - core
     strategy:
       fail-fast: false
       matrix:
@@ -173,7 +173,7 @@ jobs:
     with:
       flavor: ${{ matrix.flavor }}
     needs:
-    - build
+    - core
     strategy:
       fail-fast: false
       matrix:
@@ -190,7 +190,7 @@ jobs:
       flavor: ${{ matrix.flavor }}
       label: ${{ matrix.label }}
     needs:
-      - build
+      - core
     strategy:
       fail-fast: true
       matrix:
@@ -203,7 +203,7 @@ jobs:
         flavor:
           - "opensuse-leap"
 
-  provider:
+  standard:
     uses: kairos-io/kairos/.github/workflows/reusable-build-provider.yaml@1556-pr-one-flavor-pt2
     with:
       flavor: ${{ matrix.flavor }}
@@ -213,13 +213,13 @@ jobs:
         flavor:
           - "opensuse-leap"
           - "alpine-opensuse-leap"
-  provider-various:
+  various:
     uses: kairos-io/kairos/.github/workflows/reusable-provider-tests.yaml@1556-pr-one-flavor-pt2
     with:
       flavor: ${{ matrix.flavor }}
       label: ${{ matrix.label }}
     needs:
-      - provider
+      - standard
     strategy:
       fail-fast: false
       max-parallel: 2
@@ -237,12 +237,12 @@ jobs:
             flavor: "alpine-opensuse-leap"
           - label: "provider-upgrade"
             flavor: "alpine-opensuse-leap"
-  provider-upgrade-latest:
+  standard-upgrade-latest:
     uses: kairos-io/kairos/.github/workflows/reusable-provider-upgrade-latest-test.yaml@1556-pr-one-flavor-pt2
     with:
       flavor: ${{ matrix.flavor }}
     needs:
-      - provider
+      - standard
     strategy:
       fail-fast: false
       max-parallel: 2