diff --git a/docker/Dockerfile b/docker/Dockerfile
index 339e46d..e73ea27 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -38,7 +38,7 @@ RUN locale-gen $LANG && \
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && \
   echo $TZ > /etc/timezone
 
-# Install cloud computer utilities
+# Install desktop environment utilities
 RUN apt-get update -qq && \
   DEBIAN_FRONTEND=noninteractive apt-get install -qq --fix-missing \
   alsa-utils \
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index 4b8c137..be6b6b9 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -13,6 +13,6 @@ docker build \
   --build-arg DOTFILES_CACHEBUST=$(cat $REPO_ROOT/.dotfiles-cachebust 2>/dev/null) \
   --file $REPO_ROOT/docker/Dockerfile \
   --network host \
-  --tag $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_NAME:$DESKTOP_ENVIRONMENT_CONTAINER_TAG \
-  --tag $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_NAME:latest \
+  --tag $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE:$DESKTOP_ENVIRONMENT_CONTAINER_TAG \
+  --tag $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE:latest \
   $REPO_ROOT/docker
diff --git a/docker/scripts/environment.sh b/docker/scripts/environment.sh
index 6e9546c..7020a8a 100755
--- a/docker/scripts/environment.sh
+++ b/docker/scripts/environment.sh
@@ -1,11 +1,13 @@
 REPO_ROOT=$(dirname $(readlink -f $0))/../..
 
 DESKTOP_ENVIRONMENT_USER=$USER
-DESKTOP_ENVIRONMENT_CONTAINER_NAME=desktop-environment
+DESKTOP_ENVIRONMENT_CONTAINER_IMAGE=desktop-environment
+DESKTOP_ENVIRONMENT_CONTAINER_NAME=${DESKTOP_ENVIRONMENT_CONTAINER_NAME-$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE}
 DESKTOP_ENVIRONMENT_REGISTRY=${DESKTOP_ENVIRONMENT_REGISTRY-$DESKTOP_ENVIRONMENT_USER}
 
 # Desktop environment repository information
-echo export DESKTOP_ENVIRONMENT_CONTAINER_NAME=$DESKTOP_ENVIRONMENT_CONTAINER_NAME
+echo export DESKTOP_ENVIRONMENT_CONTAINER_IMAGE=$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE
+echo export DESKTOP_ENVIRONMENT_CONTAINER_NAME=$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE
 echo export DESKTOP_ENVIRONMENT_CONTAINER_TAG=${DESKTOP_ENVIRONMENT_CONTAINER_TAG-$(git --git-dir $REPO_ROOT/.git rev-parse --abbrev-ref HEAD)}
 echo export DESKTOP_ENVIRONMENT_REGISTRY=$DESKTOP_ENVIRONMENT_REGISTRY
 
@@ -16,7 +18,7 @@ echo export DESKTOP_ENVIRONMENT_USER_HOME=$DESKTOP_ENVIRONMENT_USER_HOME
 echo export DESKTOP_ENVIRONMENT_USER_ID=1000
 
 # Desktop environment docker configuration
-echo export DESKTOP_ENVIRONMENT_DOCKER_NETWORK=$DESKTOP_ENVIRONMENT_REGISTRY-$DESKTOP_ENVIRONMENT_CONTAINER_NAME
+echo export DESKTOP_ENVIRONMENT_DOCKER_NETWORK=$DESKTOP_ENVIRONMENT_REGISTRY-$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE
 
 # Desktop environment application cache volumes
 echo export DESKTOP_ENVIRONMENT_CACHE_CHROME=$DESKTOP_ENVIRONMENT_USER_HOME/.cache/google-chrome
diff --git a/docker/scripts/exec-root.sh b/docker/scripts/exec-root.sh
index 47bd439..0cc44e7 100755
--- a/docker/scripts/exec-root.sh
+++ b/docker/scripts/exec-root.sh
@@ -5,4 +5,4 @@ eval "$($REPO_ROOT/docker/scripts/environment.sh)"
 
 docker exec \
   --interactive \
-  $DESKTOP_ENVIRONMENT_CONTAINER_NAME zsh -c "$*"
+  $DESKTOP_ENVIRONMENT_CONTAINER_IMAGE zsh -c "$*"
diff --git a/docker/scripts/exec.sh b/docker/scripts/exec.sh
index 14df7f3..d5d7776 100755
--- a/docker/scripts/exec.sh
+++ b/docker/scripts/exec.sh
@@ -7,4 +7,4 @@ docker exec \
   --interactive \
   --tty \
   --user $DESKTOP_ENVIRONMENT_USER \
