diff --git a/environments/cinder-netapp-config.yaml b/environments/cinder-netapp-config.yaml
index 83ecbbe41c..dfd1589395 100644
--- a/environments/cinder-netapp-config.yaml
+++ b/environments/cinder-netapp-config.yaml
@@ -1,7 +1,3 @@
-# *************************************************************************************
-# DEPRECATED: Use tripleo-heat-templates/environments/storage/cinder-netapp-config.yaml
-# instead.
-# *************************************************************************************
 # A Heat environment file which can be used to enable a
 # a Cinder NetApp backend, configured via puppet
 resource_registry:
diff --git a/environments/storage/cinder-netapp-config.yaml b/environments/storage/cinder-netapp-config.yaml
index c118fe7b47..36568458d9 100644
--- a/environments/storage/cinder-netapp-config.yaml
+++ b/environments/storage/cinder-netapp-config.yaml
@@ -124,4 +124,4 @@ parameter_defaults:
   # End static parameters
   # *********************
 resource_registry:
-  OS::TripleO::ControllerExtraConfigPre: ../../puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml
+  OS::TripleO::Services::CinderBackendNetApp: ../puppet/services/cinder-backend-netapp.yaml
diff --git a/sample-env-generator/storage.yaml b/sample-env-generator/storage.yaml
index ec0d070e37..007c53afa3 100644
--- a/sample-env-generator/storage.yaml
+++ b/sample-env-generator/storage.yaml
@@ -136,4 +136,4 @@ environments:
     static:
       - CinderEnableNetappBackend
     resource_registry:
-      OS::TripleO::ControllerExtraConfigPre: ../../puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml
+      OS::TripleO::Services::CinderBackendNetApp: ../puppet/services/cinder-backend-netapp.yaml