diff --git a/roles/CephStorage.yaml b/roles/CephStorage.yaml
index d1d1913d9f..eaa36a519d 100644
--- a/roles/CephStorage.yaml
+++ b/roles/CephStorage.yaml
@@ -13,6 +13,7 @@
     StorageMgmt:
       subnet: storage_mgmt_subnet
   uses_deprecated_params: False
+  HostnameFormatDefault: '%stackname%-cephstorage-%index%'
   deprecated_nic_config_name: 'ceph-storage.yaml'
   # CephOSD present so serial has to be 1
   update_serial: 1
diff --git a/roles_data.yaml b/roles_data.yaml
index 4c0d9477de..6cb5a8ce43 100644
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -384,6 +384,7 @@
     StorageMgmt:
       subnet: storage_mgmt_subnet
   uses_deprecated_params: False
+  HostnameFormatDefault: '%stackname%-cephstorage-%index%'
   deprecated_nic_config_name: 'ceph-storage.yaml'
   # CephOSD present so serial has to be 1
   update_serial: 1