diff --git a/init.sh b/init.sh
index 166a65a..72ae2e8 100755
--- a/init.sh
+++ b/init.sh
@@ -19,7 +19,7 @@ wx-init(){
 
     if [[ ! -z ${args['hostname']} && ${#args['hostname']} -gt 5 ]]
     then
-        HOSTNAME="${args['hostname']}.$DEVICE_DOMAIN"
+        HOSTNAME="${args['hostname']}.devices.$DOMAIN"
     elif [[ $(hostname -d) ]]
     then
         HOSTNAME=$(hostname --fqdn)
diff --git a/src/functions/init.sh b/src/functions/init.sh
index c44c667..92cfb21 100644
--- a/src/functions/init.sh
+++ b/src/functions/init.sh
@@ -4,7 +4,7 @@ wx-init(){
 
     if [[ ! -z ${args['hostname']} && ${#args['hostname']} -gt 5 ]]
     then
-        HOSTNAME="${args['hostname']}.$DEVICE_DOMAIN"
+        HOSTNAME="${args['hostname']}.devices.$DOMAIN"
     elif [[ $(hostname -d) ]]
     then
         HOSTNAME=$(hostname --fqdn)