diff --git a/.github/workflows/amoy_deb_profiles.yml b/.github/workflows/amoy_deb_profiles.yml
index 1882f145e..7e4dd7786 100644
--- a/.github/workflows/amoy_deb_profiles.yml
+++ b/.github/workflows/amoy_deb_profiles.yml
@@ -26,7 +26,7 @@ jobs:
         run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
       - name: adding version
         run: |
-          NUMERIC_VERSION=$( echo ${{ env.GIT_TAG }} | sed 's/[^0-9.]//g' ) 
+          NUMERIC_VERSION=$( echo ${{ env.GIT_TAG }} | sed 's/[^0-9.]//g' )
           echo "VERSION=$NUMERIC_VERSION" >> $GITHUB_ENV
 
 
@@ -56,19 +56,23 @@ jobs:
           ARCH: all
           NODE: sentry
           NETWORK: amoy
-      - name: Copying postinst for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
-        run: cp -rp packaging/templates/package_scripts/postinst.profile packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/postinst
+      - name: Copying Postinst/Postrm for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
+        run: |
+          cp -rp packaging/templates/package_scripts/postinst.profile packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/postinst
+          cp -rp packaging/templates/package_scripts/postrm.profile packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/postrm
         env:
           ARCH: all
           NODE: sentry
           NETWORK: amoy
       - name: Copying preinst for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
-        run: cp -rp packaging/templates/package_scripts/preinst.${{ env.NETWORK }} packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/preinst
+        run: |
+          cp -rp packaging/templates/package_scripts/preinst packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/preinst
+          sed -i "s/{{NETWORK}}/${{ env.NETWORK }}/g" packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/preinst
         env:
           ARCH: all
           NODE: sentry
           NETWORK: amoy
-      - name: Copying config for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
+      - name: Copying heimdall-config for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
         run: cp -rp packaging/templates/config/${{ env.NETWORK }}/heimdall-config.toml packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/var/lib/heimdall/config/heimdall-config.toml
         env:
           ARCH: all
@@ -80,14 +84,10 @@ jobs:
           ARCH: all
           NODE: sentry
           NETWORK: amoy
-      - name: Copying postrm for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
-        run: cp -rp packaging/templates/package_scripts/postrm.profile packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/postrm
-        env:
-          ARCH: all
-          NODE: sentry
-          NETWORK: amoy
       - name: Copying systemd file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
-        run: cp -rp packaging/templates/systemd/heimdalld-amoy-sentry.service packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/heimdalld.service
+        run: |
+          cp -rp packaging/templates/systemd/heimdalld-sentry.service packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/heimdalld.service
+          sed -i "s/{{NETWORK}}/${{ env.NETWORK }}/g" packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/heimdalld.service
         env:
           ARCH: all
           NODE: sentry
@@ -106,25 +106,23 @@ jobs:
           ARCH: all
           NODE: validator
           NETWORK: amoy
-      - name: Copying over the postinst file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
-        run: cp -rp packaging/templates/package_scripts/postinst.profile packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN//postinst
-        env:
-          ARCH: all
-          NODE: validator
-          NETWORK: amoy
-      - name: Copying postrm for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
-        run: cp -rp packaging/templates/package_scripts/postrm.profile packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/postrm
+      - name: Copying over the postinst/postrm file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
+        run: |
+          cp -rp packaging/templates/package_scripts/postinst.profile packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN//postinst
+          cp -rp packaging/templates/package_scripts/postrm.profile packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/postrm
         env:
           ARCH: all
           NODE: validator
           NETWORK: amoy
       - name: Copying preinst for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
-        run: cp -rp packaging/templates/package_scripts/preinst.${{ env.NETWORK }} packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/preinst
+        run: |
+          cp -rp packaging/templates/package_scripts/preinst packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/preinst
+          sed -i "s/{{NETWORK}}/${{ env.NETWORK }}/g" packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/preinst
         env:
           ARCH: all
           NODE: validator
           NETWORK: amoy
