diff --git a/libvirt/Chart.yaml b/libvirt/Chart.yaml
index 07ae9b247..b5e87567f 100644
--- a/libvirt/Chart.yaml
+++ b/libvirt/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm libvirt
 name: libvirt
-version: 0.1.8
+version: 0.1.9
 home: https://libvirt.org
 sources:
   - https://libvirt.org/git/?p=libvirt.git;a=summary
diff --git a/libvirt/templates/bin/_libvirt.sh.tpl b/libvirt/templates/bin/_libvirt.sh.tpl
index c419997e1..406239505 100644
--- a/libvirt/templates/bin/_libvirt.sh.tpl
+++ b/libvirt/templates/bin/_libvirt.sh.tpl
@@ -169,9 +169,14 @@ EOF
     create_virsh_libvirt_secret ${EXTERNAL_CEPH_CINDER_USER} ${LIBVIRT_EXTERNAL_CEPH_CINDER_SECRET_UUID} ${EXTERNAL_CEPH_CINDER_KEYRING}
   fi
 
-  # rejoin libvirtd
-  wait
-else
-  #NOTE(portdirect): run libvirtd as a transient unit on the host with the osh-libvirt cgroups applied.
-  exec cgexec -g ${CGROUPS%,}:/osh-libvirt systemd-run --scope --slice=system libvirtd --listen
+  cleanup
+
+  # stop libvirtd; we needed it up to create secrets
+  LIBVIRTD_PID=$(cat /var/run/libvirtd.pid)
+  kill $LIBVIRTD_PID
+  tail --pid=$LIBVIRTD_PID -f /dev/null
+
 fi
+
+#NOTE(portdirect): run libvirtd as a transient unit on the host with the osh-libvirt cgroups applied.
+exec cgexec -g ${CGROUPS%,}:/osh-libvirt systemd-run --scope --slice=system libvirtd --listen
diff --git a/releasenotes/notes/libvirt.yaml b/releasenotes/notes/libvirt.yaml
index fe8c4dffb..2963adce0 100644
--- a/releasenotes/notes/libvirt.yaml
+++ b/releasenotes/notes/libvirt.yaml
@@ -9,4 +9,5 @@ libvirt:
   - 0.1.6 Enhancement to enable probes override from values.yaml
   - 0.1.7 Add libvirt overrides for Victoria and Wallaby
   - 0.1.8 Update htk requirements
+  - 0.1.9 Exec libvirt instead of forking from bash
 ...