diff --git a/openair-cn/S6A/s6a_peer.c b/openair-cn/S6A/s6a_peer.c
index a9664c55bdb82b8ec5f29366087913690a0fa86e..ebc1a2075bcec965ecee87979619f9a85e7da1de 100644
--- a/openair-cn/S6A/s6a_peer.c
+++ b/openair-cn/S6A/s6a_peer.c
@@ -130,7 +130,8 @@ int s6a_fd_new_peer(void)
               fd_g_config->cnf_diamid, fd_g_config->cnf_diamid_len);
 
     hss_name = calloc(1,100);
-    strcat(hss_name, "hss.");
+    strcat(hss_name, mme_config.s6a_config.hss_host_name);
+    strcat(hss_name, ".");
     strcat(hss_name, mme_config.realm);
     info.pi_diamid = hss_name;
     info.pi_diamidlen = strlen(info.pi_diamid);