-      - name: Copying config for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
+      - name: Copying heimdall-config for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
         run: cp -rp packaging/templates/config/${{ env.NETWORK }}/heimdall-config.toml packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/var/lib/heimdall/config/heimdall-config.toml
         env:
           ARCH: all
@@ -137,7 +135,9 @@ jobs:
           NODE: validator
           NETWORK: amoy
       - name: Copying systemd file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
-        run: cp -rp packaging/templates/systemd/heimdalld-amoy-validator.service packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/heimdalld.service
+        run: |
+          cp -rp packaging/templates/systemd/heimdalld-validator.service packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/heimdalld.service
+          sed -i "s/{{NETWORK}}/${{ env.NETWORK }}/g" packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/heimdalld.service
         env:
           ARCH: all
           NODE: validator
diff --git a/.github/workflows/mainnet_deb_profiles.yml b/.github/workflows/mainnet_deb_profiles.yml
index 71f4ab824..b05ea2638 100644
--- a/.github/workflows/mainnet_deb_profiles.yml
+++ b/.github/workflows/mainnet_deb_profiles.yml
@@ -26,7 +26,7 @@ jobs:
         run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
       - name: adding version
         run: |
-          NUMERIC_VERSION=$( echo ${{ env.GIT_TAG }} | sed 's/[^0-9.]//g' ) 
+          NUMERIC_VERSION=$( echo ${{ env.GIT_TAG }} | sed 's/[^0-9.]//g' )
           echo "VERSION=$NUMERIC_VERSION" >> $GITHUB_ENV
 
 
@@ -57,18 +57,22 @@ jobs:
           NODE: sentry
           NETWORK: mainnet
       - name: Copying the postinst for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
-        run: cp -rp packaging/templates/package_scripts/postinst.profile.mainnet packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/postinst
+        run: |
+          cp -rp packaging/templates/package_scripts/postinst.profile packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/postinst
+          cp -rp packaging/templates/package_scripts/postrm.profile packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/postrm
         env:
           ARCH: all
           NODE: sentry
           NETWORK: mainnet
       - name: Copying preinst for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
-        run: cp -rp packaging/templates/package_scripts/preinst.${{ env.NETWORK }} packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/preinst
+        run: |
+          cp -rp packaging/templates/package_scripts/preinst packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/preinst
+          sed -i "s/{{NETWORK}}/${{ env.NETWORK }}/g" packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/preinst
         env:
           ARCH: all
           NODE: sentry
           NETWORK: mainnet
-      - name: Copying config for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
+      - name: Copying heimdall-config for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
         run: cp -rp packaging/templates/config/${{ env.NETWORK }}/heimdall-config.toml packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/var/lib/heimdall/config/heimdall-config.toml
         env:
           ARCH: all
@@ -86,14 +90,10 @@ jobs:
           ARCH: all
           NODE: sentry
           NETWORK: mainnet
-      - name: Copying the postrm for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
-        run: cp -rp packaging/templates/package_scripts/postrm.profile packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/postrm
-        env:
-          ARCH: all
-          NODE: sentry
-          NETWORK: mainnet
       - name: Copying systemd file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
-        run: cp -rp packaging/templates/systemd/heimdalld-mainnet-sentry.service packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/heimdalld.service
+        run: |
+          cp -rp packaging/templates/systemd/heimdalld-sentry.service packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/heimdalld.service
+          sed -i "s/{{NETWORK}}/${{ env.NETWORK }}/g" packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/heimdalld.service
         env:
           ARCH: all
           NODE: sentry
@@ -112,8 +112,10 @@ jobs:
           ARCH: all
           NODE: validator
           NETWORK: mainnet
-      - name: Copying Postinstall script for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
-        run: cp -rp packaging/templates/package_scripts/postinst.profile.mainnet packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/postinst
+      - name: Copying Postinstall/Postrm script for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
+        run: |
+          cp -rp packaging/templates/package_scripts/postinst.profile packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/postinst
+          cp -rp packaging/templates/package_scripts/postrm.profile packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/postrm
         env:
           ARCH: all
           NODE: validator
