diff --git a/libvirt/Dockerfile.ubuntu_xenial b/libvirt/Dockerfile.ubuntu_focal
similarity index 52%
rename from libvirt/Dockerfile.ubuntu_xenial
rename to libvirt/Dockerfile.ubuntu_focal
index 6f445780..9218fb65 100644
--- a/libvirt/Dockerfile.ubuntu_xenial
+++ b/libvirt/Dockerfile.ubuntu_focal
@@ -1,9 +1,10 @@
-ARG FROM=docker.io/ubuntu:xenial
+ARG FROM=docker.io/ubuntu:focal
 FROM ${FROM}
-LABEL maintainer="pete.birley@att.com"
+LABEL maintainer="mnaser@vexxhost.com"
 
-ARG UBUNTU_RELEASE=xenial
-ARG CEPH_RELEASE=mimic
+ARG UBUNTU_RELEASE=focal
+ARG CEPH_RELEASE=octopus
+ARG CEPH_RELEASE_TAG=""
 ARG PROJECT=nova
 ARG UID=42424
 ARG GID=42424
@@ -14,5 +15,11 @@ ARG CEPH_KEY=http://download.ceph.com/keys/release.asc
 ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
 COPY ./ubuntu-install-libvirt.sh /tmp/ubuntu-install-libvirt.sh
 RUN set -ex ;\
+    export DEBIAN_FRONTEND=noninteractive ;\
+    apt-get update ;\
+    apt-get install --no-install-recommends -y \
+      apt-transport-https \
+      ca-certificates \
+      gnupg ;\
     /tmp/ubuntu-install-libvirt.sh ;\
     rm -rf /tmp/*
diff --git a/libvirt/ubuntu-install-libvirt.sh b/libvirt/ubuntu-install-libvirt.sh
index ebbb1731..bc379db0 100755
--- a/libvirt/ubuntu-install-libvirt.sh
+++ b/libvirt/ubuntu-install-libvirt.sh
@@ -13,9 +13,11 @@ apt-get install --no-install-recommends -y \
   dmidecode \
   ebtables \
   iproute2 \
-  libvirt-bin \
+  ipxe-qemu \
+  libvirt-clients \
+  libvirt-daemon-system \
   pm-utils \
-  qemu \
+  qemu-kvm \
   qemu-block-extra \
   qemu-efi \
   openvswitch-switch \
diff --git a/zuul.d/libvirt.yaml b/zuul.d/libvirt.yaml
index e0373f30..de8c8507 100644
--- a/zuul.d/libvirt.yaml
+++ b/zuul.d/libvirt.yaml
@@ -50,12 +50,6 @@
           tags:
             - latest-centos_7
             - "centos_7-{{ currentdate }}"
-        - context: libvirt
-          repository: openstackhelm/libvirt
-          dockerfile: Dockerfile.ubuntu_xenial
-          tags:
-            - latest-ubuntu_xenial
-            - "ubuntu_xenial-{{ currentdate }}"
         - context: libvirt
           repository: openstackhelm/libvirt
           dockerfile: Dockerfile.ubuntu_bionic
@@ -66,6 +60,12 @@
             - "CEPH_REPO=https://mirror.mirantis.com/testing/ceph-nautilus/bionic/"
             - "CEPH_KEY=https://mirror.mirantis.com/testing/ceph-nautilus/bionic/archive-ceph-nautilus.key"
             - "CEPH_RELEASE_TAG=14.2.9-1.0~bionic"
+        - context: libvirt
+          repository: openstackhelm/libvirt
+          dockerfile: Dockerfile.ubuntu_focal
+          tags:
+            - latest-ubuntu_focal
+            - "ubuntu_focal-{{ currentdate }}"
     files: &libvirt_files
       - libvirt/.*
       - zuul.d/libvirt.yaml