diff --git a/.github/workflows/amoy_deb_profiles.yml b/.github/workflows/amoy_deb_profiles.yml
index ebcdfca0ba..4258967ec3 100644
--- a/.github/workflows/amoy_deb_profiles.yml
+++ b/.github/workflows/amoy_deb_profiles.yml
@@ -194,7 +194,6 @@ jobs:
           ARCH: all
           NODE: sentry
           NETWORK: amoy
-
       - name: Running package build for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
         run: dpkg-deb --build --root-owner-group packaging/deb/bor-pbss-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}
         env:
@@ -233,6 +232,12 @@ jobs:
           ARCH: all
           NODE: validator
           NETWORK: amoy
+      - name: Copying systemd file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
+        run: cp -rp packaging/templates/systemd/bor.service packaging/deb/bor-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/
+        env:
+          ARCH: all
+          NODE: validator
+          NETWORK: amoy
       - name: Building bor ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} profile
         run: dpkg-deb --build --root-owner-group packaging/deb/bor-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}
         env:
@@ -271,6 +276,12 @@ jobs:
           ARCH: all
           NODE: validator
           NETWORK: amoy
+      - name: Copying systemd file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
+        run: cp -rp packaging/templates/systemd/bor.service packaging/deb/bor-pbss-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/
+        env:
+          ARCH: all
+          NODE: validator
+          NETWORK: amoy
       - name: Building bor ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} profile
         run: dpkg-deb --build --root-owner-group packaging/deb/bor-pbss-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}
         env:
@@ -315,6 +326,12 @@ jobs:
           ARCH: all
           NODE: archive
           NETWORK: amoy
+      - name: Copying systemd file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
+        run: cp -rp packaging/templates/systemd/bor.service packaging/deb/bor-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/
+        env:
+          ARCH: all
+          NODE: archive
+          NETWORK: amoy
       - name: Building bor ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} profile
         run: dpkg-deb --build --root-owner-group packaging/deb/bor-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}
         env:
diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control
deleted file mode 100644
index 9008ea5c32..0000000000
--- a/packaging/templates/package_scripts/control
+++ /dev/null
@@ -1,12 +0,0 @@
-Source: bor
-Version: 1.5.2
-Section: develop
-Priority: standard
-Maintainer: Polygon <release-team@polygon.technology>
-Build-Depends: debhelper-compat (= 13)
-Package: bor
-Rules-Requires-Root: yes
-Architecture: amd64
-Multi-Arch: foreign
-Depends:
-Description: This is the bor package from Polygon Technology.
diff --git a/packaging/templates/package_scripts/control.arm64 b/packaging/templates/package_scripts/control.arm64
deleted file mode 100644
index 9b67e9dc56..0000000000
--- a/packaging/templates/package_scripts/control.arm64
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: bor
-Version: 1.5.2
-Section: develop
-Priority: standard
-Maintainer: Polygon <release-team@polygon.technology>
-Build-Depends: debhelper-compat (= 13)
-Rules-Requires-Root: yes
-Package: bor
-Architecture: arm64
-Multi-Arch: foreign
-Depends:
-Description: This is the bor package from Polygon Technology.
-
diff --git a/packaging/templates/package_scripts/control.profile.amd64 b/packaging/templates/package_scripts/control.profile.amd64
deleted file mode 100644
index 591848766f..0000000000
--- a/packaging/templates/package_scripts/control.profile.amd64
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: bor-profile
-Version: 1.5.2
-Section: develop
-Priority: standard
-Maintainer: Polygon <release-team@polygon.technology>
-Build-Depends: debhelper-compat (= 13)
-Rules-Requires-Root: yes
-Package: bor-profile
-Architecture: amd64
-Multi-Arch: foreign
-Depends:
-Description: This is the bor package from Polygon Technology.
-
-
diff --git a/packaging/templates/package_scripts/control.profile.arm64 b/packaging/templates/package_scripts/control.profile.arm64
deleted file mode 100644
index 28c58b93a7..0000000000
--- a/packaging/templates/package_scripts/control.profile.arm64
+++ /dev/null
@@ -1,12 +0,0 @@
-Source: bor-profile
-Version: 1.5.2
-Section: develop
-Priority: standard
-Maintainer: Polygon <release-team@polygon.technology>
-Build-Depends: debhelper-compat (= 13)
-Rules-Requires-Root: yes
-Package: bor-profile
-Architecture: arm64
-Multi-Arch: foreign
-Depends:
-Description: This is the bor package from Polygon Technology.
diff --git a/packaging/templates/package_scripts/control.validator b/packaging/templates/package_scripts/control.validator
deleted file mode 100644
index 617c260911..0000000000
--- a/packaging/templates/package_scripts/control.validator
+++ /dev/null
@@ -1,12 +0,0 @@
-Source: bor-profile
-Version: 1.5.2
-Section: develop
-Priority: standard
-Maintainer: Polygon <release-team@polygon.technology>
-Build-Depends: debhelper-compat (= 13)
-Package: bor-profile
-Rules-Requires-Root: yes
-Architecture: amd64
-Multi-Arch: foreign
-Depends:
-Description: This is the bor package from Polygon Technology.
diff --git a/packaging/templates/package_scripts/control.validator.arm64 b/packaging/templates/package_scripts/control.validator.arm64
deleted file mode 100644
index 8c22ec7920..0000000000
--- a/packaging/templates/package_scripts/control.validator.arm64
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: bor-profile
-Version: 1.5.2
-Section: develop
-Priority: standard
-Maintainer: Polygon <release-team@polygon.technology>
-Build-Depends: debhelper-compat (= 13)
-Rules-Requires-Root: yes
-Package: bor-profile
-Architecture: arm64
-Multi-Arch: foreign
-Depends:
-Description: This is the bor package from Polygon Technology.
-
diff --git a/scripts/updateVersion.sh b/scripts/updateVersion.sh
index ab8f3aedfa..ac29f075b2 100755
--- a/scripts/updateVersion.sh
+++ b/scripts/updateVersion.sh
@@ -51,22 +51,6 @@ fi
 echo ""
 echo "New version is: $version"
 
-# update version in all the 6 templates
-replace="Version: "$version
-fileArray=(
-    "${DIR}/../packaging/templates/package_scripts/control"
-    "${DIR}/../packaging/templates/package_scripts/control.arm64"
-    "${DIR}/../packaging/templates/package_scripts/control.profile.amd64"
-    "${DIR}/../packaging/templates/package_scripts/control.profile.arm64"
-    "${DIR}/../packaging/templates/package_scripts/control.validator"
-    "${DIR}/../packaging/templates/package_scripts/control.validator.arm64"
-)
-for file in ${fileArray[@]}; do
-    # get the line starting with `Version` in the control file and store it in the $temp variable
-    temp=$(grep "^Version.*" $file)
-    sed -i '' "s%$temp%$replace%" $file
-done
-
 # update version in  ../params/version.go
 versionFile="${DIR}/../params/version.go"
 sed -i '' "s% = .*// Major% = $VersionMajor // Major%g" $versionFile