diff --git a/inventory/opensuse/inventory.rpmlintrc b/inventory/opensuse/inventory.rpmlintrc
new file mode 100644
index 00000000..adc59bf3
--- /dev/null
+++ b/inventory/opensuse/inventory.rpmlintrc
@@ -0,0 +1 @@
+setBadness('script-without-shebang', 2)
diff --git a/inventory/opensuse/inventory.spec b/inventory/opensuse/inventory.spec
index ecf61ceb..8d45c918 100644
--- a/inventory/opensuse/inventory.spec
+++ b/inventory/opensuse/inventory.spec
@@ -1,6 +1,6 @@
 Summary: StarlingX Inventory
 Name: inventory
-Version: 1.0
+Version: 1.0.0
 Release: 1
 License: Apache-2.0
 Group: System/Base
@@ -97,7 +97,7 @@ The inventory service for StarlingX
 %define debug_package %{nil}
 
 %prep
-%setup
+%setup -n %{name}-%{version}/%{name}
 
 # Remove bundled egg-info
 rm -rf *.egg-info
diff --git a/mtce-common/opensuse/mtce-common.rpmlintrc b/mtce-common/opensuse/mtce-common.rpmlintrc
new file mode 100644
index 00000000..adc59bf3
--- /dev/null
+++ b/mtce-common/opensuse/mtce-common.rpmlintrc
@@ -0,0 +1 @@
+setBadness('script-without-shebang', 2)
diff --git a/mtce-common/opensuse/mtce-common.spec b/mtce-common/opensuse/mtce-common.spec
index e600e6c9..e7f20992 100644
--- a/mtce-common/opensuse/mtce-common.spec
+++ b/mtce-common/opensuse/mtce-common.spec
@@ -1,5 +1,5 @@
 Name:           mtce-common
-Version:        1.0
+Version:        1.0.0
 Release:        1
 Summary:        Maintenance Common Base Package
 License:        Apache-2.0
@@ -86,7 +86,7 @@ and related items necessary for software development.
 %define debug_package %{nil}
 
 %prep
-%autosetup
+%autosetup -n %{name}-%{version}/src
 
 %build
 VER=%{version}
@@ -94,7 +94,7 @@ MAJOR=$(echo $VER | awk -F . '{print $1}')
 MINOR=$(echo $VER | awk -F . '{print $2}')
 make MAJOR=$MAJOR MINOR=$MINOR %{?_smp_mflags} build
 
-%global _buildsubdir %{_builddir}/%{name}-%{version}
+%global _buildsubdir %{_builddir}/%{name}-%{version}/src
 
 %install
 VER=%{version}
diff --git a/mtce-compute/opensuse/mtce-compute.rpmlintrc b/mtce-compute/opensuse/mtce-compute.rpmlintrc
new file mode 100644
index 00000000..adc59bf3
--- /dev/null
+++ b/mtce-compute/opensuse/mtce-compute.rpmlintrc
@@ -0,0 +1 @@
+setBadness('script-without-shebang', 2)
diff --git a/mtce-compute/opensuse/mtce-compute.spec b/mtce-compute/opensuse/mtce-compute.spec
index 6cc8bbd8..5474d443 100644
--- a/mtce-compute/opensuse/mtce-compute.spec
+++ b/mtce-compute/opensuse/mtce-compute.spec
@@ -1,7 +1,7 @@
 %define local_etc_goenabledd %{_sysconfdir}/goenabled.d
 Summary: Compute Node Maintenance Package
 Name: mtce-compute
-Version: 1.0
+Version: 1.0.0
 Release: 1
 License: Apache-2.0
 Group: Development/Tools/Other
@@ -19,7 +19,7 @@ Requires: qemu-kvm
 Maintenance support files for compute-only node type
 
 %prep
-%autosetup
+%autosetup -n %{name}-%{version}/src
 
 %build
 
diff --git a/mtce-control/opensuse/mtce-control.rpmlintrc b/mtce-control/opensuse/mtce-control.rpmlintrc
new file mode 100644
index 00000000..adc59bf3
--- /dev/null
+++ b/mtce-control/opensuse/mtce-control.rpmlintrc
@@ -0,0 +1 @@
+setBadness('script-without-shebang', 2)
diff --git a/mtce-control/opensuse/mtce-control.spec b/mtce-control/opensuse/mtce-control.spec
index 237fc102..76cf5b65 100644
--- a/mtce-control/opensuse/mtce-control.spec
+++ b/mtce-control/opensuse/mtce-control.spec
@@ -1,6 +1,6 @@
 Summary: Controller Node Maintenance Package
 Name: mtce-control
-Version: 1.0
+Version: 1.0.0
 Release: 1
 License: Apache-2.0
 Group: Development/Tools/Other
@@ -20,7 +20,7 @@ Requires: qemu-kvm
 Maintenance support files for controller-only node type
 
 %prep
-%autosetup
+%autosetup -n %{name}-%{version}/src
 
 %build
 
diff --git a/mtce-storage/opensuse/mtce-storage.rpmlintrc b/mtce-storage/opensuse/mtce-storage.rpmlintrc
new file mode 100644
index 00000000..adc59bf3
--- /dev/null
+++ b/mtce-storage/opensuse/mtce-storage.rpmlintrc
@@ -0,0 +1 @@
+setBadness('script-without-shebang', 2)
diff --git a/mtce-storage/opensuse/mtce-storage.spec b/mtce-storage/opensuse/mtce-storage.spec
index 15c2ece8..b244abc1 100644
--- a/mtce-storage/opensuse/mtce-storage.spec
+++ b/mtce-storage/opensuse/mtce-storage.spec
@@ -1,6 +1,6 @@
 Summary:        StarlingX Platform Storage Node Maintenance
 Name:           mtce-storage
-Version:        1.0
+Version:        1.0.0
 Release:        0
 License:        Apache-2.0
 Group:          Development/Tools/Other
@@ -19,7 +19,7 @@ BuildArch: noarch
 Maintenance support files for storage-only node type.
 
 %prep
-%autosetup
+%autosetup -n %{name}-%{version}/src
 
 %build
 
diff --git a/python-inventoryclient/opensuse/python-inventoryclient.rpmlintrc b/python-inventoryclient/opensuse/python-inventoryclient.rpmlintrc
new file mode 100644
index 00000000..adc59bf3
--- /dev/null
+++ b/python-inventoryclient/opensuse/python-inventoryclient.rpmlintrc
@@ -0,0 +1 @@
+setBadness('script-without-shebang', 2)
diff --git a/python-inventoryclient/opensuse/python-inventoryclient.spec b/python-inventoryclient/opensuse/python-inventoryclient.spec
index 9baa1569..4439507e 100644
--- a/python-inventoryclient/opensuse/python-inventoryclient.spec
+++ b/python-inventoryclient/opensuse/python-inventoryclient.spec
@@ -1,6 +1,6 @@
 %global pypi_name inventoryclient
 Name:           python-inventoryclient
-Version:        1.0
+Version:        1.0.0
 Release:        1
 Summary:        A python client library for Inventory
 License:        Apache-2.0
@@ -39,7 +39,7 @@ Summary:        SDK files for %{name}
 This package contains SDK files for %{name} package.
 
 %prep
-%autosetup
+%autosetup -n %{name}-%{version}/inventoryclient
 
 # Remove bundled egg-info
 rm -rf *.egg-info