diff --git a/quests/Dockerfile b/quests/Dockerfile
index de56f7b..3ca707b 100644
--- a/quests/Dockerfile
+++ b/quests/Dockerfile
@@ -30,6 +30,7 @@ COPY ./ssh_pubkey /home/${USERNAME}/.ssh/authorized_keys
 RUN chmod 600 /home/${USERNAME}/.ssh/authorized_keys \
   && chmod 700 /home/${USERNAME}/.ssh \
   && chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.ssh
+RUN rm -f /etc/motd /etc/issue /etc/issue.net /etc/update-motd.d/*
 
 RUN service ssh start
 
diff --git a/quests/sshd_config b/quests/sshd_config
index b5063ab..66de021 100644
--- a/quests/sshd_config
+++ b/quests/sshd_config
@@ -34,7 +34,7 @@ Include /etc/ssh/sshd_config.d/*.conf
 #MaxAuthTries 6
 #MaxSessions 10
 
-#PubkeyAuthentication yes
+PubkeyAuthentication yes
 
 # Expect .ssh/authorized_keys2 to be disregarded by default in future.
 #AuthorizedKeysFile     .ssh/authorized_keys .ssh/authorized_keys2
@@ -86,11 +86,11 @@ UsePAM yes
 #AllowAgentForwarding yes
 #AllowTcpForwarding yes
 #GatewayPorts no
-X11Forwarding yes
+X11Forwarding no
 #X11DisplayOffset 10
 #X11UseLocalhost yes
 #PermitTTY yes
-PrintMotd no
+#PrintMotd yes
 #PrintLastLog yes
 #TCPKeepAlive yes
 #PermitUserEnvironment no
diff --git a/server/src/config.ts b/server/src/config.ts
index e1b89dc..e5a4721 100644
--- a/server/src/config.ts
+++ b/server/src/config.ts
@@ -61,7 +61,7 @@ function createConfig() {
     bugReportUrl: getUrl('BUG_REPORT_URL'),
 
     docker: {
-      network: get('DOCKER_NETWORK', 'host'),
+      network: get('DOCKER_NETWORK', 'linux-odyssey-players'),
       defaultImage: get('QUEST_IMAGE', 'linuxodyssey/quest-base'),
       imagePrefix: get('DOCKER_PREFIX', 'linuxodyssey/quest-'),
       mountQuest: process.env.MOUNT_QUEST === 'true',
diff --git a/server/src/containers/docker.ts b/server/src/containers/docker.ts
index d5eae85..64bda52 100644
--- a/server/src/containers/docker.ts
+++ b/server/src/containers/docker.ts
@@ -17,7 +17,7 @@ const newContainerOptions = (
   name,
   Image: getQuestImage(imageId),
   HostConfig: {
-    NetworkMode: 'linux-odyssey-players', // config.docker.network,
+    NetworkMode: config.docker.network,
     Binds: options.binds,
     ExtraHosts: ['host.docker.internal:host-gateway'],
   },
@@ -53,7 +53,9 @@ export async function getAndStartContainer(
   if (!(await container.inspect()).State.Running) {
     await container.start()
   }
-  await new Promise((resolve) => setTimeout(resolve, 2000))
+  await new Promise((resolve) => {
+    setTimeout(resolve, 1000)
+  })
   return container
 }
 
@@ -61,12 +63,9 @@ export async function attachContainer(
   container: Docker.Container,
   { token }: { token: string }
 ): Promise<Duplex> {
-  // console.log('attachContainer', await container.inspect())
   const containerIp = (await container.inspect()).NetworkSettings.Networks[
-    'linux-odyssey-players'
+    config.docker.network
   ].IPAddress
-  console.log('containerIp', containerIp)
-  console.log('token', token)
   const conn = new Client()
 
   return new Promise((resolve, reject) => {
@@ -86,9 +85,6 @@ export async function attachContainer(
             if (err) {
               reject(err)
             }
-            stream.on('error', (err) => {
-              reject(err)
-            })
             stream.on('close', () => {
               console.log('Stream :: close')
               conn.end()
@@ -108,13 +104,6 @@ export async function attachContainer(
         debug: console.log,
       })
   })
-  // const exec = await container.exec({
-  //   Env: [
-  //     `TOKEN=${token}`,
-  //     `API_ENDPOINT=${config.backendUrl}`,
-  //     'ZDOTDIR=/etc/zsh',
-  //   ],
-  // })
 }
 
 export async function deleteContainer(id: string) {