diff --git a/roles/openstack_helm_infra_ceph_provisioners/defaults/main.yml b/roles/openstack_helm_infra_ceph_provisioners/defaults/main.yml
index b979130..08623b9 100644
--- a/roles/openstack_helm_infra_ceph_provisioners/defaults/main.yml
+++ b/roles/openstack_helm_infra_ceph_provisioners/defaults/main.yml
@@ -41,3 +41,9 @@
 openstack_helm_infra_ceph_provisioners_ceph_cluster_network: "{{ openstack_helm_infra_ceph_provisioners_ceph_public_network }}"
 
                                                                    # ]]]
+# .. envvar:: openstack_helm_infra_ceph_provisioners_values [[[
+#
+# Overrides for Helm chart values
+openstack_helm_infra_ceph_provisioners_values: {}
+
+                                                                   # ]]]
diff --git a/roles/openstack_helm_infra_ceph_provisioners/tasks/main.yml b/roles/openstack_helm_infra_ceph_provisioners/tasks/main.yml
index 25c8934..f5c1539 100644
--- a/roles/openstack_helm_infra_ceph_provisioners/tasks/main.yml
+++ b/roles/openstack_helm_infra_ceph_provisioners/tasks/main.yml
@@ -114,7 +114,7 @@
           name: atmosphere-ceph-provisioners
           namespace: openstack
         stringData:
-          values.yaml: "{{ openstack_helm_infra_ceph_provisioners_values | to_nice_yaml }}"
+          values.yaml: "{{ _openstack_helm_infra_ceph_provisioners_values | to_nice_yaml }}"
 
       - apiVersion: helm.toolkit.fluxcd.io/v2beta1
         kind: HelmRelease
diff --git a/roles/openstack_helm_infra_ceph_provisioners/vars/main.yml b/roles/openstack_helm_infra_ceph_provisioners/vars/main.yml
index df99dca..6c66d4b 100644
--- a/roles/openstack_helm_infra_ceph_provisioners/vars/main.yml
+++ b/roles/openstack_helm_infra_ceph_provisioners/vars/main.yml
@@ -1,4 +1,4 @@
-openstack_helm_infra_ceph_provisioners_values:
+_openstack_helm_infra_ceph_provisioners_values:
   network:
     public: "{{ openstack_helm_infra_ceph_provisioners_ceph_public_network }}"
     cluster: "{{ openstack_helm_infra_ceph_provisioners_ceph_cluster_network }}"
diff --git a/roles/openstack_helm_infra_libvirt/defaults/main.yml b/roles/openstack_helm_infra_libvirt/defaults/main.yml
index b1f5d2a..3d31131 100644
--- a/roles/openstack_helm_infra_libvirt/defaults/main.yml
+++ b/roles/openstack_helm_infra_libvirt/defaults/main.yml
@@ -14,13 +14,13 @@
 # .. envvar:: openstack_helm_infra_libvirt_image_repository [[[
 #
 # Image repository location to be prefixed for all images
-openstack_helm_infra_libvirt_image_repository: "{{ atmosphere_image_repository | default('us-docker.pkg.dev/vexxhost-infra/openstack') }}"
+openstack_helm_infra_libvirt_image_repository: "{{ atmosphere_image_repository | default('quay.io/vexxhost') }}"
 
                                                                    # ]]]
 # .. envvar:: openstack_helm_infra_libvirt_image_tag [[[
 #
 # Image tag for container
-openstack_helm_infra_libvirt_image_tag: "{{ atmosphere_openstack_release | default('wallaby') }}"
+openstack_helm_infra_libvirt_image_tag: "{{ atmosphere_openstack_release | default('yoga-focal') }}"
 
                                                                    # ]]]
 # .. envvar:: openstack_helm_infra_libvirt_values [[[
diff --git a/roles/openstack_helm_infra_libvirt/vars/main.yml b/roles/openstack_helm_infra_libvirt/vars/main.yml
index 232513b..f642b45 100644
--- a/roles/openstack_helm_infra_libvirt/vars/main.yml
+++ b/roles/openstack_helm_infra_libvirt/vars/main.yml
@@ -16,9 +16,9 @@
   endpoints: "{{ openstack_helm_endpoints }}"
   images:
     tags:
-      ceph_config_helper: "{{ openstack_helm_infra_libvirt_image_repository }}/libvirt:{{ openstack_helm_infra_libvirt_image_tag }}"
+      ceph_config_helper: "{{ openstack_helm_infra_libvirt_image_repository }}/libvirtd:{{ openstack_helm_infra_libvirt_image_tag }}"
       dep_check: "{{ openstack_helm_infra_libvirt_image_repository }}/kubernetes-entrypoint:latest"
-      libvirt: "{{ openstack_helm_infra_libvirt_image_repository }}/libvirt:{{ openstack_helm_infra_libvirt_image_tag }}"
+      libvirt: "{{ openstack_helm_infra_libvirt_image_repository }}/libvirtd:{{ openstack_helm_infra_libvirt_image_tag }}"
   conf:
     ceph:
       enabled: "{{ atmosphere_ceph_enabled | default(true) | bool }}"