diff --git a/config/peerpods/podvm/bootc/podvm-git-buildconfig.yaml b/config/peerpods/podvm/bootc/podvm-git-buildconfig.yaml
index de88201b..e2bd1cc7 100644
--- a/config/peerpods/podvm/bootc/podvm-git-buildconfig.yaml
+++ b/config/peerpods/podvm/bootc/podvm-git-buildconfig.yaml
@@ -22,8 +22,8 @@ spec:
   source:
     contextDir: "config/peerpods/podvm/bootc"
     git:
-      uri: 'https://github.com/openshift/sandboxed-containers-operator.git'
-      ref: devel
+      uri: 'https://github.com/snir911/sandboxed-containers-operator.git'
+      ref: bootc
   strategy:
     dockerStrategy:
       dockerfilePath: "Containerfile.rhel"
diff --git a/config/peerpods/podvm/osc-podvm-create-job.yaml b/config/peerpods/podvm/osc-podvm-create-job.yaml
index 6415673a..3f27db05 100644
--- a/config/peerpods/podvm/osc-podvm-create-job.yaml
+++ b/config/peerpods/podvm/osc-podvm-create-job.yaml
@@ -13,9 +13,9 @@ spec:
     spec:
       # Add initContainers to pull the image from the registry and copy
       # /podvm-binaries.tar.gz /payload/podvm-binaries.tar.gz
-      initContainers:
+      initContainers: # TODO: pull in code to avoid unnecessary pulling?
         - name: copy
-          image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9:1.8.1  ## OSC_VERSION
+          image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9:1.8.0  ## OSC_VERSION
           command: ["/bin/sh", "-c"]
           args:
             - |
@@ -27,9 +27,11 @@ spec:
               mountPath: /payload
       containers:
         - name: create
+          imagePullPolicy: Always
           # Binaries like kubectl, packer and yq are expected to be under /usr/local/bin
           # podvm binaries are expected to be under /payload/podvm-binaries.tar.gz
-          image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9:1.8.1  ## OSC_VERSION
+          #image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9:1.8.1  ## OSC_VERSION
+          image: quay.io/snir/podvm-builder:bootc
           # This image contains the following
           # azure-podvm-image-handler.sh script under /scripts/azure-podvm-image-handler.sh
           # aws-podvm-image-handler.sh script under /scripts/aws-podvm-image-handler.sh
diff --git a/config/peerpods/podvm/osc-podvm-delete-job.yaml b/config/peerpods/podvm/osc-podvm-delete-job.yaml
index 32ab9106..a9e8a354 100644
--- a/config/peerpods/podvm/osc-podvm-delete-job.yaml
+++ b/config/peerpods/podvm/osc-podvm-delete-job.yaml
@@ -19,7 +19,7 @@ spec:
           # aws-podvm-image-handler.sh script under /scripts/aws-podvm-image-handler.sh
           # sources for cloud-api-adaptor under /src/cloud-api-adaptor
           # Binaries like kubectl, packer and yq under /usr/local/bin
-          image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9:1.8.1  ## OSC_VERSION
+          image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-builder-rhel9:1.8.0  ## OSC_VERSION
           securityContext:
             runAsUser: 0 # needed for container mode dnf access
           env: