diff --git a/deployment/ovn/ovn-controller-container-puppet.yaml b/deployment/ovn/ovn-controller-container-puppet.yaml
index 07dd38b31a..1f2f5c0ece 100644
--- a/deployment/ovn/ovn-controller-container-puppet.yaml
+++ b/deployment/ovn/ovn-controller-container-puppet.yaml
@@ -118,7 +118,6 @@ outputs:
                    $NETWORK: {get_param: [ServiceNetMap, NeutronTenantNetwork]}
             ovn::controller::ovn_bridge: {get_param: OVNIntegrationBridge}
             ovn::controller::hostname: "%{hiera('fqdn_canonical')}"
-            nova::compute::force_config_drive: {if: [force_config_drive, true, false]}
             tripleo::profile::base::neutron::agents::ovn::ovn_db_host: {get_param: [EndpointMap, OvnDbInternal, host_nobrackets]}
             tripleo::ovn_controller::firewall_rules:
               '118 neutron vxlan networks':
@@ -127,6 +126,10 @@ outputs:
               '119 neutron geneve networks':
                     proto: 'udp'
                     dport: 6081
+          - if:
+              - force_config_drive
+              - nova::compute::force_config_drive: true
+              - {}
       service_config_settings: {}
       # BEGIN DOCKER SETTINGS
       puppet_config: