diff --git a/setup/start.sh b/setup/start.sh
index f875d1af..bfd69eed 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -91,6 +91,7 @@ STORAGE_USER=$STORAGE_USER
 STORAGE_ROOT=$STORAGE_ROOT
 PRIMARY_HOSTNAME=$PRIMARY_HOSTNAME
 DAV_HOSTNAME=$DAV_HOSTNAME
+INSTALL=$INSTALL
 PUBLIC_IP=$PUBLIC_IP
 PUBLIC_IPV6=$PUBLIC_IPV6
 PRIVATE_IP=$PRIVATE_IP
diff --git a/setup/system.sh b/setup/system.sh
index 76e12316..3b1a4214 100755
--- a/setup/system.sh
+++ b/setup/system.sh
@@ -14,8 +14,9 @@ source setup/functions.sh # load our functions
 # First set the hostname in the configuration file, then activate the setting
 
 echo $PRIMARY_HOSTNAME > /etc/hostname
-# Remarking this in this fork to workaround a docker setup issue where this will fail
-#hostname $PRIMARY_HOSTNAME
+if [ "$INSTALL" == "m"]; then
+    hostname $PRIMARY_HOSTNAME
+fi
 
 # ### Fix permissions
 
diff --git a/tools/docker.sh b/tools/docker.sh
index e102416b..496251b0 100644
--- a/tools/docker.sh
+++ b/tools/docker.sh
@@ -1,8 +1,13 @@
 #!/bin/bash
 
-# Fixup some dependencies missing from the ubuntu:bionic image
-apt install locales curl lsb-release net-tools git grep -y
+# In order to install Mail-in-a-Box on an ubuntu:bionic docker container, this
+# script will help fix up the base ubuntu image to allow for installation
 
+# Fixup some dependencies missing from the ubuntu:bionic image
+apt update
+apt install locales curl lsb-release net-tools git grep systemd -y
+
+# Clone the Mail-in-a-Box repository to your home directory
 cd ~
 git clone https://github.com/kaibae19/mailinabox