diff --git a/dokku b/dokku
index 39d6d9781..c48397b98 100755
--- a/dokku
+++ b/dokku
@@ -77,7 +77,7 @@ case "$1" in
 
     is_image_buildstep_based "$IMAGE" && DOKKU_BUILDSTEP=true
     [[ -n "$DOKKU_BUILDSTEP" ]] && START_CMD="/start web"
-    [[ -z "$DOKKU_BUILDSTEP" ]] && eval "$(grep DOKKU_DOCKERFILE_PORT $DOKKU_ROOT/$APP/ENV)"
+    [[ -z "$DOKKU_BUILDSTEP" ]] && DOKKU_DOCKERFILE_PORT=$(dokku config:get $APP DOKKU_DOCKERFILE_PORT || true)
 
     if [[ "$BIND_EXTERNAL" = "false" ]];then
       port=${DOKKU_DOCKERFILE_PORT:=5000}
diff --git a/plugins/domains/commands b/plugins/domains/commands
index c479a63f3..950ee2415 100755
--- a/plugins/domains/commands
+++ b/plugins/domains/commands
@@ -46,7 +46,7 @@ case "$1" in
       fi
       if [[ "$VHOST" =~ $RE_IPV4 ]] || [[ "$VHOST" =~ $RE_IPV6 ]];then
         echo "unsupported vhost config found. disabling vhost support"
-        [[ ! $(grep -q NO_VHOST "$DOKKU_ROOT/$APP/ENV") ]] && echo "export NO_VHOST='1'" >> "$DOKKU_ROOT/$APP/ENV"
+        dokku config:set-norestart $APP NO_VHOST=1
       else
         if [[ -f "$DOKKU_ROOT/VHOST" ]]; then
           dokku_log_info1 "Creating new $VHOST_PATH..."