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