diff --git a/ci/environments/multinode-containers.yaml b/ci/environments/multinode-containers.yaml
index 696bf69be7..bc2212aa9c 100644
--- a/ci/environments/multinode-containers.yaml
+++ b/ci/environments/multinode-containers.yaml
@@ -44,7 +44,7 @@ parameter_defaults:
     - OS::TripleO::Services::Clustercheck
   ControllerExtraConfig:
     nova::compute::libvirt::services::libvirt_virt_type: qemu
-    nova::compute::libvirt::libvirt_virt_type: qemu
+    nova::compute::libvirt::virt_type: qemu
   Debug: True
   DockerPuppetDebug: True
   NotificationDriver: 'noop'
diff --git a/ci/environments/octavia-kvm.yaml b/ci/environments/octavia-kvm.yaml
index 1568eabc6f..c806f3252b 100644
--- a/ci/environments/octavia-kvm.yaml
+++ b/ci/environments/octavia-kvm.yaml
@@ -3,5 +3,5 @@ parameter_defaults:
     # Config related to nova libvirt
     octavia::controller::connection_retry_interval: 10
     nova::compute::libvirt::services::libvirt_virt_type: kvm
-    nova::compute::libvirt::libvirt_virt_type: kvm
-    nova::compute::libvirt::libvirt_cpu_mode: 'host-passthrough'
+    nova::compute::libvirt::virt_type: kvm
+    nova::compute::libvirt::cpu_mode: 'host-passthrough'
diff --git a/ci/environments/ovb-ha.yaml b/ci/environments/ovb-ha.yaml
index 95950b484c..6d7ed8956f 100644
--- a/ci/environments/ovb-ha.yaml
+++ b/ci/environments/ovb-ha.yaml
@@ -1,7 +1,7 @@
 parameter_defaults:
   ControllerExtraConfig:
     nova::compute::libvirt::services::libvirt_virt_type: qemu
-    nova::compute::libvirt::libvirt_virt_type: qemu
+    nova::compute::libvirt::virt_type: qemu
   Debug: true
   HideSensitiveLogs: false
   DockerPuppetDebug: True
diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index e4d63afa2e..b300692f5b 100644
--- a/ci/environments/scenario001-multinode-containers.yaml
+++ b/ci/environments/scenario001-multinode-containers.yaml
@@ -97,7 +97,7 @@ parameter_defaults:
 
   ControllerExtraConfig:
     nova::compute::libvirt::services::libvirt_virt_type: qemu
-    nova::compute::libvirt::libvirt_virt_type: qemu
+    nova::compute::libvirt::virt_type: qemu
     # NOTE(sileht): To decrease the time test_telemetry_integration takes We
     # configure Ceilometer to poll more, We configure the
     # 'ceilometer-high-rate' Gnocchi archive policy to keep 1 point every 60s.
diff --git a/ci/environments/scenario007-multinode-containers.yaml b/ci/environments/scenario007-multinode-containers.yaml
index 9627f010a8..10aae9085f 100644
--- a/ci/environments/scenario007-multinode-containers.yaml
+++ b/ci/environments/scenario007-multinode-containers.yaml
@@ -67,9 +67,9 @@ parameter_defaults:
     - OS::TripleO::Services::Multipathd
   ControllerExtraConfig:
     nova::compute::libvirt::services::libvirt_virt_type: qemu
-    nova::compute::libvirt::libvirt_virt_type: qemu
+    nova::compute::libvirt::virt_type: qemu
     # Required for Centos 7.3 and Qemu 2.6.0
-    nova::compute::libvirt::libvirt_cpu_mode: 'none'
+    nova::compute::libvirt::cpu_mode: 'none'
   # For ML2/OVS
   NeutronMechanismDrivers: 'openvswitch'
   NeutronPluginExtensions: "qos,port_security"
diff --git a/ci/environments/scenario010-multinode-containers.yaml b/ci/environments/scenario010-multinode-containers.yaml
index 03592d6b0c..f896bce1b7 100644
--- a/ci/environments/scenario010-multinode-containers.yaml
+++ b/ci/environments/scenario010-multinode-containers.yaml
@@ -74,7 +74,7 @@ parameter_defaults:
     - OS::TripleO::Services::Multipathd
   ControllerExtraConfig:
     nova::compute::libvirt::services::libvirt_virt_type: qemu
-    nova::compute::libvirt::libvirt_virt_type: qemu
+    nova::compute::libvirt::virt_type: qemu
     octavia::controller::connection_retry_interval: 10
   Debug: true
   CephAnsibleDisksConfig:
diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml
index c32e119618..497af645b5 100644
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@@ -524,7 +524,7 @@ resources:
               nova::compute::libvirt::tx_queue_size: NovaLibvirtTxQueueSize
               nova::compute::libvirt::file_backed_memory: NovaLibvirtFileBackedMemory
               nova::compute::libvirt::volume_use_multipath: NovaLibvirtVolumeUseMultipath
-              nova::compute::libvirt::libvirt_hw_machine_type: NovaHWMachineType
+              nova::compute::libvirt::hw_machine_type: NovaHWMachineType
               compute_enable_ksm: NovaComputeEnableKsm
               nova::compute::rbd::libvirt_images_rbd_pool: NovaRbdPoolName
               tripleo::profile::base::nova::compute::nova_nfs_enabled: NovaNfsEnabled
diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml
index d07f3af3d4..c21b740944 100644
--- a/deployment/nova/nova-libvirt-container-puppet.yaml
+++ b/deployment/nova/nova-libvirt-container-puppet.yaml
@@ -393,8 +393,8 @@ outputs:
             tripleo::profile::base::nova::migration::client::ssh_private_key: {get_param: [ MigrationSshKey, private_key ]}
             tripleo::profile::base::nova::migration::client::ssh_port: {get_param: MigrationSshPort}
             nova::compute::libvirt::services::libvirt_virt_type: {get_param: NovaComputeLibvirtType}
-            nova::compute::libvirt::libvirt_virt_type: {get_param: NovaComputeLibvirtType}
-            nova::compute::libvirt::libvirt_enabled_perf_events: {get_param: LibvirtEnabledPerfEvents}
+            nova::compute::libvirt::virt_type: {get_param: NovaComputeLibvirtType}
+            nova::compute::libvirt::enabled_perf_events: {get_param: LibvirtEnabledPerfEvents}
             nova::compute::libvirt::qemu::configure_qemu: true
             nova::compute::libvirt::qemu::max_files: 32768
             nova::compute::libvirt::qemu::max_processes: 131072