diff --git a/rel/server/env.bat.eex b/rel/server/env.bat.eex
index db3388808..5ba0507c6 100644
--- a/rel/server/env.bat.eex
+++ b/rel/server/env.bat.eex
@@ -3,7 +3,14 @@ if exist "!RELEASE_ROOT!\user\env.bat" (
 )
 
 set RELEASE_MODE=interactive
-if not defined RELEASE_DISTRIBUTION set RELEASE_DISTRIBUTION=none
+
+if "%RELEASE_COMMAND%"=="rpc" (
+    set RELEASE_DISTRIBUTION=name
+) else if "%RELEASE_COMMAND%"=="remote" (
+    set RELEASE_DISTRIBUTION=name
+) else (
+    set RELEASE_DISTRIBUTION=none
+)
 
 if defined LIVEBOOK_NODE set RELEASE_NODE=!LIVEBOOK_NODE!
 if defined LIVEBOOK_COOKIE set RELEASE_COOKIE=!LIVEBOOK_COOKIE!
diff --git a/rel/server/env.sh.eex b/rel/server/env.sh.eex
index 4f87cb4aa..214abdd06 100644
--- a/rel/server/env.sh.eex
+++ b/rel/server/env.sh.eex
@@ -25,8 +25,6 @@ else
     if [ -z "${LIVEBOOK_NODE}" ]; then
       deployment="$(echo $image_id | shasum | cut -c 1-10)"
       export LIVEBOOK_NODE="livebook-${deployment}@${machine_ip}"
-    else
-      export LIVEBOOK_NODE="${LIVEBOOK_NODE}@${machine_ip}"
     fi
   fi
 
@@ -35,7 +33,7 @@ else
   fi
 
   export RELEASE_MODE="interactive"
-  if [ -z "${RELEASE_DISTRIBUTION}" ]; then export RELEASE_DISTRIBUTION="none"; fi
+  export RELEASE_DISTRIBUTION="none"
 
   # We remove the COOKIE file when assembling the release, because we
   # don't want to share the same cookie across users. The Elixir release