diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index 5fcb135..a6fe9db 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -8,6 +8,8 @@
     puppet_manifest: puppet/manifests/dynatrace-oneagent.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 360
+  reexecute_on:
+    - deploy_changes
 
 - id: dynatrace-sg-base
   type: group
@@ -25,6 +27,8 @@
   parameters:
     strategy:
       type: one_by_one
+  reexecute_on:
+    - deploy_changes
 
 - id: dynatrace-security-gateway
   role: [dynatrace-security-gateway]
@@ -37,3 +41,5 @@
     puppet_manifest: puppet/manifests/dynatrace-security-gateway.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 360
+  reexecute_on:
+    - deploy_changes
diff --git a/node_roles.yaml b/node_roles.yaml
index 89dbfe3..e247525 100644
--- a/node_roles.yaml
+++ b/node_roles.yaml
@@ -17,6 +17,7 @@ dynatrace-oneagent:
     - cinder
     - base-os
     - compute-vmware
+    - virtual
 
 dynatrace-security-gateway:
   # Role name
@@ -32,9 +33,11 @@ dynatrace-security-gateway:
   # roles on the Fuel web UI
   weight: 1001
   conflicts:
+    - controller
     - compute
     - ceph-osd
     - cinder
     - base-os
     - compute-vmware
     - dynatrace-oneagent
+    - virtual