@@ -125,12 +127,14 @@ jobs:
           NODE: validator
           NETWORK: mainnet
       - name: Copying preinst for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
-        run: cp -rp packaging/templates/package_scripts/preinst.${{ env.NETWORK }} packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/preinst
+        run: |
+          cp -rp packaging/templates/package_scripts/preinst packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/preinst
+          sed -i "s/{{NETWORK}}/${{ env.NETWORK }}/g" packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/preinst
         env:
           ARCH: all
           NODE: validator
           NETWORK: mainnet
-      - name: Copying config for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
+      - name: Copying heimdall-config for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
         run: cp -rp packaging/templates/config/${{ env.NETWORK }}/heimdall-config.toml packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/var/lib/heimdall/config/heimdall-config.toml
         env:
           ARCH: all
@@ -142,14 +146,10 @@ jobs:
           ARCH: all
           NODE: validator
           NETWORK: mainnet
-      - name: Copying the postrm for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
-        run: cp -rp packaging/templates/package_scripts/postrm.profile packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/postrm
-        env:
-          ARCH: all
-          NODE: validator
-          NETWORK: mainnet
       - name: Copying systemd file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
-        run: cp -rp packaging/templates/systemd/heimdalld-mainnet-validator.service packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/heimdalld.service
+        run: |
+          cp -rp packaging/templates/systemd/heimdalld-validator.service packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/heimdalld.service
+          sed -i "s/{{NETWORK}}/${{env.NETWORK}}/g" packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/heimdalld.service
         env:
           ARCH: all
           NODE: validator
diff --git a/packaging/templates/package_scripts/postinst.profile.amoy b/packaging/templates/package_scripts/postinst.profile.amoy
deleted file mode 100755
index 2515e30fe..000000000
--- a/packaging/templates/package_scripts/postinst.profile.amoy
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-# This is a postinstallation script so the service can be configured and started when requested
-#
-sudo systemctl daemon-reload
diff --git a/packaging/templates/package_scripts/postinst.profile.mainnet b/packaging/templates/package_scripts/postinst.profile.mainnet
deleted file mode 100755
index b0643ced6..000000000
--- a/packaging/templates/package_scripts/postinst.profile.mainnet
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-# This is a postinstallation script so the service can be configured and started when requested
-#
-sudo systemctl daemon-reload
\ No newline at end of file
diff --git a/packaging/templates/package_scripts/postrm b/packaging/templates/package_scripts/postrm
deleted file mode 100755
index 1a56347e6..000000000
--- a/packaging/templates/package_scripts/postrm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-#
-###################
-# Remove heimdall installation
-###################
-sudo systemctl daemon-reload
\ No newline at end of file
diff --git a/packaging/templates/package_scripts/preinst.amoy b/packaging/templates/package_scripts/preinst
old mode 100755
new mode 100644
similarity index 57%
rename from packaging/templates/package_scripts/preinst.amoy
rename to packaging/templates/package_scripts/preinst
index e45167c65..402343ede
--- a/packaging/templates/package_scripts/preinst.amoy
+++ b/packaging/templates/package_scripts/preinst
@@ -4,7 +4,7 @@
 ##################
 # Stops existing for upgrade
 export HEIMDALL_DIR=/var/lib/heimdall
-sudo -u heimdall heimdalld init --chain=amoy --home /var/lib/heimdall
+sudo -u heimdall heimdalld init --chain={{NETWORK}} --home /var/lib/heimdall
 sudo chown -R heimdall $HEIMDALL_DIR
 #################
