diff --git a/puppet/common.yaml b/puppet/common.yaml
index 13d52485ca9378118d24ac781af13c1f6ca0e3b2..ee24711311a5b8998d8043db30126d2ba4c81947 100644
--- a/puppet/common.yaml
+++ b/puppet/common.yaml
@@ -10,6 +10,14 @@ tails::apt::cron_mode: ''
 tails::apt::proxy: ''
 tails::apt::proxy_port: ''
 
+tails::base::is_puppet_master: false
+tails::base::manage_grub: false
+tails::base::monitoring_agent: false
+tails::base::root_mail_recipient: 'tails@boum.org'
+tails::base::shorewall: false
+tails::base::sshd_tcp_forwarding: 'no'
+tails::base::has_nvme: false
+
 tails::weblate::admins: 'root'
 tails::weblate::db_password: 'db_password'
 tails::weblate::code_git_remote: '__WEBLATE_URL__'
diff --git a/puppet/default.pp b/puppet/default.pp
index a2502491f4ad21e6449a627bc925c70af6bca726..0e49924c73808990a2855400fa82b88816f66c58 100644
--- a/puppet/default.pp
+++ b/puppet/default.pp
@@ -7,15 +7,6 @@ node 'default' {
     path => '/bin:/sbin:/usr/bin:/usr/sbin',
   }
 
-  class { 'tails::base':
-    is_puppet_master    => false,
-    manage_grub         => false,
-    monitoring_agent    => false,
-    root_mail_recipient => 'drebs@riseup.net',
-    shorewall           => false,
-    sshd_tcp_forwarding => 'no',
-    has_nvme            => false,
-  }
-
+  include tails::base
   include tails::weblate
 }