diff --git a/cloud-scripts/create-osm-vm.sh b/cloud-scripts/create-osm-vm.sh
index 454cb061b4b6fd8635e2dab1c458ed9c634c13bf..c7fc080d09472fcaa2e627e48c84f24c1a71e9ff 100755
--- a/cloud-scripts/create-osm-vm.sh
+++ b/cloud-scripts/create-osm-vm.sh
@@ -65,7 +65,8 @@ fi
 mkdir -p ${ROBOT_REPORT_FOLDER}
 cat <<EOF > ${ROBOT_REPORT_FOLDER}/osm_environment.rc
 export CLOUD_TYPE="${CLOUD_TYPE}"
-export OSM_HOSTNAME="${NEW_OSM_IP}"
+export OSM_IP_ADDRESS="${NEW_OSM_IP}"
+export OSM_HOSTNAME="nbi.${NEW_OSM_IP}.nip.io"
 export OSM_IMAGE_NAME="${OSM_IMAGE_NAME}"
 EOF
 echo File with new environment was created at ${ROBOT_REPORT_FOLDER}/osm_environment.rc
diff --git a/cloud-scripts/remote-extract-logs.sh b/cloud-scripts/remote-extract-logs.sh
index b3048263b85bf40a4bc8f96f0efb728c218a1d9a..7973f32c611c364f676aa36f3df4dbb72259c97c 100755
--- a/cloud-scripts/remote-extract-logs.sh
+++ b/cloud-scripts/remote-extract-logs.sh
@@ -22,7 +22,7 @@ set -e
 for MODULE in 'grafana' 'keystone' 'lcm' 'mon' 'nbi' 'pol' 'ro' 'ngui' 'airflow-scheduler' 'pushgateway-prometheus-pushgateway' 'webhook-translator'
 do
     echo Saving ${MODULE} logs...
-    ssh -T -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ubuntu@${OSM_HOSTNAME} \
+    ssh -T -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ubuntu@${OSM_IP_ADDRESS} \
     'kubectl -n osm logs deployment/"'${MODULE}'" --all-containers=true 2>&1 | cat' > "${ROBOT_REPORT_FOLDER}"/"osm-deploy-${MODULE}".log
 done
 
@@ -30,7 +30,7 @@ done
 for MODULE in 'kafka' 'mongo' 'mysql' 'prometheus' 'zookeeper' 'alertmanager'
 do
     echo Saving ${MODULE} logs...
-    ssh -T -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ubuntu@${OSM_HOSTNAME} \
+    ssh -T -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ubuntu@${OSM_IP_ADDRESS} \
     'kubectl -n osm logs statefulset/"'${MODULE}'" --all-containers=true 2>&1 | cat' > "${ROBOT_REPORT_FOLDER}"/"osm-sts-${MODULE}".log
 done
 
diff --git a/cloud-scripts/remote-install-osm.sh b/cloud-scripts/remote-install-osm.sh
index 1b910206663d914c3611cde7f8641446312fe508..f3ed497232d40ac7d68da4de99b94153d81eb90b 100755
--- a/cloud-scripts/remote-install-osm.sh
+++ b/cloud-scripts/remote-install-osm.sh
@@ -16,7 +16,7 @@
 # limitations under the License.
 #######################################################################################
 
-ssh -T -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ubuntu@"${OSM_HOSTNAME}" \
+ssh -T -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ubuntu@"${OSM_IP_ADDRESS}" \
 'sudo apt-get update -y && sudo apt-get upgrade -y && sudo reboot'
 
 sleep 90
@@ -25,7 +25,7 @@ sleep 90
 INSTALLER_PARAMETERS="-R ${REPO_BASE} -t ${DOCKER_TAG} -r ${REPO_NAME} -y"
 echo "INSTALLER_URL: $INSTALLER_URL"
 echo "INSTALLER_PARAMETERS: $INSTALLER_PARAMETERS"
-ssh -T -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ubuntu@${OSM_HOSTNAME} << EOF 2>&1
+ssh -T -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ubuntu@${OSM_IP_ADDRESS} << EOF 2>&1
 set -eux
 wget "${INSTALLER_URL}"
 chmod +x install_osm.sh
@@ -35,12 +35,12 @@ EOF
 
 # # Installs additional tools for telemetry
 # set +eux
-# ssh -T -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ubuntu@${OSM_HOSTNAME} 'sudo apt-get install -y sysstat'
+# ssh -T -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ubuntu@${OSM_IP_ADDRESS} 'sudo apt-get install -y sysstat'
 # set -eux
 
 # Gets Juju password from LCM env file
 set +eux
-JUJU_PWD=$(ssh -T -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ubuntu@${OSM_HOSTNAME} 'kubectl -n osm exec -ti deploy/lcm -- env | grep OSMLCM_VCA_SECRET | cut -d = -f 2')
+JUJU_PWD=$(ssh -T -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ubuntu@${OSM_IP_ADDRESS} 'kubectl -n osm exec -ti deploy/lcm -- env | grep OSMLCM_VCA_SECRET | cut -d = -f 2')
 set -eux
 
 # Updates environment variables and logs them