diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index cc3e95a7e..eb76ba0ba 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -5,7 +5,7 @@
 - id: install-ocf-script
   type: puppet
   version: 2.0.0
-  groups: [primary-controller, controller, primary-standalone-database, standalone-database, primary-standalone-rabbitmq, standalone-rabbitmq]
+  groups: ["/(primary-)?(controller|standalone-database|standalone-rabbitmq)/"]
   requires: [fuel_pkgs]
   # Required for the cluster tasks when the environment is scaled up
   required_for: [primary-cluster, cluster]