diff --git a/bundles/apt/files/upgrade-and-reboot b/bundles/apt/files/upgrade-and-reboot
index 1a0ff36..81516e2 100644
--- a/bundles/apt/files/upgrade-and-reboot
+++ b/bundles/apt/files/upgrade-and-reboot
@@ -46,10 +46,6 @@ fi
 
 if [[ -f /var/run/reboot-required ]] && [[ "$auto_reboot_enabled" == "True" ]]
 then
-    if [[ -n "$reboot_mail_to" ]]
-    then
-        date | mail -s "SYSREBOOTNOW $nodename" "$reboot_mail_to"
-    fi
     systemctl reboot
 fi
 
diff --git a/bundles/apt/files/upgrade-and-reboot.conf b/bundles/apt/files/upgrade-and-reboot.conf
index ca71dce..8eff278 100644
--- a/bundles/apt/files/upgrade-and-reboot.conf
+++ b/bundles/apt/files/upgrade-and-reboot.conf
@@ -1,3 +1,2 @@
 nodename="${node.name}"
-reboot_mail_to="${node.metadata.get('apt/unattended-upgrades/reboot_mail_to', '')}"
 auto_reboot_enabled="${node.metadata.get('apt/unattended-upgrades/reboot_enabled', True)}"
diff --git a/bundles/pacman/files/upgrade-and-reboot b/bundles/pacman/files/upgrade-and-reboot
index 8f1e9c1..41973aa 100644
--- a/bundles/pacman/files/upgrade-and-reboot
+++ b/bundles/pacman/files/upgrade-and-reboot
@@ -44,10 +44,6 @@ then
     exit 1
 fi
 
-if [[ -n "$reboot_mail_to" ]]
-then
-    date | mail -s "SYSREBOOTNOW $nodename" "$reboot_mail_to"
-fi
 systemctl reboot
 
 echo "upgrade-and-reboot for node $nodename is DONE"
diff --git a/groups/os.py b/groups/os.py
index ab6339c..754d427 100644
--- a/groups/os.py
+++ b/groups/os.py
@@ -33,11 +33,6 @@ groups['linux'] = {
         'users',
     },
     'metadata': {
-        'apt': {
-            'unattended-upgrades': {
-                'reboot_mail_to': libs.defaults.hostmaster_email,
-            },
-        },
         'backup-client': {
             'target': 'htz-hel.backup-kunsi',
         },