diff --git a/clean_servers.yml b/clean_servers.yml
index b4fd8f288d41aac7440ad5821b614cfa56f12cf7..2a550ed27e803fc42ff7dd3841437a4e271f4fa7 100644
--- a/clean_servers.yml
+++ b/clean_servers.yml
@@ -30,6 +30,7 @@
           - libmonitoring-plugin-perl
           - snmp
           - nagios-plugins-contrib
+          - nagios-nrpe-server
           - python-nagiosplugin
           - python3-nagiosplugin
           - os-prober  # makes grub-install lag
diff --git a/upgrade.yml b/upgrade.yml
new file mode 100644
index 0000000000000000000000000000000000000000..e124ecfabaf033cdd43452a0012f97027a20d445
--- /dev/null
+++ b/upgrade.yml
@@ -0,0 +1,19 @@
+---
+# This is a special playbook to upgrade a server, be careful!
+- hosts: server,test_vm
+  tasks:
+    - name: Upgrade
+      apt:
+        upgrade: dist
+        update_cache: true
+      register: apt_result
+      retries: 3
+      until: apt_result is succeeded
+
+    - name: Clean unwanted olderstuff
+      apt:
+        autoremove: true
+        purge: true
+      register: apt_result
+      retries: 3
+      until: apt_result is succeeded