diff --git a/appinfo.yml b/appinfo.yml
index 5e24bac..dbb2d29 100644
--- a/appinfo.yml
+++ b/appinfo.yml
@@ -3,9 +3,27 @@ mainunit: backup-manager
 plugins:
   - type: builtin
     name: backups_none
+  - type: builtin
+    name: monitoring
+    config:
+      checks:
+        - name: main
+          message: Backup manager activated
+          interval: 3600
+          okvalue: active
+          command: systemctl is-active --user backup-manager.timer
+        - name: lastrun
+          message: Errors last run
+          interval: 3600
+          okvalue: ""
+          command: cat {{ homedir }}/.backupmanager.errors
+        - name: lastrunrecent
+          message: Backup manager did not run recently
+          interval: 3600
+          okvalue: "OK"
+          command: '[ -f {{ homedir }}/.backupmanager.errors ] && [ $(find {{ homedir }}/.backupmanager.errors -mtime -2) ] && echo "OK" || echo "outdated"'
 enableunits:
   - backup-manager.timer
-  - monitor.socket
 templatefiles:
   - src: backup-manager.timer.j2
     dest: ~/.config/systemd/user/backup-manager.timer
@@ -14,13 +32,6 @@ templatefiles:
   - src: backupmanager.j2
     dest: ~/backupmanager
     mode: "0755"
-  - src: monitor@.service.j2
-    dest: ~/.config/systemd/user/monitor@.service
-  - src: monitor.socket.j2
-    dest: ~/.config/systemd/user/monitor.socket
-  - src: monitor.sh.j2
-    dest: ~/monitor.sh
-    mode: "0755"
   - src: monitor-test.sh.j2
     dest: ~/monitor-test.sh
     mode: "0755"
@@ -93,22 +104,3 @@ configdefinition:
                     description: Repositories where the latest backup is older then timeout days will give a warning that there are no recent backups
   required:
     - repos
-exports:
-  monitoring:
-    checks:
-       - name: main
-         message: Backup manager activated
-         interval: 3600
-         type: string
-         okvalue: active
-       - name: lastrun
-         message: Errors last run
-         interval: 3600
-         type: string
-         okvalue: ""
-       - name: lastrunrecent
-         message: Backup manager did not run recently
-         interval: 3600
-         type: string
-         okvalue: "OK"
-
diff --git a/monitor.sh.j2 b/monitor.sh.j2
deleted file mode 100644
index 0e8e932..0000000
--- a/monitor.sh.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-read -r command
-case $command in
-  main)
-    systemctl is-active --user backup-manager.timer
-    ;;
-  lastrun)
-    cat {{ homedir }}/.backupmanager.errors
-    ;;
-  lastrunrecent)
-    [ -f {{ homedir }}/.backupmanager.errors ] && [ $(find {{ homedir }}/.backupmanager.errors -mtime -2) ] && echo "OK" || echo "outdated"
-    ;;
-  *)
-    echo "Parameter unknown"
-    ;;
-esac
-
-
diff --git a/monitor.socket.j2 b/monitor.socket.j2
deleted file mode 100644
index 4aba33d..0000000
--- a/monitor.socket.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Execute Command Socket
-PartOf={{ mainunit }}
-
-[Socket]
-ListenStream={{ statedir }}/{{ name }}.monitoring
-Accept=yes
-
-[Install]
-WantedBy={{ mainunit }}
diff --git a/monitor@.service.j2 b/monitor@.service.j2
deleted file mode 100644
index 702d541..0000000
--- a/monitor@.service.j2
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Execute Command Service
-After=network.target
-Requires=monitor.socket
-
-[Service]
-Type=simple
-ExecStart={{ homedir }}/monitor.sh
-StandardInput=socket
-StandardOutput=socket
-TimeoutStopSec=5
-RuntimeMaxSec=10
\ No newline at end of file