diff --git a/puppet-modules-wrs/puppet-dcmanager/centos/build_srpm.data b/puppet-modules-wrs/puppet-dcmanager/centos/build_srpm.data
index 29c4710a74..3f8ebcf32e 100644
--- a/puppet-modules-wrs/puppet-dcmanager/centos/build_srpm.data
+++ b/puppet-modules-wrs/puppet-dcmanager/centos/build_srpm.data
@@ -1,3 +1,2 @@
 SRC_DIR="src"
-COPY_LIST="$SRC_DIR/LICENSE"
 TIS_PATCH_VER=1
diff --git a/puppet-modules-wrs/puppet-dcmanager/centos/puppet-dcmanager.spec b/puppet-modules-wrs/puppet-dcmanager/centos/puppet-dcmanager.spec
index 6124c98e9a..dd99ebc4a2 100644
--- a/puppet-modules-wrs/puppet-dcmanager/centos/puppet-dcmanager.spec
+++ b/puppet-modules-wrs/puppet-dcmanager/centos/puppet-dcmanager.spec
@@ -10,7 +10,6 @@ Packager:       Wind River <info@windriver.com>
 URL:            unknown
 
 Source0:        %{name}-%{version}.tar.gz
-Source1:        LICENSE
 
 BuildArch:      noarch
 
@@ -20,16 +19,15 @@ BuildRequires: python2-devel
 A puppet module for dcmanager
 
 %prep
-%autosetup -c %{module_dir}
+%setup
 
 #
 # The src for this puppet module needs to be staged to puppet/modules
 #
 %install
-install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
-cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules
+make install \
+     MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
 
 %files
-%license  %{name}-%{version}/LICENSE
+%license LICENSE
 %{_datadir}/puppet/modules/%{module_dir}
-
diff --git a/puppet-modules-wrs/puppet-dcmanager/src/Makefile b/puppet-modules-wrs/puppet-dcmanager/src/Makefile
new file mode 100644
index 0000000000..3ed5b9eedd
--- /dev/null
+++ b/puppet-modules-wrs/puppet-dcmanager/src/Makefile
@@ -0,0 +1,9 @@
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+MODULEDIR ?= /usr/share/puppet/modules
+
+install:
+	install -d -m 0755 $(MODULEDIR)/dcmanager
+	cp -R dcmanager/ $(MODULEDIR)/
diff --git a/puppet-modules-wrs/puppet-dcorch/centos/build_srpm.data b/puppet-modules-wrs/puppet-dcorch/centos/build_srpm.data
index 29c4710a74..3f8ebcf32e 100644
--- a/puppet-modules-wrs/puppet-dcorch/centos/build_srpm.data
+++ b/puppet-modules-wrs/puppet-dcorch/centos/build_srpm.data
@@ -1,3 +1,2 @@
 SRC_DIR="src"
-COPY_LIST="$SRC_DIR/LICENSE"
 TIS_PATCH_VER=1
diff --git a/puppet-modules-wrs/puppet-dcorch/centos/puppet-dcorch.spec b/puppet-modules-wrs/puppet-dcorch/centos/puppet-dcorch.spec
index 0fac8f4871..95a75be142 100644
--- a/puppet-modules-wrs/puppet-dcorch/centos/puppet-dcorch.spec
+++ b/puppet-modules-wrs/puppet-dcorch/centos/puppet-dcorch.spec
@@ -10,7 +10,6 @@ Packager:       Wind River <info@windriver.com>
 URL:            unknown
 
 Source0:        %{name}-%{version}.tar.gz
-Source1:        LICENSE
 
 BuildArch:      noarch
 
@@ -20,16 +19,16 @@ BuildRequires: python2-devel
 A puppet module for dcorch
 
 %prep
-%autosetup -c %{module_dir}
+%setup
 
 #
 # The src for this puppet module needs to be staged to puppet/modules
 #
 %install
-install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
-cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules
+make install \
+     MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
 
 %files
-%license  %{name}-%{version}/LICENSE
+%license  LICENSE
 %{_datadir}/puppet/modules/%{module_dir}
 
