diff --git a/puppet/services/cinder-backend-dellemc-unity.yaml b/puppet/services/cinder-backend-dellemc-unity.yaml
index 46244aa975..4197c2cd3e 100644
--- a/puppet/services/cinder-backend-dellemc-unity.yaml
+++ b/puppet/services/cinder-backend-dellemc-unity.yaml
@@ -81,5 +81,3 @@ outputs:
                 cinder::backend::dellemc_unity::storage_protocol: {get_param: CinderDellEMCUnityStorageProtocol}
                 cinder::backend::dellemc_unity::unity_io_ports: {get_param: CinderDellEMCUnityIoPorts}
                 cinder::backend::dellemc_unity::unity_storage_pool_names: {get_param: CinderDellEMCUnityStoragePoolNames}
-      step_config: |
-        include ::tripleo::profile::base::cinder::volume
diff --git a/puppet/services/cinder-backend-dellemc-vmax-iscsi.yaml b/puppet/services/cinder-backend-dellemc-vmax-iscsi.yaml
index 30cccc85b5..cb13e92586 100644
--- a/puppet/services/cinder-backend-dellemc-vmax-iscsi.yaml
+++ b/puppet/services/cinder-backend-dellemc-vmax-iscsi.yaml
@@ -61,5 +61,3 @@ outputs:
                 tripleo::profile::base::cinder::volume::cinder_enable_dellemc_vmax_iscsi_backend: {get_param: CinderEnableDellEMCVMAXISCSIBackend}
                 cinder::backend::dellemc_vmax_iscsi::volume_backend_name: {get_param: CinderDellEMCVMAXISCSIBackendName}
                 cinder::backend::dellemc_vmax_iscsi::cinder_emc_config_file: {get_param: CinderDellEMCVMAXISCSIConfigFile}
-      step_config: |
-        include ::tripleo::profile::base::cinder::volume
diff --git a/puppet/services/cinder-backend-dellemc-vnx.yaml b/puppet/services/cinder-backend-dellemc-vnx.yaml
index 6900832e7e..10e912878b 100644
--- a/puppet/services/cinder-backend-dellemc-vnx.yaml
+++ b/puppet/services/cinder-backend-dellemc-vnx.yaml
@@ -102,5 +102,3 @@ outputs:
                 cinder::backend::emc_vnx::storage_vnx_auth_type: {get_param: CinderDellEMCVNXAuthType}
                 cinder::backend::emc_vnx::storage_vnx_security_file_dir: {get_param: CinderDellEMCVNXStorageSecurityFileDir}
                 cinder::backend::emc_vnx::naviseccli_path: {get_param: CinderDellEMCVNXNaviSecCliPath}
-      step_config: |
-        include ::tripleo::profile::base::cinder::volume
diff --git a/puppet/services/cinder-backend-dellemc-xtremio-iscsi.yaml b/puppet/services/cinder-backend-dellemc-xtremio-iscsi.yaml
index 6123837a64..3c574dd6d0 100644
--- a/puppet/services/cinder-backend-dellemc-xtremio-iscsi.yaml
+++ b/puppet/services/cinder-backend-dellemc-xtremio-iscsi.yaml
@@ -89,5 +89,3 @@ outputs:
                 cinder::backend::dellemc_xtremio_iscsi::xtremio_array_busy_retry_count: {get_param: CinderDellEMCXTREMIOIscsiArrayBusyRetryCount}
                 cinder::backend::dellemc_xtremio_iscsi::xtremio_array_busy_retry_interval: {get_param: CinderDellEMCXTREMIOIscsiArrayBusyRetryInterval}
                 cinder::backend::dellemc_xtremio_iscsi::xtremio_volumes_per_glance_cache: {get_param: CinderDellEMCXTREMIOIscsiVolumesPerGlanceCache}
-      step_config: |
-        include ::tripleo::profile::base::cinder::volume
diff --git a/puppet/services/cinder-backend-dellps.yaml b/puppet/services/cinder-backend-dellps.yaml
index d97795fe2f..c6e2b68734 100644
--- a/puppet/services/cinder-backend-dellps.yaml
+++ b/puppet/services/cinder-backend-dellps.yaml
@@ -97,5 +97,3 @@ outputs:
         cinder::backend::eqlx::eqlx_use_chap: {get_param: CinderDellPsUseChap}
         cinder::backend::eqlx::eqlx_chap_login: {get_param: CinderDellPsChapLogin}
         cinder::backend::eqlx::eqlx_chap_password: {get_param: CinderDellPsChapPassword}