-  $DESKTOP_ENVIRONMENT_CONTAINER_NAME zsh -c "$*"
+  $DESKTOP_ENVIRONMENT_CONTAINER_IMAGE zsh -c "$*"
diff --git a/docker/scripts/kill-all.sh b/docker/scripts/kill-all.sh
index 3ad8bda..5f82121 100755
--- a/docker/scripts/kill-all.sh
+++ b/docker/scripts/kill-all.sh
@@ -5,7 +5,7 @@ eval "$($REPO_ROOT/docker/scripts/environment.sh)"
 
 # Remove all non desktop environment containers
 docker ps -a | \
-  grep -v " $DESKTOP_ENVIRONMENT_CONTAINER_NAME" | \
+  grep -v " $DESKTOP_ENVIRONMENT_CONTAINER_IMAGE" | \
   grep -v "CONTAINER " | \
   cut -b 1-20 | \
   xargs docker rm -f
diff --git a/docker/scripts/push.sh b/docker/scripts/push.sh
index b3cf3f5..1e6053e 100755
--- a/docker/scripts/push.sh
+++ b/docker/scripts/push.sh
@@ -3,4 +3,4 @@ REPO_ROOT=$(dirname $(readlink -f $0))/../..
 # Export desktop environment shell configuration
 eval "$($REPO_ROOT/docker/scripts/environment.sh)"
 
-docker push $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_NAME:$DESKTOP_ENVIRONMENT_CONTAINER_TAG
+docker push $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE:$DESKTOP_ENVIRONMENT_CONTAINER_TAG
diff --git a/docker/scripts/start.sh b/docker/scripts/start.sh
index f9ade25..6af7538 100755
--- a/docker/scripts/start.sh
+++ b/docker/scripts/start.sh
@@ -67,7 +67,7 @@ docker run \
   --volume DESKTOP_ENVIRONMENT_USER_TORRENTS:$DESKTOP_ENVIRONMENT_USER_TORRENTS \
   --volume DESKTOP_ENVIRONMENT_USER_VIDEOS:$DESKTOP_ENVIRONMENT_USER_VIDEOS \
   --workdir $DESKTOP_ENVIRONMENT_USER_HOME \
-  $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_NAME:$DESKTOP_ENVIRONMENT_CONTAINER_TAG \
+  $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE:$DESKTOP_ENVIRONMENT_CONTAINER_TAG \
   sleep infinity
 
 # Wait until the desktop environment container is running before proceeding
diff --git a/docker/scripts/stop.sh b/docker/scripts/stop.sh
index 5fdab61..7f8b817 100755
--- a/docker/scripts/stop.sh
+++ b/docker/scripts/stop.sh
@@ -3,4 +3,4 @@ REPO_ROOT=$(dirname $(readlink -f $0))/../..
 # Export desktop environment shell configuration
 eval "$($REPO_ROOT/docker/scripts/environment.sh)"
 
-docker rm -f $DESKTOP_ENVIRONMENT_CONTAINER_NAME
+docker rm -f $DESKTOP_ENVIRONMENT_CONTAINER_IMAGE
diff --git a/docker/scripts/test.sh b/docker/scripts/test.sh
index da6eedf..8a5f084 100755
--- a/docker/scripts/test.sh
+++ b/docker/scripts/test.sh
@@ -14,7 +14,7 @@ docker run \
   --rm \
   --user $DESKTOP_ENVIRONMENT_USER \
   --workdir $DESKTOP_ENVIRONMENT_USER_HOME \
-  $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_NAME:$DESKTOP_ENVIRONMENT_CONTAINER_TAG \
+  $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE:$DESKTOP_ENVIRONMENT_CONTAINER_TAG \
   sleep infinity
 
 # Wait until the desktop environment container is running before proceeding
diff --git a/docker/scripts/tmux.sh b/docker/scripts/tmux.sh
index 1d657ed..9a91878 100755
--- a/docker/scripts/tmux.sh
+++ b/docker/scripts/tmux.sh
@@ -7,7 +7,7 @@ eval "$($REPO_ROOT/docker/scripts/environment.sh)"
 docker exec \
   --interactive \
   --tty \
-  $DESKTOP_ENVIRONMENT_CONTAINER_NAME \
+  $DESKTOP_ENVIRONMENT_CONTAINER_IMAGE \
   tmux new-session \
   -s desktop-environment-shell-$(date +%s) \
   -t desktop-environment-shell