diff --git a/products/org.eclipse.packagedrone.server/pom.xml b/products/org.eclipse.packagedrone.server/pom.xml
index 127673dd..06d8cf60 100644
--- a/products/org.eclipse.packagedrone.server/pom.xml
+++ b/products/org.eclipse.packagedrone.server/pom.xml
@@ -400,7 +400,8 @@ fi
 							<preremoveScriptlet>
 								<script><![CDATA[
 if [ $1 -eq 0 ] ; then
-    systemctl --no-reload --user --global disable "${drone.app.name}.service" > /dev/null 2>&1 || :
+    systemctl --no-reload disable "${drone.app.name}.service" > /dev/null 2>&1 || :
+    systemctl stop "${drone.app.name}" > /dev/null 2>&1 || :
 fi
 ]]>
 								</script>
@@ -570,7 +571,8 @@ fi
                             <preremoveScriptlet>
                                 <script><![CDATA[
 if [ $1 -eq 0 ] ; then
-    systemctl --no-reload --user --global disable "${drone.app.name}.service" > /dev/null 2>&1 || :
+    systemctl --no-reload disable "${drone.app.name}.service" > /dev/null 2>&1 || :
+    systemctl stop "${drone.app.name}" > /dev/null 2>&1 || :
 fi
 ]]>
                                 </script>