diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9fbd9f2..1004b1b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ name: Build container images
 
 on:
   push:
-    branches: [ $default-branch, imagefactory ]
+    branches: [ $default-branch ]
   pull_request:
     branches: [ $default-branch ]
   workflow_dispatch:
@@ -16,10 +16,21 @@ jobs:
       matrix: 
         architecture:
           - x64
-          - ARM64
+          - arm64
+        version:
+          - 8
+          - 9.0-rc
+        include: 
+          - version: 9.0-rc
+            experimental: true
+        experimental: [false]
     runs-on: 
       - self-hosted
       - ${{ matrix.architecture }}
+    continue-on-error: ${{ matrix.experimental }}
+    env:
+      CI_RELEASE: ${{ matrix.version }}
+      DEBUG: 1
     steps:
       - name: Checkout sig-cloud-instance-images
         uses: actions/checkout@v2
diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
index c8705b8..82541ed 100644
--- a/.github/workflows/scan.yml
+++ b/.github/workflows/scan.yml
@@ -1,6 +1,5 @@
 name: Scan images using trivy
 on:
-  push:
   workflow_dispatch:
   schedule:
     - cron: "0 13 * * *"
diff --git a/Makefile b/Makefile
index a29e499..759bd55 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,15 @@
 ARCH           = $(shell uname -m)
 BUILDDATE      = $(shell /bin/date +%Y%m%d_%H%M)
-KICKSTART_DIR  = kickstarts
-KICKSTART_PATH = "${KICKSTART_DIR}/Rocky-8-Container.ks"
 LOG_DIR        = logs
 OUT            = out
-RELEASE_VER    = 8.6
+RELEASE_VER    = $(shell echo ${CI_RELEASE})
 MAJOR          = $(shell v='$(RELEASE_VER)'; echo "$${v%.*}")
 TEMPLATE_DIR   = templates
 TEMPLATE_PATH  = "${TEMPLATE_DIR}/tdl-${ARCH}.xml"
 
+KICKSTART_DIR  = kickstarts
+KICKSTART_PATH = "${KICKSTART_DIR}/Rocky-${MAJOR}-Container.ks"
+
 OUTNAME          := rocky-${RELEASE_VER}-docker
 BASEIMAGE_META   := base_image-$(OUTNAME).meta
 TARGETIMAGE_META := target_image-$(OUTNAME).meta