diff --git a/flatpak/com.mitchellh.ghostty-debug.yml b/flatpak/com.mitchellh.ghostty-debug.yml
index 8a2c0056e..0ac8851e0 100644
--- a/flatpak/com.mitchellh.ghostty-debug.yml
+++ b/flatpak/com.mitchellh.ghostty-debug.yml
@@ -52,6 +52,13 @@ modules:
         --prefix /app
         --search-prefix /app
         --system $PWD/vendor/p
+
+      # Rename to match service and drop systemd references
+      - sed -e 's/^Name=.*/\0-debug/'
+        -e '/^SystemdService=/d'
+        /app/share/dbus-1/services/com.mitchellh.ghostty.service
+        > /app/share/dbus-1/services/com.mitchellh.ghostty-debug.service
+      - rm /app/share/dbus-1/services/com.mitchellh.ghostty.service
     sources:
       - type: dir
         path: ..
diff --git a/flatpak/com.mitchellh.ghostty.yml b/flatpak/com.mitchellh.ghostty.yml
index 1b119c11b..9ba64dc0e 100644
--- a/flatpak/com.mitchellh.ghostty.yml
+++ b/flatpak/com.mitchellh.ghostty.yml
@@ -47,6 +47,10 @@ modules:
         --prefix /app
         --search-prefix /app
         --system $PWD/vendor/p
+
+      # Remove references to the user service. Flatpak does not export those.
+      - sed -i '/^SystemdService=/d'
+        /app/share/dbus-1/services/com.mitchellh.ghostty.service
     sources:
       - type: dir
         path: ..