diff --git a/puppet-modules-wrs/puppet-dcorch/src/Makefile b/puppet-modules-wrs/puppet-dcorch/src/Makefile
new file mode 100644
index 0000000000..18c7413223
--- /dev/null
+++ b/puppet-modules-wrs/puppet-dcorch/src/Makefile
@@ -0,0 +1,9 @@
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+MODULEDIR ?= /usr/share/puppet/modules
+
+install:
+	install -d -m 0755 $(MODULEDIR)/dcorch
+	cp -R dcorch/ $(MODULEDIR)/
diff --git a/puppet-modules-wrs/puppet-fm/centos/build_srpm.data b/puppet-modules-wrs/puppet-fm/centos/build_srpm.data
index 29c4710a74..3f8ebcf32e 100644
--- a/puppet-modules-wrs/puppet-fm/centos/build_srpm.data
+++ b/puppet-modules-wrs/puppet-fm/centos/build_srpm.data
@@ -1,3 +1,2 @@
 SRC_DIR="src"
-COPY_LIST="$SRC_DIR/LICENSE"
 TIS_PATCH_VER=1
diff --git a/puppet-modules-wrs/puppet-fm/centos/puppet-fm.spec b/puppet-modules-wrs/puppet-fm/centos/puppet-fm.spec
index 47322e77ad..288367ecdd 100644
--- a/puppet-modules-wrs/puppet-fm/centos/puppet-fm.spec
+++ b/puppet-modules-wrs/puppet-fm/centos/puppet-fm.spec
@@ -10,7 +10,6 @@ Packager:       Wind River <info@windriver.com>
 URL:            unknown
 
 Source0:        %{name}-%{version}.tar.gz
-Source1:        LICENSE
 
 BuildArch:      noarch
 
@@ -20,15 +19,15 @@ BuildRequires: python2-devel
 A puppet module for Fault Management
 
 %prep
-%autosetup -c %{module_dir}
+%setup
 
 #
 # The src for this puppet module needs to be staged to puppet/modules
 #
 %install
-install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
-cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules
+make install \
+     MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
 
 %files
-%license  %{name}-%{version}/LICENSE
+%license LICENSE
 %{_datadir}/puppet/modules/%{module_dir}
diff --git a/puppet-modules-wrs/puppet-fm/src/Makefile b/puppet-modules-wrs/puppet-fm/src/Makefile
new file mode 100644
index 0000000000..1f6f594059
--- /dev/null
+++ b/puppet-modules-wrs/puppet-fm/src/Makefile
@@ -0,0 +1,9 @@
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+MODULEDIR ?= /usr/share/puppet/modules
+
+install:
+	install -d -m 0755 $(MODULEDIR)/fm
+	cp -R fm/ $(MODULEDIR)/
diff --git a/puppet-modules-wrs/puppet-mtce/centos/build_srpm.data b/puppet-modules-wrs/puppet-mtce/centos/build_srpm.data
index 04063a393c..ca30127872 100644
--- a/puppet-modules-wrs/puppet-mtce/centos/build_srpm.data
+++ b/puppet-modules-wrs/puppet-mtce/centos/build_srpm.data
@@ -1,3 +1,2 @@
 SRC_DIR="src"
-COPY_LIST="$SRC_DIR/LICENSE"
 TIS_PATCH_VER=9
diff --git a/puppet-modules-wrs/puppet-mtce/centos/puppet-mtce.spec b/puppet-modules-wrs/puppet-mtce/centos/puppet-mtce.spec
index b5fecfbd24..88f19f6f6d 100644
--- a/puppet-modules-wrs/puppet-mtce/centos/puppet-mtce.spec
+++ b/puppet-modules-wrs/puppet-mtce/centos/puppet-mtce.spec
@@ -10,7 +10,6 @@ Packager:       Wind River <info@windriver.com>
 URL:            unknown
 
 Source0:        %{name}-%{version}.tar.gz
-Source1:        LICENSE
 
 BuildArch:      noarch
 
@@ -20,16 +19,15 @@ BuildRequires: python2-devel
 A puppet module for mtce
 
 %prep
-%autosetup -c %{module_dir}
+%setup
 
 #
 # The src for this puppet module needs to be staged to puppet/modules
 #
 %install
