diff --git a/rel/app/env.bat.eex b/rel/app/env.bat.eex
index b471d30b8..f0fd39384 100644
--- a/rel/app/env.bat.eex
+++ b/rel/app/env.bat.eex
@@ -2,8 +2,10 @@ if exist "!USERPROFILE!\.livebookdesktop.bat" (
   call "!USERPROFILE!\.livebookdesktop.bat"
 )
 
+for /f "skip=1" %%X in ('wmic os get localdatetime') do if not defined TIMESTAMP set TIMESTAMP=%%X
+
 if defined LIVEBOOK_NODE set RELEASE_NODE="!LIVEBOOK_NODE!"
-if not defined RELEASE_NODE set RELEASE_NODE=livebook_server
+if not defined RELEASE_NODE set RELEASE_NODE="livebook-app-!TIMESTAMP:~8,6!-!RANDOM!"
 set RELEASE_MODE=interactive
 set MIX_ARCHIVES=!RELEASE_ROOT!\vendor\archives
 set MIX_REBAR3=!RELEASE_ROOT!\vendor\rebar3
@@ -14,7 +16,6 @@ set PATH=!RELEASE_ROOT!\vendor\otp\erts-<%= @release.erts_version%>\bin;!RELEASE
 
 set cookie_path=!RELEASE_ROOT!\releases\COOKIE
 if not exist %cookie_path% (
-  for /f "skip=1" %%X in ('wmic os get localdatetime') do if not defined TIMESTAMP set TIMESTAMP=%%X
   :: '| set /p=""' is so that we don't add ' \r\n' to the cookie
   echo | set /p="cookie-!TIMESTAMP:~0,11!-!RANDOM!" > %cookie_path%
 )
diff --git a/rel/app/env.sh.eex b/rel/app/env.sh.eex
index 74ada85c3..e2eb20be7 100644
--- a/rel/app/env.sh.eex
+++ b/rel/app/env.sh.eex
@@ -8,7 +8,7 @@ if [[ "$hostname" =~ " " ]]; then
   exit 1
 fi
 
-export RELEASE_NODE=${LIVEBOOK_NODE:-${RELEASE_NODE:-livebook_app}}
+export RELEASE_NODE=${LIVEBOOK_NODE:-${RELEASE_NODE:-"livebook-app-$(cat /dev/urandom | env LC_ALL=C tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1)"}}
 export RELEASE_MODE=interactive
 export MIX_ARCHIVES="${RELEASE_ROOT}/vendor/archives"
 export MIX_REBAR3="${RELEASE_ROOT}/vendor/rebar3"