diff --git a/deployment_scripts/puppet/manifests/deploy.pp b/deployment_scripts/puppet/manifests/deploy.pp
index 09d3f77..c106b21 100644
--- a/deployment_scripts/puppet/manifests/deploy.pp
+++ b/deployment_scripts/puppet/manifests/deploy.pp
@@ -1,5 +1,5 @@
 $dynatrace = hiera('dynatrace')
 
 if $dynatrace['enabled'] {
-  class { 'ruxit_agent': }
+  class {'ruxit_agent':}
 }
diff --git a/tasks.yaml b/tasks.yaml
index e4a086e..93d9dfb 100644
--- a/tasks.yaml
+++ b/tasks.yaml
@@ -6,11 +6,17 @@
 # ['cinder', 'compute'] will be applied only on
 # cinder and compute nodes
 - role: '*'
-  stage: post_deployment/8000
+  stage: monitoring
+  type: shell
+  parameters:
+    cmd: bash deploy.sh
+    timeout: 420
+
+- role: '*'
+  stage: monitoring
   type: puppet
   parameters:
     puppet_manifest: puppet/manifests/deploy.pp
-    puppet_modules: puppet/modules
     timeout: 420
 # Task is applied for all roles
 #- role: '*'