diff --git a/.github/workflows/buildrelease-deb-manual.yml b/.github/workflows/buildrelease-deb-manual.yml
index 4b94bc8..3b88ba7 100644
--- a/.github/workflows/buildrelease-deb-manual.yml
+++ b/.github/workflows/buildrelease-deb-manual.yml
@@ -14,7 +14,10 @@ jobs:
           fetch-tags: true
           fetch-depth: 0
       - run: git tag
-      - run: gbp buildpackage --git-ignore-branch
+      - run: |
+             cp tenstorrent-hugepages.service dev-hugepages\\x2d1G.mount debian/
+             gbp buildpackage --git-ignore-branch
+             rm debian/tenstorrent-hugepages.service debian/dev-hugepages\\x2d1G.mount
       - name: Move Debian packages
         run: mkdir -p artifacts && mv ../*.deb artifacts/
       - name: Set environment variable for deb filename
diff --git a/.github/workflows/buildrelease-deb.yml b/.github/workflows/buildrelease-deb.yml
index 2694af5..433aadc 100644
--- a/.github/workflows/buildrelease-deb.yml
+++ b/.github/workflows/buildrelease-deb.yml
@@ -15,7 +15,10 @@ jobs:
           fetch-tags: true
           fetch-depth: 0
       - run: git tag
-      - run: gbp buildpackage --git-tag --git-upstream-tag='v%(version)s'
+      - run: |
+             cp tenstorrent-hugepages.service dev-hugepages\\x2d1G.mount debian/
+             gbp buildpackage --git-tag --git-upstream-tag='v%(version)s'
+             rm debian/tenstorrent-hugepages.service debian/dev-hugepages\\x2d1G.mount
       - name: release
         uses: actions/create-release@v1
         id: create_release
diff --git a/.gitignore b/.gitignore
index 6b17e47..525bed2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,7 @@ debian/debhelper-build-stamp
 debian/files
 debian/tenstorrent-tools.substvars
 debian/tenstorrent-tools/
+
+# systemd service files copied for building
+debian/tenstorrent-hugepages.service
+debian/dev-hugepages\\x2d1G.mount
diff --git a/debian/rules b/debian/rules
index e5f9d37..62ca6e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,5 +9,5 @@ override_dh_fixperms:
 	chmod 755 debian/tenstorrent-tools/opt/tenstorrent/bin/hugepages-setup.sh
 
 override_dh_installsystemd:
-	dh_installsystemd --name=tenstorrent-hugepages.service
-	dh_installsystemd --name=dev-hugepages\x2d1G.mount
+	dh_installsystemd tenstorrent-hugepages.service
+	dh_installsystemd dev-hugepages\\x2d1G.mount
diff --git a/debian/tenstorrent-tools.install b/debian/tenstorrent-tools.install
index dd45fa8..8d6b09d 100644
--- a/debian/tenstorrent-tools.install
+++ b/debian/tenstorrent-tools.install
@@ -1,5 +1,5 @@
 hugepages-setup.sh /opt/tenstorrent/bin
-tenstorrent-hugepages.service /lib/systemd/system/
-dev-hugepages\\x2d1G.mount /lib/systemd/system/
+debian/tenstorrent-hugepages.service /lib/systemd/system/
+debian/dev-hugepages\\x2d1G.mount /lib/systemd/system/
 debian/tenstorrent-tools.postinst usr/sbin
 
diff --git a/debian/tenstorrent-tools.postinst b/debian/tenstorrent-tools.postinst
index 3d6da11..6416b9c 100755
--- a/debian/tenstorrent-tools.postinst
+++ b/debian/tenstorrent-tools.postinst
@@ -19,3 +19,5 @@ else
   update-grub
 fi
 
+#DEBHELPER#
+