diff --git a/libvirt/values.yaml b/libvirt/values.yaml
index 1908a6fa8..ed6385862 100644
--- a/libvirt/values.yaml
+++ b/libvirt/values.yaml
@@ -27,7 +27,7 @@ labels:
 
 images:
   tags:
-    libvirt: docker.io/openstackhelm/libvirt:ubuntu_xenial-20190903
+    libvirt: docker.io/openstackhelm/libvirt:latest-ubuntu_bionic
     ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200217'
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/docker:17.07.0
diff --git a/libvirt/values_overrides/ocata-ubuntu_xenial.yaml b/libvirt/values_overrides/ocata-ubuntu_xenial.yaml
new file mode 100644
index 000000000..a55da3986
--- /dev/null
+++ b/libvirt/values_overrides/ocata-ubuntu_xenial.yaml
@@ -0,0 +1,4 @@
+---
+images:
+  tags:
+    libvirt: docker.io/openstackhelm/libvirt:ubuntu_xenial-20190903
diff --git a/libvirt/values_overrides/pike-ubuntu_xenial.yaml b/libvirt/values_overrides/pike-ubuntu_xenial.yaml
new file mode 100644
index 000000000..a55da3986
--- /dev/null
+++ b/libvirt/values_overrides/pike-ubuntu_xenial.yaml
@@ -0,0 +1,4 @@
+---
+images:
+  tags:
+    libvirt: docker.io/openstackhelm/libvirt:ubuntu_xenial-20190903
diff --git a/libvirt/values_overrides/queens-ubuntu_xenial.yaml b/libvirt/values_overrides/queens-ubuntu_xenial.yaml
new file mode 100644
index 000000000..a55da3986
--- /dev/null
+++ b/libvirt/values_overrides/queens-ubuntu_xenial.yaml
@@ -0,0 +1,4 @@
+---
+images:
+  tags:
+    libvirt: docker.io/openstackhelm/libvirt:ubuntu_xenial-20190903
diff --git a/libvirt/values_overrides/rocky-ubuntu_xenial.yaml b/libvirt/values_overrides/rocky-ubuntu_xenial.yaml
new file mode 100644
index 000000000..a55da3986
--- /dev/null
+++ b/libvirt/values_overrides/rocky-ubuntu_xenial.yaml
@@ -0,0 +1,4 @@
+---
+images:
+  tags:
+    libvirt: docker.io/openstackhelm/libvirt:ubuntu_xenial-20190903
diff --git a/libvirt/values_overrides/stein-ubuntu_bionic.yaml b/libvirt/values_overrides/stein-ubuntu_bionic.yaml
deleted file mode 100644
index b95473a44..000000000
--- a/libvirt/values_overrides/stein-ubuntu_bionic.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-images:
-  tags:
-    libvirt: docker.io/openstackhelm/libvirt:latest-ubuntu_bionic
diff --git a/libvirt/values_overrides/train-ubuntu_bionic.yaml b/libvirt/values_overrides/train-ubuntu_bionic.yaml
deleted file mode 100644
index b95473a44..000000000
--- a/libvirt/values_overrides/train-ubuntu_bionic.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-images:
-  tags:
-    libvirt: docker.io/openstackhelm/libvirt:latest-ubuntu_bionic