diff --git a/dist/debian/debian/scylla-jmx.service b/dist/debian/debian/scylla-jmx.service
new file mode 120000
index 0000000..8df8853
--- /dev/null
+++ b/dist/debian/debian/scylla-jmx.service
@@ -0,0 +1 @@
+../../common/systemd/scylla-jmx.service
\ No newline at end of file
diff --git a/dist/debian/debian/scylla-jmx.upstart b/dist/debian/debian/scylla-jmx.upstart
deleted file mode 100644
index f264c14..0000000
--- a/dist/debian/debian/scylla-jmx.upstart
+++ /dev/null
@@ -1,21 +0,0 @@
-# scylla-jmx - ScyllaDB
-#
-# ScyllaDB
-
-description	"ScyllaDB jmx"
-
-start on started scylla-server
-stop on stopping scylla-server
-
-umask 022
-
-console log
-
-setuid scylla
-setgid scylla
-
-script
-    . /etc/default/scylla-jmx
-    export SCYLLA_HOME SCYLLA_CONF
-    exec /usr/lib/scylla/jmx/scylla-jmx -l /usr/lib/scylla/jmx
-end script
diff --git a/dist/debian/debian_files_gen.py b/dist/debian/debian_files_gen.py
index 44bef34..b0f4cfa 100755
--- a/dist/debian/debian_files_gen.py
+++ b/dist/debian/debian_files_gen.py
@@ -23,8 +23,9 @@
 
 import string
 import os
-import glob
 import shutil
+import re
+from pathlib import Path
 
 class DebianFilesTemplate(string.Template):
     delimiter = '%'
@@ -51,10 +52,20 @@ if os.path.exists('build/debian/debian'):
 shutil.copytree('dist/debian/debian', 'build/debian/debian')
 
 if product != 'scylla':
-    for p in glob.glob('build/debian/debian/scylla-*'):
-        shutil.move(p, p.replace('scylla-', '{}-'.format(product)))
+    for p in Path('build/debian/debian').glob('scylla-*'):
+        # pat1: scylla-server.service
+        #    -> scylla-enterprise-server.scylla-server.service
+        # pat2: scylla-server.scylla-fstrim.service
+        #    -> scylla-enterprise-server.scylla-fstrim.service
+        # pat3: scylla-conf.install
+        #    -> scylla-enterprise-conf.install
 
-shutil.copy('dist/common/systemd/scylla-jmx.service', 'build/debian/debian/scylla-jmx.service')
+        if m := re.match(r'^scylla(-[^.]+)\.service$', p.name):
+            p.rename(p.parent / f'{product}{m.group(1)}.{p.name}')
+        elif m := re.match(r'^scylla(-[^.]+\.scylla-[^.]+\.[^.]+)$', p.name):
+            p.rename(p.parent / f'{product}{m.group(1)}')
+        else:
+            p.rename(p.parent / p.name.replace('scylla', product, 1))
 
 s = DebianFilesTemplate(changelog_template)
 changelog_applied = s.substitute(product=product, version=version, release=release, revision='1', codename='stable')