diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml
index 265558a40b..15795828f3 100644
--- a/docker/services/database/mongodb.yaml
+++ b/docker/services/database/mongodb.yaml
@@ -102,8 +102,8 @@ outputs:
           step_config: 'include ::tripleo::profile::base::database::mongodb'
           config_image: *mongodb_image
           volumes:
-          - "mongodb:/var/lib/mongodb/"
-          - "logs:/var/log/kolla:ro"
+          - /var/lib/mongodb:/var/lib/mongodb
+          - logs:/var/log/kolla:ro
       host_prep_tasks:
         - name: create /var/lib/mongodb
           file:
diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml
index 0afd3e70ed..957eed7f9d 100644
--- a/docker/services/nova-compute.yaml
+++ b/docker/services/nova-compute.yaml
@@ -91,3 +91,7 @@ outputs:
           file:
             path: /var/lib/libvirt
             state: directory
+      upgrade_tasks:
+        - name: Stop and disable nova-compute service
+          tags: step2
+          service: name=nova-compute state=stopped enabled=no
diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml
index 170468a5ad..3d849f59f8 100644
--- a/docker/services/nova-ironic.yaml
+++ b/docker/services/nova-ironic.yaml
@@ -85,6 +85,10 @@ outputs:
               - /run:/run
               - /dev:/dev
               - /etc/iscsi:/etc/iscsi
-              - nova_compute:/var/lib/nova/
+              - /var/lib/nova/:/var/lib/nova
             environment:
              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      upgrade_tasks:
+        - name: Stop and disable nova-compute service
+          tags: step2
+          service: name=nova-compute state=stopped enabled=no
diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml
index a04371627d..480bb80e75 100644
--- a/docker/services/nova-libvirt.yaml
+++ b/docker/services/nova-libvirt.yaml
@@ -100,3 +100,7 @@ outputs:
           with_items:
             - /etc/libvirt/qemu
             - /var/lib/libvirt
+      upgrade_tasks:
+        - name: Stop and disable libvirtd service
+          tags: step2
+          service: name=libvirtd state=stopped enabled=no