-      step_config: |
-        include ::tripleo::profile::base::cinder::volume
diff --git a/puppet/services/cinder-backend-dellsc.yaml b/puppet/services/cinder-backend-dellsc.yaml
index cebca6230f..ac7a6e9ae2 100644
--- a/puppet/services/cinder-backend-dellsc.yaml
+++ b/puppet/services/cinder-backend-dellsc.yaml
@@ -113,5 +113,3 @@ outputs:
                 cinder::backend::dellsc_iscsi::secondary_san_password: {get_param: CinderDellScSecondarySanPassword}
                 cinder::backend::dellsc_iscsi::secondary_sc_api_port: {get_param: CinderDellScSecondaryScApiPort}
                 cinder::backend::dellsc_iscsi::excluded_domain_ip: {get_param: CinderDellScExcludedDomainIp}
-      step_config: |
-        include ::tripleo::profile::base::cinder::volume
diff --git a/puppet/services/cinder-backend-netapp.yaml b/puppet/services/cinder-backend-netapp.yaml
index 8ee9da96d4..e8afc6e787 100644
--- a/puppet/services/cinder-backend-netapp.yaml
+++ b/puppet/services/cinder-backend-netapp.yaml
@@ -145,5 +145,3 @@ outputs:
         cinder::backend::netapp::netapp_webservice_path: {get_param: CinderNetappWebservicePath}
         cinder::backend::netapp::nas_secure_file_operations: {get_param: CinderNetappNasSecureFileOperations}
         cinder::backend::netapp::nas_secure_file_permissions: {get_param: CinderNetappNasSecureFilePermissions}
-      step_config: |
-        include ::tripleo::profile::base::cinder::volume
diff --git a/puppet/services/cinder-backend-pure.yaml b/puppet/services/cinder-backend-pure.yaml
index eb527fcdc3..5b287cf678 100644
--- a/puppet/services/cinder-backend-pure.yaml
+++ b/puppet/services/cinder-backend-pure.yaml
@@ -76,5 +76,3 @@ outputs:
                 cinder::backend::pure::pure_api_token: {get_input: PureAPIToken}
                 cinder::backend::pure::use_chap_auth: {get_input: PureUseChap}
                 cinder::backend::pure::use_multipath_for_image_xfer: {get_input: PureMultipathXfer}
-      step_config: |
-        include ::tripleo::profile::base::cinder::volume
diff --git a/puppet/services/cinder-backend-scaleio.yaml b/puppet/services/cinder-backend-scaleio.yaml
index 48ba0a2c34..e86d4bdc8a 100644
--- a/puppet/services/cinder-backend-scaleio.yaml
+++ b/puppet/services/cinder-backend-scaleio.yaml
@@ -119,5 +119,3 @@ outputs:
         cinder::backend::scaleio::sio_unmap_volume_before_deletion: {get_param: CinderScaleIOUnmapVolumeBeforeDeletion}
         cinder::backend::scaleio::sio_max_over_subscription_ratio: {get_param: CinderScaleIOMaxOverSubscriptionRatio}
         cinder::backend::scaleio::sio_thin_provision: {get_param: CinderScaleIOSanThinProvision}
-      step_config: |
-        include ::tripleo::profile::base::cinder::volume
diff --git a/puppet/services/cinder-backend-veritas-hyperscale.yaml b/puppet/services/cinder-backend-veritas-hyperscale.yaml
index eee446bf3e..2d97a40179 100644
--- a/puppet/services/cinder-backend-veritas-hyperscale.yaml
+++ b/puppet/services/cinder-backend-veritas-hyperscale.yaml
@@ -52,5 +52,3 @@ outputs:
       service_name: cinder_backend_veritas_hyperscale
       config_settings:
         tripleo::profile::base::cinder::volume::cinder_enable_vrts_hs_backend: true
-      step_config: |
-        include ::tripleo::profile::base::cinder::volume
diff --git a/puppet/services/cinder-hpelefthand-iscsi.yaml b/puppet/services/cinder-hpelefthand-iscsi.yaml
index da065bb6b5..2b52b5a448 100644
--- a/puppet/services/cinder-hpelefthand-iscsi.yaml
+++ b/puppet/services/cinder-hpelefthand-iscsi.yaml
@@ -64,5 +64,3 @@ outputs:
         cinder::backend::hpelefthand_iscsi::hpelefthand_iscsi_chap_enabled: {get_param: CinderHPELeftHandISCSIChapEnabled}
         cinder::backend::hpelefthand_iscsi::hpelefthand_clustername: {get_param: CinderHPELeftHandClusterName}
         cinder::backend::hpelefthand_iscsi::hpelefthand_debug: {get_param: CinderHPELeftHandDebug}
-      step_config: |
-        include ::tripleo::profile::base::cinder::volume