diff --git a/ceph-rgw/templates/bin/rgw/_init_keystone.sh.tpl b/ceph-rgw/templates/bin/rgw/_init_keystone.sh.tpl
index c0d4e0e45..86f41a394 100644
--- a/ceph-rgw/templates/bin/rgw/_init_keystone.sh.tpl
+++ b/ceph-rgw/templates/bin/rgw/_init_keystone.sh.tpl
@@ -22,7 +22,7 @@ cp -va /tmp/ceph.conf /etc/ceph/ceph.conf
 
 cat >> /etc/ceph/ceph.conf <<EOF
 
-[client.rgw.${POD_NAME}]
+[client.rgw.$(hostname -s)]
 rgw_frontends = "civetweb port=${RGW_CIVETWEB_PORT}"
 rgw_keystone_url = "${KEYSTONE_URL}"
 rgw_keystone_admin_user = "${OS_USERNAME}"