-install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
-cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules
+make install \
+     MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
 
 %files
-%license  %{name}-%{version}/LICENSE
+%license LICENSE
 %{_datadir}/puppet/modules/%{module_dir}
-
diff --git a/puppet-modules-wrs/puppet-mtce/src/Makefile b/puppet-modules-wrs/puppet-mtce/src/Makefile
new file mode 100644
index 0000000000..74f7f73ae0
--- /dev/null
+++ b/puppet-modules-wrs/puppet-mtce/src/Makefile
@@ -0,0 +1,9 @@
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+MODULEDIR ?= /usr/share/puppet/modules
+
+install:
+	install -d -m 0755 $(MODULEDIR)/mtce
+	cp -R mtce/ $(MODULEDIR)/
diff --git a/puppet-modules-wrs/puppet-nfv/centos/puppet-nfv.spec b/puppet-modules-wrs/puppet-nfv/centos/puppet-nfv.spec
index 38693f9ce2..45182332f5 100644
--- a/puppet-modules-wrs/puppet-nfv/centos/puppet-nfv.spec
+++ b/puppet-modules-wrs/puppet-nfv/centos/puppet-nfv.spec
@@ -19,16 +19,16 @@ BuildRequires: python2-devel
 A puppet module for nfv
 
 %prep
-%autosetup -c %{module_dir}
+%setup
 
 #
 # The src for this puppet module needs to be staged to puppet/modules
 #
 %install
-install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
-cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules
+make install \
+     MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
 
 %files
-%license  %{name}-%{version}/LICENSE
+%license LICENSE
 %{_datadir}/puppet/modules/%{module_dir}
 
diff --git a/puppet-modules-wrs/puppet-nfv/src/Makefile b/puppet-modules-wrs/puppet-nfv/src/Makefile
new file mode 100644
index 0000000000..73d8011fa6
--- /dev/null
+++ b/puppet-modules-wrs/puppet-nfv/src/Makefile
@@ -0,0 +1,9 @@
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+MODULEDIR ?= /usr/share/puppet/modules
+
+install:
+	install -d -m 0755 $(MODULEDIR)/nfv
+	cp -R nfv/ $(MODULEDIR)/
diff --git a/puppet-modules-wrs/puppet-nova_api_proxy/centos/build_srpm.data b/puppet-modules-wrs/puppet-nova_api_proxy/centos/build_srpm.data
index 85831c5cdb..f579f0d2ee 100644
--- a/puppet-modules-wrs/puppet-nova_api_proxy/centos/build_srpm.data
+++ b/puppet-modules-wrs/puppet-nova_api_proxy/centos/build_srpm.data
@@ -1,3 +1,2 @@
 SRC_DIR="src"
-COPY_LIST="$SRC_DIR/LICENSE"
 TIS_PATCH_VER=2
diff --git a/puppet-modules-wrs/puppet-nova_api_proxy/centos/puppet-nova_api_proxy.spec b/puppet-modules-wrs/puppet-nova_api_proxy/centos/puppet-nova_api_proxy.spec
index 8e6d3fcabf..cd0907a9d5 100644
--- a/puppet-modules-wrs/puppet-nova_api_proxy/centos/puppet-nova_api_proxy.spec
+++ b/puppet-modules-wrs/puppet-nova_api_proxy/centos/puppet-nova_api_proxy.spec
@@ -10,7 +10,6 @@ Packager:       Wind River <info@windriver.com>
 URL:            unknown
 
 Source0:        %{name}-%{version}.tar.gz
-Source1:        LICENSE
 
 BuildArch:      noarch
 
@@ -20,16 +19,15 @@ BuildRequires: python2-devel
 A puppet module for Nova API Proxy
 
 %prep
-%autosetup -c %{module_dir}
+%setup
 
 #
 # The src for this puppet module needs to be staged to packstack/puppet/modules
 #
 %install
-install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
-cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules
+make install \
+     MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
 
 %files
-%license  %{name}-%{version}/LICENSE
+%license LICENSE
 %{_datadir}/puppet/modules/%{module_dir}
