diff --git a/appinfo.yml b/appinfo.yml
index 3df4d67..5e24bac 100644
--- a/appinfo.yml
+++ b/appinfo.yml
@@ -1,6 +1,14 @@
-mainunit: backup-manager.timer
-mainunitfile: backup-manager.timer.j2
+version: 3
+mainunit: backup-manager
+plugins:
+  - type: builtin
+    name: backups_none
+enableunits:
+  - backup-manager.timer
+  - monitor.socket
 templatefiles:
+  - src: backup-manager.timer.j2
+    dest: ~/.config/systemd/user/backup-manager.timer
   - src: backup-manager.service.j2
     dest: ~/.config/systemd/user/backup-manager.service
   - src: backupmanager.j2
@@ -16,7 +24,6 @@ templatefiles:
   - src: monitor-test.sh.j2
     dest: ~/monitor-test.sh
     mode: "0755"
-backuptype: none
 configdefinition:
   "$id": "backup manager config"
   "$schema": "http://json-schema.org/draft-07/schema#"
diff --git a/backup-manager.timer.j2 b/backup-manager.timer.j2
index cd9b9e5..8de83d0 100644
--- a/backup-manager.timer.j2
+++ b/backup-manager.timer.j2
@@ -1,5 +1,6 @@
 [Unit]
 Description=Sync backups
+PartOf={{ mainunit }}
 
 [Timer]
 OnCalendar=*-*-* 10:00:00
@@ -7,5 +8,5 @@ RandomizedDelaySec=3h
 Persistent=true
 
 [Install]
-WantedBy=timers.target
+WantedBy={{ mainunit }}
 
diff --git a/monitor.socket.j2 b/monitor.socket.j2
index 17163d1..4aba33d 100644
--- a/monitor.socket.j2
+++ b/monitor.socket.j2
@@ -1,9 +1,10 @@
 [Unit]
 Description=Execute Command Socket
+PartOf={{ mainunit }}
 
 [Socket]
 ListenStream={{ statedir }}/{{ name }}.monitoring
 Accept=yes
 
 [Install]
-WantedBy=sockets.target
+WantedBy={{ mainunit }}
diff --git a/monitor@.service.j2 b/monitor@.service.j2
index 55ee896..702d541 100644
--- a/monitor@.service.j2
+++ b/monitor@.service.j2
@@ -9,7 +9,4 @@ ExecStart={{ homedir }}/monitor.sh
 StandardInput=socket
 StandardOutput=socket
 TimeoutStopSec=5
-RuntimeMaxSec=10
-
-[Install]
-WantedBy=sockets.target
\ No newline at end of file
+RuntimeMaxSec=10
\ No newline at end of file