diff --git a/modules/openstack_project/manifests/ethercalc.pp b/modules/openstack_project/manifests/ethercalc.pp
index e54d56f559..2e0e875bd1 100644
--- a/modules/openstack_project/manifests/ethercalc.pp
+++ b/modules/openstack_project/manifests/ethercalc.pp
@@ -28,7 +28,7 @@ class openstack_project::ethercalc (
   # is required like with mysql.
   include bup
   bup::site { 'ord.rax':
-    backup_user   => 'bup-ethercalc01',
+    backup_user   => "bup-$::hostname",
     backup_server => 'backup01.ord.rax.ci.openstack.org',
   }
 }