-
diff --git a/puppet-modules-wrs/puppet-nova_api_proxy/src/Makefile b/puppet-modules-wrs/puppet-nova_api_proxy/src/Makefile
new file mode 100644
index 0000000000..1325bc4a29
--- /dev/null
+++ b/puppet-modules-wrs/puppet-nova_api_proxy/src/Makefile
@@ -0,0 +1,9 @@
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+MODULEDIR ?= /usr/share/puppet/modules
+
+install:
+	install -d -m 0755 $(MODULEDIR)/nova_api_proxy
+	cp -R nova_api_proxy/ $(MODULEDIR)/
diff --git a/puppet-modules-wrs/puppet-patching/centos/puppet-patching.spec b/puppet-modules-wrs/puppet-patching/centos/puppet-patching.spec
index 2fad1c1dd8..4e87a42bd4 100644
--- a/puppet-modules-wrs/puppet-patching/centos/puppet-patching.spec
+++ b/puppet-modules-wrs/puppet-patching/centos/puppet-patching.spec
@@ -19,16 +19,15 @@ BuildRequires: python2-devel
 A puppet module for patching
 
 %prep
-%autosetup -c %{module_dir}
+%setup
 
 #
 # The src for this puppet module needs to be staged to packstack/puppet/modules
 #
 %install
-install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
-cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules
+make install \
+     MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
 
 %files
-%license  %{name}-%{version}/LICENSE
+%license LICENSE
 %{_datadir}/puppet/modules/%{module_dir}
-
diff --git a/puppet-modules-wrs/puppet-patching/src/Makefile b/puppet-modules-wrs/puppet-patching/src/Makefile
new file mode 100644
index 0000000000..eab598ab96
--- /dev/null
+++ b/puppet-modules-wrs/puppet-patching/src/Makefile
@@ -0,0 +1,9 @@
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+MODULEDIR ?= /usr/share/puppet/modules
+
+install:
+	install -d -m 0755 $(MODULEDIR)/patching
+	cp -R patching/ $(MODULEDIR)/
diff --git a/puppet-modules-wrs/puppet-smapi/centos/puppet-smapi.spec b/puppet-modules-wrs/puppet-smapi/centos/puppet-smapi.spec
index 7dcde56ac0..2276d42d8b 100644
--- a/puppet-modules-wrs/puppet-smapi/centos/puppet-smapi.spec
+++ b/puppet-modules-wrs/puppet-smapi/centos/puppet-smapi.spec
@@ -19,14 +19,15 @@ BuildRequires: python2-devel
 A puppet module for smapi
 
 %prep
-%autosetup -c %{module_dir}
+%setup
 
 #
 # The src for this puppet module needs to be staged to puppet/modules
 #
 %install
-install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
-cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules
+make install \
+     MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
 
 %files
+%license LICENSE
 %{_datadir}/puppet/modules/%{module_dir}
diff --git a/puppet-modules-wrs/puppet-smapi/src/Makefile b/puppet-modules-wrs/puppet-smapi/src/Makefile
new file mode 100644
index 0000000000..c1932aec40
--- /dev/null
+++ b/puppet-modules-wrs/puppet-smapi/src/Makefile
@@ -0,0 +1,9 @@
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+MODULEDIR ?= /usr/share/puppet/modules
+
+install:
+	install -d -m 0755 $(MODULEDIR)/smapi
+	cp -R smapi/ $(MODULEDIR)/
diff --git a/puppet-modules-wrs/puppet-sshd/centos/build_srpm.data b/puppet-modules-wrs/puppet-sshd/centos/build_srpm.data
index 29c4710a74..3f8ebcf32e 100644
--- a/puppet-modules-wrs/puppet-sshd/centos/build_srpm.data
+++ b/puppet-modules-wrs/puppet-sshd/centos/build_srpm.data
@@ -1,3 +1,2 @@
 SRC_DIR="src"
-COPY_LIST="$SRC_DIR/LICENSE"
 TIS_PATCH_VER=1
