diff --git a/ansible/roles/nova-cell/defaults/main.yml b/ansible/roles/nova-cell/defaults/main.yml
index f22b808f90..e6d2b321cd 100644
--- a/ansible/roles/nova-cell/defaults/main.yml
+++ b/ansible/roles/nova-cell/defaults/main.yml
@@ -380,7 +380,6 @@ nova_libvirt_default_volumes:
   - "{{ nova_instance_datadir_volume }}:/var/lib/nova/"
   - "{% if enable_shared_var_lib_nova_mnt | bool %}/var/lib/nova/mnt:/var/lib/nova/mnt:shared{% endif %}"
   - "nova_libvirt_qemu:/etc/libvirt/qemu"
-  - "nova_libvirt_secrets:/etc/libvirt/secrets"
   - "{{ kolla_dev_repos_directory ~ '/nova/nova:/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages/nova' if nova_dev_mode | bool else '' }}"
 nova_ssh_default_volumes:
   - "{{ node_config_directory }}/nova-ssh/:{{ container_config_directory }}/:ro"
diff --git a/ansible/roles/nova-cell/tasks/deploy.yml b/ansible/roles/nova-cell/tasks/deploy.yml
index beecc7d448..adb73caab2 100644
--- a/ansible/roles/nova-cell/tasks/deploy.yml
+++ b/ansible/roles/nova-cell/tasks/deploy.yml
@@ -35,3 +35,5 @@
     # and there is a cell conductor in the inventory to delegate to.
     - all_computes_in_batch | length > 0
     - groups[nova_cell_conductor_group] | length > 0
+
+- import_tasks: post-config.yml
diff --git a/ansible/roles/nova-cell/tasks/post-config.yml b/ansible/roles/nova-cell/tasks/post-config.yml
new file mode 100644
index 0000000000..804b5da142
--- /dev/null
+++ b/ansible/roles/nova-cell/tasks/post-config.yml
@@ -0,0 +1,8 @@
+---
+# TODO(kevko) Remove in E cycle
+- name: Remove old nova_libvirt_secrets container volume
+  become: true
+  kolla_container:
+    container_engine: "{{ kolla_container_engine }}"
+    action: "remove_volume"
+    name: nova_libvirt_secrets
diff --git a/ansible/roles/nova-cell/tasks/rolling_upgrade.yml b/ansible/roles/nova-cell/tasks/rolling_upgrade.yml
index b1637ad8a2..928e8763ab 100644
--- a/ansible/roles/nova-cell/tasks/rolling_upgrade.yml
+++ b/ansible/roles/nova-cell/tasks/rolling_upgrade.yml
@@ -14,3 +14,5 @@
 
 - name: Flush handlers
   meta: flush_handlers
+
+- import_tasks: post-config.yml
diff --git a/releasenotes/notes/bug-2073678-45f31547395ef3c7.yaml b/releasenotes/notes/bug-2073678-45f31547395ef3c7.yaml
new file mode 100644
index 0000000000..70206e4fe9
--- /dev/null
+++ b/releasenotes/notes/bug-2073678-45f31547395ef3c7.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes busy libvirt's secret volume while secrets are changing.
+    `LP#2073678 <https://launchpad.net/bugs/2073678>`__