diff --git a/docker/services/iscsid.yaml b/deployment/iscsid/iscsid-container-puppet.yaml
similarity index 85%
rename from docker/services/iscsid.yaml
rename to deployment/iscsid/iscsid-container-puppet.yaml
index a809f9716c..944c0a6fa7 100644
--- a/docker/services/iscsid.yaml
+++ b/deployment/iscsid/iscsid-container-puppet.yaml
@@ -40,30 +40,21 @@ parameters:
 resources:
 
   ContainersCommon:
-    type: ./containers-common.yaml
-
-  IscsidBase:
-    type: ../../puppet/services/iscsid.yaml
-    properties:
-      EndpointMap: {get_param: EndpointMap}
-      ServiceNetMap: {get_param: ServiceNetMap}
-      DefaultPasswords: {get_param: DefaultPasswords}
-      RoleName: {get_param: RoleName}
-      RoleParameters: {get_param: RoleParameters}
+    type: ../../docker/services/containers-common.yaml
 
 outputs:
   role_data:
     description: Role data for the Iscsid role.
     value:
-      service_name: {get_attr: [IscsidBase, role_data, service_name]}
-      config_settings: {get_attr: [IscsidBase, role_data, config_settings]}
-      service_config_settings: {get_attr: [IscsidBase, role_data, service_config_settings]}
+      service_name: iscsid
+      config_settings: {}
+      service_config_settings: {}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: iscsid
         puppet_tags: iscsid_config
-        step_config:
-          {get_attr: [IscsidBase, role_data, step_config]}
+        step_config: |
+          include ::tripleo::profile::base::iscsid
         config_image: {get_param: DockerIscsidConfigImage}
         volumes:
           # NOTE(bogdando) Containerized or running on baremetal services
diff --git a/environments/baremetal-services.yaml b/environments/baremetal-services.yaml
index a5eb6ab40a..af28a55970 100644
--- a/environments/baremetal-services.yaml
+++ b/environments/baremetal-services.yaml
@@ -25,7 +25,7 @@ resource_registry:
   OS::TripleO::Services::HeatApiCfn: ../deployment/heat/heat-api-cfn-container-puppet.yaml
   OS::TripleO::Services::HeatEngine: ../deployment/heat/heat-engine-container-puppet.yaml
   OS::TripleO::Services::Horizon: ../puppet/services/horizon.yaml
-  OS::TripleO::Services::Iscsid: ../puppet/services/iscsid.yaml
+  OS::TripleO::Services::Iscsid: ../deployment/iscsid/iscsid-container-puppet.yaml
   OS::TripleO::Services::Keystone: ../deployment/keystone/keystone-container-puppet.yaml
   OS::TripleO::Services::Memcached: ../deployment/memcached/memcached-container-puppet.yaml
   OS::TripleO::Services::Multipathd: OS::Heat::None
diff --git a/environments/computealt.yaml b/environments/computealt.yaml
index 960a695935..02e98ae848 100644
--- a/environments/computealt.yaml
+++ b/environments/computealt.yaml
@@ -7,7 +7,7 @@ resource_registry:
   OS::TripleO::Services::FluentdAlt: OS::Heat::None
   # If enabling fluentd you'll need provide the following in a specific resource_registry
   # OS::TripleO::Services::FluentdAlt: ../puppet/services/logging/fluentd.yaml
-  OS::TripleO::Services::IscsidAlt: ../puppet/services/iscsid.yaml
+  OS::TripleO::Services::IscsidAlt: ../deployment/iscsid/iscsid-container-puppet.yaml
   OS::TripleO::Services::NovaComputeAlt: ../puppet/services/nova-compute.yaml
   OS::TripleO::Services::NovaLibvirtAlt: ../puppet/services/nova-libvirt.yaml
   OS::TripleO::Services::NovaMigrationTargetAlt: ../puppet/services/nova-migration-target.yaml
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 51085105f6..7dcf27f83c 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -179,7 +179,7 @@ resource_registry:
   OS::TripleO::Services::HAproxy: docker/services/haproxy.yaml
   OS::TripleO::Services::HAProxyPublicTLS: puppet/services/haproxy-public-tls-inject.yaml
   OS::TripleO::Services::HAProxyInternalTLS: OS::Heat::None
-  OS::TripleO::Services::Iscsid: docker/services/iscsid.yaml
+  OS::TripleO::Services::Iscsid: deployment/iscsid/iscsid-container-puppet.yaml
   OS::TripleO::Services::Keepalived: deployment/keepalived/keepalived-container-puppet.yaml
   OS::TripleO::Services::Memcached: deployment/memcached/memcached-container-puppet.yaml
   OS::TripleO::Services::SaharaApi: OS::Heat::None
diff --git a/puppet/services/iscsid.yaml b/puppet/services/iscsid.yaml
deleted file mode 100644
index d7c1954829..0000000000
--- a/puppet/services/iscsid.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-heat_template_version: rocky
-
-description: >
-  Configure iscsid
-
-parameters:
-  ServiceData:
-    default: {}
-    description: Dictionary packing service data
-    type: json
-  ServiceNetMap:
-    default: {}
-    description: Mapping of service_name -> network name. Typically set
-                 via parameter_defaults in the resource registry.  This
-                 mapping overrides those in ServiceNetMapDefaults.
-    type: json
-  DefaultPasswords:
-    default: {}
-    type: json
-  RoleName:
-    default: ''
-    description: Role name on which the service is applied
-    type: string
-  RoleParameters:
-    default: {}
-    description: Parameters specific to the role
-    type: json
-  EndpointMap:
-    default: {}
-    description: Mapping of service endpoint -> protocol. Typically set
-                 via parameter_defaults in the resource registry.
-    type: json
-
-outputs:
-  role_data:
-    description: Role data for iscsid
-    value:
-      service_name: iscsid
-      config_settings: {}
-      step_config: |
-        include ::tripleo::profile::base::iscsid