diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index d42349210e..09f1477cbe 100644
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-storage.yaml
@@ -94,7 +94,7 @@ parameters:
   ConfigCommand:
     type: string
     description: Command which will be run whenever configuration data changes
-    default: os-refresh-config
+    default: os-refresh-config --timeout 14400
 
 resources:
   CephStorage:
diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index 0bac1a40ee..cd11a19d94 100644
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -94,7 +94,7 @@ parameters:
   ConfigCommand:
     type: string
     description: Command which will be run whenever configuration data changes
-    default: os-refresh-config
+    default: os-refresh-config --timeout 14400
 
 resources:
   BlockStorage:
diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index db398f173c..31199d72e8 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -319,7 +319,7 @@ parameters:
   ConfigCommand:
     type: string
     description: Command which will be run whenever configuration data changes
-    default: os-refresh-config
+    default: os-refresh-config --timeout 14400
 
 resources:
 
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index f6d63d1821..c2e9514b6d 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -393,7 +393,7 @@ parameters:
   ConfigCommand:
     type: string
     description: Command which will be run whenever configuration data changes
-    default: os-refresh-config
+    default: os-refresh-config --timeout 14400
 
 parameter_groups:
 - label: deprecated
diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index accbbfce5f..e5afc317b0 100644
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@ -115,7 +115,7 @@ parameters:
   ConfigCommand:
     type: string
     description: Command which will be run whenever configuration data changes
-    default: os-refresh-config
+    default: os-refresh-config --timeout 14400
 
 resources: