diff --git a/appinfo.yml b/appinfo.yml
index 95c4616..6faea6a 100644
--- a/appinfo.yml
+++ b/appinfo.yml
@@ -1,5 +1,11 @@
-mainunit: forgejo.service
-mainunitfile: forgejo.service.j2
+version: 3
+mainunit: forgejo
+enableunits:
+  - forgejo.service
+  - forgejo-watch-sshkeys.service
+plugins:
+  - type: builtin
+    name: backups_scheduled
 ports:
     - web
 templatefiles:
@@ -8,6 +14,8 @@ templatefiles:
   - src: forgejo-watch-sshkeys.j2
     dest: ~/forgejo-watch-sshkeys
     mode: "0755"
+  - src: forgejo.service.j2
+    dest: ~/.config/systemd/user/forgejo.service
   - src: forgejo-watch-sshkeys.service.j2
     dest: ~/.config/systemd/user/forgejo-watch-sshkeys.service
 exports:
diff --git a/forgejo-watch-sshkeys.service.j2 b/forgejo-watch-sshkeys.service.j2
index 6441366..e628cc2 100644
--- a/forgejo-watch-sshkeys.service.j2
+++ b/forgejo-watch-sshkeys.service.j2
@@ -1,6 +1,7 @@
 [Unit]
 Description=Podman Compose based service
 After=network.target
+PartOf={{ mainunit }}
 
 [Service]
 Type=exec
@@ -10,4 +11,4 @@ Restart=always
 WorkingDirectory={{ homedir }}
 
 [Install]
-WantedBy=default.target
+WantedBy={{ mainunit }}
diff --git a/forgejo.service.j2 b/forgejo.service.j2
index b4da167..d171685 100644
--- a/forgejo.service.j2
+++ b/forgejo.service.j2
@@ -1,6 +1,7 @@
 [Unit]
 Description=Podman Compose based service
 After=network.target
+PartOf={{ mainunit }}
 
 [Service]
 Type=exec
@@ -13,4 +14,4 @@ Restart=always
 WorkingDirectory={{ homedir }}
 
 [Install]
-WantedBy=default.target
+WantedBy={{ mainunit }}