diff --git a/centos_iso_image.inc b/centos_iso_image.inc
index 316cdeec64..21449921f5 100644
--- a/centos_iso_image.inc
+++ b/centos_iso_image.inc
@@ -6,7 +6,6 @@
 # workerconfig
 workerconfig
 workerconfig-standalone
-workerconfig-subfunction
 
 # controllerconfig
 controllerconfig
diff --git a/controllerconfig/controllerconfig/scripts/controller_config b/controllerconfig/controllerconfig/scripts/controller_config
index 2e212275d5..6a97611ea1 100755
--- a/controllerconfig/controllerconfig/scripts/controller_config
+++ b/controllerconfig/controllerconfig/scripts/controller_config
@@ -588,7 +588,7 @@ start()
 
     if [ -f ${HOST_HIERA} ]; then
         echo "$0: Running puppet manifest apply"
-        puppet-manifest-apply.sh ${HIERADATA_PATH} ${IPADDR} controller
+        puppet-manifest-apply.sh ${HIERADATA_PATH} ${IPADDR} ${subfunction}
         RC=$?
         if [ $RC -ne 0 ]
         then
diff --git a/workerconfig/centos/workerconfig.spec b/workerconfig/centos/workerconfig.spec
index 3ae0d0456f..e9a9c598b3 100644
--- a/workerconfig/centos/workerconfig.spec
+++ b/workerconfig/centos/workerconfig.spec
@@ -22,13 +22,6 @@ Group: base
 %description -n workerconfig-standalone
 Initial worker node configuration
 
-%package -n workerconfig-subfunction
-Summary: workerconfig
-Group: base
-
-%description -n workerconfig-subfunction
-Initial worker node configuration
-
 %define initddir /etc/init.d/
 %define goenableddir /etc/goenabled.d/
 %define systemddir /etc/systemd/system/
@@ -53,19 +46,6 @@ else
 fi
 systemctl enable workerconfig.service
 
-
-%post -n workerconfig-subfunction
-if [ ! -e $D%{systemddir}/workerconfig.service ]; then
-    cp $D%{systemddir}/config/workerconfig-combined.service $D%{systemddir}/workerconfig.service
-else
-    cmp -s $D%{systemddir}/config/workerconfig-combined.service $D%{systemddir}/workerconfig.service
-    if [ $? -ne 0 ]; then
-        rm -f $D%{systemddir}/workerconfig.service
-        cp $D%{systemddir}/config/workerconfig-combined.service $D%{systemddir}/workerconfig.service
-    fi
-fi
-systemctl enable workerconfig.service
-
 %clean
 
 %files
@@ -79,7 +59,3 @@ systemctl enable workerconfig.service
 %{systemddir}/config/workerconfig-standalone.service
 %{goenableddir}/*
 
-%files -n workerconfig-subfunction
-%defattr(-,root,root,-)
-%dir %{systemddir}/config
-%{systemddir}/config/workerconfig-combined.service
diff --git a/workerconfig/opensuse/workerconfig.spec b/workerconfig/opensuse/workerconfig.spec
index d1295e7503..eb80b5ec1f 100644
--- a/workerconfig/opensuse/workerconfig.spec
+++ b/workerconfig/opensuse/workerconfig.spec
@@ -23,13 +23,6 @@ Group: System/Packages
 %description -n workerconfig-standalone
 Initial worker node configuration for StarlingX project.
 
-%package -n workerconfig-subfunction
-Summary: The worker config subfunction package
-Group: System/Packages
-
-%description -n workerconfig-subfunction
-Initial worker node configuration for StarlingX project.
-
 %define initddir %{_sysconfdir}/init.d/
 %define goenableddir %{_sysconfdir}/goenabled.d/
 %define systemddir %{_sysconfdir}/systemd/system/
@@ -46,11 +39,6 @@ make install INITDDIR=%{buildroot}%{initddir} GOENABLEDDIR=%{buildroot}%{goenabl
 cp $D%{systemddir}/config/workerconfig-standalone.service $D%{systemddir}/workerconfig.service
 systemctl enable workerconfig.service
 
-
-%post -n workerconfig-subfunction
-cp $D%{systemddir}/config/workerconfig-combined.service $D%{systemddir}/workerconfig.service
-systemctl enable workerconfig.service
-
 %clean
 
 %files
@@ -68,12 +56,4 @@ systemctl enable workerconfig.service
 %dir %{_sysconfdir}/systemd/system
 %config %{systemddir}/config/workerconfig-standalone.service
 
-%files -n workerconfig-subfunction
-%defattr(-,root,root,-)
-%dir %{systemddir}/config
-%{systemddir}/config/workerconfig-combined.service
-%dir %{_sysconfdir}/systemd
-%dir %{_sysconfdir}/systemd/system
-%config %{systemddir}/config/workerconfig-combined.service
-
 %changelog
diff --git a/workerconfig/workerconfig/Makefile b/workerconfig/workerconfig/Makefile
index 387618f408..b24d143ebe 100644
--- a/workerconfig/workerconfig/Makefile
+++ b/workerconfig/workerconfig/Makefile
@@ -14,4 +14,3 @@ install:
 	install -p -D -m 700 worker_config $(INITDDIR)/worker_config
 	install -p -D -m 755 config_goenabled_check.sh $(GOENABLEDDIR)/config_goenabled_check.sh
 	install -p -D -m 664 workerconfig.service $(SYSTEMDDIR)/config/workerconfig-standalone.service
-	install -p -D -m 664 workerconfig-combined.service $(SYSTEMDDIR)/config/workerconfig-combined.service
diff --git a/workerconfig/workerconfig/workerconfig-combined.service b/workerconfig/workerconfig/workerconfig-combined.service
deleted file mode 100644
index 6aefb66888..0000000000
--- a/workerconfig/workerconfig/workerconfig-combined.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=workerconfig service
-After=syslog.target network.service remote-fs.target
-After=sw-patch.service
-After=affine-platform.sh.service
-After=controllerconfig.service config.service
-After=goenabled.service
-After=sysinv-agent.service
-After=network-online.target
-
-[Service]
-Type=simple
-ExecStart=/etc/init.d/worker_config start
-ExecStop=
-ExecReload=
-StandardOutput=syslog+console
-StandardError=syslog+console
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target