diff --git a/classes/cluster/drivetrain-ha-clusters/cicd/control/master.yml b/classes/cluster/drivetrain-ha-clusters/cicd/control/master.yml
index 7b74e37..3d76431 100644
--- a/classes/cluster/drivetrain-ha-clusters/cicd/control/master.yml
+++ b/classes/cluster/drivetrain-ha-clusters/cicd/control/master.yml
@@ -27,6 +27,7 @@
   - system.openldap.client.people.admin
   # PostgreSQL
   - system.postgresql.client.pushkin
+  - system.postgresql.client.pushkin.security_monkey
   - system.postgresql.client.rundeck
   - system.postgresql.client.security_monkey
 
diff --git a/classes/cluster/drivetrain-ha-oss/oss/client.yml b/classes/cluster/drivetrain-ha-oss/oss/client.yml
index dc99d6e..9239169 100644
--- a/classes/cluster/drivetrain-ha-oss/oss/client.yml
+++ b/classes/cluster/drivetrain-ha-oss/oss/client.yml
@@ -29,11 +29,12 @@
 
   # PostgreSQL
   - system.postgresql.client.pushkin
-  - system.postgresql.client.rundeck
+  - system.postgresql.client.pushkin.security_monkey
+  - system.postgresql.client.pushkin.janitor_monkey
+  - system.postgresql.client.pushkin.sfdc
+  - system.postgresql.client.pushkin.alertmanager
   - system.postgresql.client.security_monkey
-  - system.postgresql.client.janitor_monkey
-  - system.postgresql.client.sfdc
-  - system.postgresql.client.alertmanager
+  - system.postgresql.client.rundeck
 
   # Elasticsearch
   - system.elasticsearch.client
diff --git a/classes/cluster/drivetrain-ha/cicd/control/master.yml b/classes/cluster/drivetrain-ha/cicd/control/master.yml
index 40d881e..3798bf5 100644
--- a/classes/cluster/drivetrain-ha/cicd/control/master.yml
+++ b/classes/cluster/drivetrain-ha/cicd/control/master.yml
@@ -27,6 +27,7 @@
   - system.openldap.client.people.admin
   # PostgreSQL
   - system.postgresql.client.pushkin
+  - system.postgresql.client.pushkin.security_monkey
   - system.postgresql.client.rundeck
   - system.postgresql.client.security_monkey
 
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
index 16731e3..a82008f 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
@@ -47,11 +47,6 @@
         port: ${_param:rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
-      # Compute nodes on devcloud can have different CPUs, we need this
-      # to make sure live migration always work even when cmp VMs are on different computes
-      cpu_mode: custom
-      libvirt:
-        cpu_model: kvm64
   neutron:
     compute:
       notification:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
index 88f6f53..cb8a506 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
@@ -306,6 +306,9 @@
         port: ${_param:rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
+      notification:
+        notify_on:
+          state_change: vm_and_task_state
   cinder:
     controller:
       controller:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
index 72c1133..0ad9af0 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
@@ -50,11 +50,6 @@
         port: ${_param:rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
-      # Compute nodes on devcloud can have different CPUs, we need this
-      # to make sure live migration always work even when cmp VMs are on different computes
-      cpu_mode: custom
-      libvirt:
-        cpu_model: kvm64
   neutron:
     compute:
       notification:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
index 320923c..41cc920 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
@@ -239,6 +239,9 @@
         port: ${_param:rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
+      notification:
+        notify_on:
+          state_change: vm_and_task_state
   cinder:
     controller:
       identity:
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
index 9a227d1..deeb36d 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
@@ -25,11 +25,6 @@
           - host: ${_param:openstack_control_node01_address}
           - host: ${_param:openstack_control_node02_address}
           - host: ${_param:openstack_control_node03_address}
-      # Compute nodes on devcloud can have different CPUs, we need this
-      # to make sure live migration always work even when cmp VMs are on different computes
-      cpu_mode: custom
-      libvirt:
-        cpu_model: kvm64
   neutron:
     compute:
       notification:
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
index b9eff71..62e537e 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
@@ -116,6 +116,9 @@
         novncproxy_port: 6080
       vncproxy_url: http://${_param:cluster_vip_address}:6080
       workers: 1
+      notification:
+        notify_on:
+          state_change: vm_and_task_state
   manila:
     common:
       default_share_type: default
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
index 3fd3bce..a7817f4 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
@@ -37,11 +37,6 @@
           - host: ${_param:openstack_control_node01_address}
           - host: ${_param:openstack_control_node02_address}
           - host: ${_param:openstack_control_node03_address}
-      # Compute nodes on devcloud can have different CPUs, we need this
-      # to make sure live migration always work even when cmp VMs are on different computes
-      cpu_mode: custom
-      libvirt:
-        cpu_model: kvm64
   linux:
     network:
       bridge: openvswitch
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
index 4ab6709..6402bb9 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
@@ -136,6 +136,9 @@
         novncproxy_port: 6080
       vncproxy_url: http://${_param:cluster_vip_address}:6080
       workers: 1
+      notification:
+        notify_on:
+          state_change: vm_and_task_state
   manila:
     common:
       default_share_type: default