diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index f8b5ebee90..d89155ce3c 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -27,8 +27,8 @@ parameters:
           {"config":
             [{"section": "default",
               "values":
-                [{"option": "compute_manager",
-                  "value": "ironic.nova.compute.manager.ClusterComputeManager"
+                [{"option": "force_config_drive",
+                  "value": "always"
                  }
                 ]
              },
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 0ed117b28a..d4f157a83b 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -51,8 +51,8 @@ parameters:
           {"config":
             [{"section": "default",
               "values":
-                [{"option": "compute_manager",
-                  "value": "ironic.nova.compute.manager.ClusterComputeManager"
+                [{"option": "force_config_drive",
+                  "value": "always"
                  }
                 ]
              },