diff --git a/dynatrace-service.tf b/dynatrace-service.tf
index 8edc2d9..360fd26 100644
--- a/dynatrace-service.tf
+++ b/dynatrace-service.tf
@@ -4,30 +4,30 @@ resource "helm_release" "dynatrace-service" {
   namespace  = var.KEPTN_NAMESPACE
   timeout    = 500
 
-  set {
-    name  = "tolerations[0].key"
-    value = "dedicated"
-  }
+  # set {
+  #   name  = "tolerations[0].key"
+  #   value = "dedicated"
+  # }
 
-  set {
-    name  = "tolerations[0].value"
-    value = "group2"
-  }
+  # set {
+  #   name  = "tolerations[0].value"
+  #   value = "group2"
+  # }
 
-  set {
-    name  = "tolerations[0].operator"
-    value = "Equal"
-  }
+  # set {
+  #   name  = "tolerations[0].operator"
+  #   value = "Equal"
+  # }
 
-  set {
-    name  = "tolerations[0].effect"
-    value = "NoSchedule"
-  }
+  # set {
+  #   name  = "tolerations[0].effect"
+  #   value = "NoSchedule"
+  # }
 
-   set {
-    name  = "nodeSelector.role"
-    value = "group2"
-  }
+  #  set {
+  #   name  = "nodeSelector.role"
+  #   value = "group2"
+  # }
 
   set {
     name  = "dynatraceService.config.keptnApiUrl"
diff --git a/job-executer-service.tf b/job-executer-service.tf
index f86e529..71f95b8 100644
--- a/job-executer-service.tf
+++ b/job-executer-service.tf
@@ -4,30 +4,30 @@ resource "helm_release" "job-executer-service" {
   namespace  = var.KEPTN_NAMESPACE
   timeout    = 500
 
-set {
-    name  = "tolerations[0].key"
-    value = "dedicated"
-  }
+# set {
+#     name  = "tolerations[0].key"
+#     value = "dedicated"
+#   }
 
-  set {
-    name  = "tolerations[0].value"
-    value = "group2"
-  }
+#   set {
+#     name  = "tolerations[0].value"
+#     value = "group2"
+#   }
 
-  set {
-    name  = "tolerations[0].operator"
-    value = "Equal"
-  }
+#   set {
+#     name  = "tolerations[0].operator"
+#     value = "Equal"
+#   }
 
-  set {
-    name  = "tolerations[0].effect"
-    value = "NoSchedule"
-  }
+#   set {
+#     name  = "tolerations[0].effect"
+#     value = "NoSchedule"
+#   }
 
-   set {
-    name  = "nodeSelector.role"
-    value = "group2"
-  }
+#    set {
+#     name  = "nodeSelector.role"
+#     value = "group2"
+#   }
 
   set {
     name  = "remoteControlPlane.api.hostname"