diff --git a/manifests/app_type.pp b/manifests/app_type.pp
index 7738499..7e52592 100644
--- a/manifests/app_type.pp
+++ b/manifests/app_type.pp
@@ -18,7 +18,6 @@ define sunetdrive::app_type (
     $dbhost = $config[ 'dbhost' ]
     $dbname = $config[ 'dbname' ]
     $dbuser = $config[ 'dbuser' ]
-    $full_backup_retention = $config[ 'full_backup_retention' ]
     $instanceid = $config[ 'instanceid' ]
     $mysql_user_password = $config[ 'mysql_user_password' ]
     $passwordsalt = $config[ 'passwordsalt' ]
diff --git a/manifests/multinode.pp b/manifests/multinode.pp
index 3913f46..f973dc9 100644
--- a/manifests/multinode.pp
+++ b/manifests/multinode.pp
@@ -296,6 +296,10 @@ MACAddressPolicy=none'
     } else {
       $full_backup_retention = hiera('full_backup_retention')
     }
+    # Calculate some values
+    $expiration_months = max(12, $full_backup_retention)
+    $expiration_days_min = $expiration_months * 31
+    $expiration_days_max = $expiration_months * 31 + 93
 
     # Secrets from local.eyaml
     $admin_password = safe_hiera("${customer}_admin_password")
@@ -320,7 +324,6 @@ MACAddressPolicy=none'
       drive_email_template_plain_text_left => hiera($environment)['drive_email_template_plain_text_left'],
       drive_email_template_text_left       => hiera($environment)['drive_email_template_text_left'],
       drive_email_template_url_left        => hiera($environment)['drive_email_template_url_left'],
-      full_backup_retention                => $full_backup_retention,
       mariadb_dir                          => "/opt/multinode/${customer}/mariadb-${customer}",
       mycnf_path                           => 'sunetdrive/multinode/my.cnf.erb',
       mysql_root_password                  => $mysql_root_password,
diff --git a/templates/application/config.php.erb b/templates/application/config.php.erb
index 23080bc..cb30831 100644
--- a/templates/application/config.php.erb
+++ b/templates/application/config.php.erb
@@ -238,6 +238,6 @@ $CONFIG = array (
   'updatechecker' => false,
   'version' => '<%= @nextcloud_version_string %>',
 <% if @environment == 'test' -%>
-  'versions_retention_obligation' => '<%= @expiration_days_min %>,<%= @expiration_days_max %>',
+  'versions_retention_obligation' => '<%= @expiration_days_min %>, <%= @expiration_days_max %>',
 <% end -%>
 );