diff --git a/deployment.sh b/deployment.sh
index 3d36a6e..c7ee64c 100755
--- a/deployment.sh
+++ b/deployment.sh
@@ -1211,11 +1211,11 @@ EOF
 # needed for carrier
 if "$RETRIEVE_MGMT_CONFIG" ; then
   echo "Retrieving /etc/hosts configuration from management server"
-  wget --timeout=30 -O "$TARGET/etc/hosts" "${MANAGEMENT_IP}:3000/hostconfig/$(cat ${TARGET}/etc/hostname)"
+  wget --timeout=30 -O "${TARGET}/etc/hosts" "${MANAGEMENT_IP}:3000/hostconfig/$(cat ${TARGET}/etc/hostname)"
   # required for bootstrapping remote origin in ngcpcfg carrier setup
-  MGMT_NAME=$(awk "/^$MANAGEMENT_IP/ {print \$2}" ${TARGET}/etc/hosts)
-  echo "Generating /etc/ngcp_mgmt_node file [${MGMT_NAME}]"
-  echo "${MGMT_NAME}" | sed 's/a$// ; s/b$//' > "${TARGET}/etc/ngcp_mgmt_node"
+  echo "Retrieving /etc/ngcp_mgmt_node file from management server"
+  wget --timeout=30 -O "${TARGET}/etc/ngcp_mgmt_node" "${MANAGEMENT_IP}:3000/mgmt"
+  echo "mgmt_node=$(cat ${TARGET}/etc/ngcp_mgmt_node)"
 fi
 
 if "$PRO_EDITION" ; then