-#sudo systemctl stop heimdalld.service
+#sudo systemctl stop heimdalld.service
\ No newline at end of file
diff --git a/packaging/templates/systemd/heimdalld-amoy-sentry.service b/packaging/templates/systemd/heimdalld-amoy-sentry.service
deleted file mode 100644
index e9c1f06d7..000000000
--- a/packaging/templates/systemd/heimdalld-amoy-sentry.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-  Description=heimdalld
-  StartLimitIntervalSec=500
-  StartLimitBurst=5
-[Service]
-  Restart=on-failure
-  RestartSec=5s
-  WorkingDirectory=/usr/bin
-  ExecStart=/usr/bin/heimdalld start --home "/var/lib/heimdall" \
-    --chain=amoy \
-    --rest-server
-  Type=simple
-  LimitNOFILE=65536
-  User=heimdall
-[Install]
-  WantedBy=multi-user.target
diff --git a/packaging/templates/systemd/heimdalld-amoy-validator.service b/packaging/templates/systemd/heimdalld-amoy-validator.service
deleted file mode 100644
index 078393036..000000000
--- a/packaging/templates/systemd/heimdalld-amoy-validator.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-  Description=heimdalld
-  StartLimitIntervalSec=500
-  StartLimitBurst=5
-[Service]
-  Restart=on-failure
-  RestartSec=5s
-  WorkingDirectory=/usr/bin
-  ExecStart=/usr/bin/heimdalld start --home "/var/lib/heimdall" \
-		--bridge --all \
-    --chain=amoy \
-    --rest-server
-  Type=simple
-  LimitNOFILE=65536
-  User=heimdall
-[Install]
-  WantedBy=multi-user.target
diff --git a/packaging/templates/systemd/heimdalld-mainnet-sentry.service b/packaging/templates/systemd/heimdalld-mainnet-sentry.service
deleted file mode 100644
index de9d83eab..000000000
--- a/packaging/templates/systemd/heimdalld-mainnet-sentry.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-  Description=heimdalld
-  StartLimitIntervalSec=500
-  StartLimitBurst=5
-[Service]
-  Restart=on-failure
-  RestartSec=5s
-  WorkingDirectory=/usr/bin
-  ExecStart=/usr/bin/heimdalld start --home "/var/lib/heimdall" \
-    --chain=mainnet \
-    --rest-server
-  Type=simple
-  LimitNOFILE=65536
-  User=heimdall
-[Install]
-  WantedBy=multi-user.target
diff --git a/packaging/templates/systemd/heimdalld-mainnet-validator.service b/packaging/templates/systemd/heimdalld-mainnet-validator.service
deleted file mode 100644
index b8f7ad5ea..000000000
--- a/packaging/templates/systemd/heimdalld-mainnet-validator.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-  Description=heimdalld
-  StartLimitIntervalSec=500
-  StartLimitBurst=5
-[Service]
-  Restart=on-failure
-  RestartSec=5s
-  WorkingDirectory=/usr/bin
-  ExecStart=/usr/bin/heimdalld start --home "/var/lib/heimdall" \
-		--bridge --all \
-    --chain=mainnet \
-    --rest-server
-  Type=simple
-  LimitNOFILE=65536
-  User=heimdall
-[Install]
-  WantedBy=multi-user.target
diff --git a/packaging/templates/systemd/heimdalld-sentry.service b/packaging/templates/systemd/heimdalld-sentry.service
index b8ea14b22..7c869f60b 100644
--- a/packaging/templates/systemd/heimdalld-sentry.service
+++ b/packaging/templates/systemd/heimdalld-sentry.service
@@ -7,7 +7,7 @@
   RestartSec=5s
   WorkingDirectory=/usr/bin
   ExecStart=/usr/bin/heimdalld start --home "/var/lib/heimdall" \
-    --chain=mumbai \
+    --chain={{NETWORK}} \
     --rest-server
   Type=simple
   LimitNOFILE=65536
diff --git a/packaging/templates/systemd/heimdalld-validator.service b/packaging/templates/systemd/heimdalld-validator.service
index 8de454d09..b1c794c66 100644
--- a/packaging/templates/systemd/heimdalld-validator.service
+++ b/packaging/templates/systemd/heimdalld-validator.service
@@ -8,7 +8,7 @@
   WorkingDirectory=/usr/bin
   ExecStart=/usr/bin/heimdalld start --home "/var/lib/heimdall" \
 		--bridge --all \
-    --chain=mumbai \
+    --chain={{NETWORK}} \
     --rest-server
   Type=simple
   LimitNOFILE=65536