diff --git a/puppet-modules-wrs/puppet-sshd/centos/puppet-sshd.spec b/puppet-modules-wrs/puppet-sshd/centos/puppet-sshd.spec
index 6056d50291..85dacafd84 100644
--- a/puppet-modules-wrs/puppet-sshd/centos/puppet-sshd.spec
+++ b/puppet-modules-wrs/puppet-sshd/centos/puppet-sshd.spec
@@ -10,7 +10,6 @@ Packager:       Wind River <info@windriver.com>
 URL:            unknown
 
 Source0:        %{name}-%{version}.tar.gz
-Source1:        LICENSE
 
 BuildArch:      noarch
 
@@ -20,15 +19,15 @@ BuildRequires: python2-devel
 A puppet module for sshd
 
 %prep
-%autosetup -c %{module_dir}
+%setup
 
 #
 # The src for this puppet module needs to be staged to puppet/modules
 #
 %install
-install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
-cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules
+make install \
+     MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
 
 %files
-%license  %{name}-%{version}/LICENSE
+%license LICENSE
 %{_datadir}/puppet/modules/%{module_dir}
diff --git a/puppet-modules-wrs/puppet-sshd/src/Makefile b/puppet-modules-wrs/puppet-sshd/src/Makefile
new file mode 100644
index 0000000000..5ccb38f302
--- /dev/null
+++ b/puppet-modules-wrs/puppet-sshd/src/Makefile
@@ -0,0 +1,9 @@
+
+# SPDX-License-Identifier: Apache-2.0
+#
+
+MODULEDIR ?= /usr/share/puppet/modules
+
+install:
+	install -d -m 0755 $(MODULEDIR)/sshd
+	cp -R sshd/ $(MODULEDIR)/
diff --git a/puppet-modules-wrs/puppet-sysinv/centos/build_srpm.data b/puppet-modules-wrs/puppet-sysinv/centos/build_srpm.data
index 5850dc4b9e..2a099a15f9 100644
--- a/puppet-modules-wrs/puppet-sysinv/centos/build_srpm.data
+++ b/puppet-modules-wrs/puppet-sysinv/centos/build_srpm.data
@@ -1,3 +1,2 @@
 SRC_DIR="src"
-COPY_LIST="$SRC_DIR/LICENSE"
 TIS_PATCH_VER=4
diff --git a/puppet-modules-wrs/puppet-sysinv/centos/puppet-sysinv.spec b/puppet-modules-wrs/puppet-sysinv/centos/puppet-sysinv.spec
index 69960596bc..c66adbb5d1 100644
--- a/puppet-modules-wrs/puppet-sysinv/centos/puppet-sysinv.spec
+++ b/puppet-modules-wrs/puppet-sysinv/centos/puppet-sysinv.spec
@@ -10,7 +10,6 @@ Packager:       Wind River <info@windriver.com>
 URL:            unknown
 
 Source0:        %{name}-%{version}.tar.gz
-Source1:        LICENSE
 
 BuildArch:      noarch
 
@@ -20,16 +19,16 @@ BuildRequires: python2-devel
 A puppet module for sysinv
 
 %prep
-%autosetup -c %{module_dir}
+%setup
 
 #
 # The src for this puppet module needs to be staged to puppet/modules
 #
 %install
-install -d -m 0755 %{buildroot}%{_datadir}/puppet/modules/%{module_dir}
-cp -R %{name}-%{version}/%{module_dir} %{buildroot}%{_datadir}/puppet/modules
+make install \
+     MODULEDIR=%{buildroot}%{_datadir}/puppet/modules
 
 %files
-%license  %{name}-%{version}/LICENSE
+%license LICENSE
 %{_datadir}/puppet/modules/%{module_dir}
 
diff --git a/puppet-modules-wrs/puppet-sysinv/src/Makefile b/puppet-modules-wrs/puppet-sysinv/src/Makefile
new file mode 100644
index 0000000000..782815259a
--- /dev/null
+++ b/puppet-modules-wrs/puppet-sysinv/src/Makefile
@@ -0,0 +1,9 @@
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+MODULEDIR ?= /usr/share/puppet/modules
+
+install:
+	install -d -m 0755 $(MODULEDIR)/sysinv
+	cp -R sysinv/ $(MODULEDIR)/