diff --git a/.dockerignore b/.dockerignore
index 7d259f4a06..0a64dffc37 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,15 +1,20 @@
 # tests are not run in the docker container.
 __tests__
+**/__tests__
+**/coverage
 coverage
 
 # we won't use the .git folder in production.
 .git
+.github
 
 # don't include the dependancies
 node_modules
+**/node_modules
 
 # don't include any logs
 npm-debug.log*
+**/npm-debug.log*
 
 # don't include any yarn files
 yarn-error.log
@@ -17,14 +22,30 @@ yarn.lock
 
 # don't include any OS/editor files
 .env
+**/.env
 .idea/
 .vs
+.vscode
+
 .docz
+**/.docz
+
 *.swp
+**/*.swp
+
 *.DS_STORE
+*.DS_Store
+**/*.DS_STORE
+**/*.DS_Store
 
 # don't include any generated files
 dist
+**/dist
+
 *.css.d.ts
+**/*.css.d.ts
+
 __generated__
-docs/.next
\ No newline at end of file
+**/__generated__
+
+**/.next
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index d91c921d1f..daf467dbcb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,6 +63,9 @@ RUN cd server && \
   npm prune --production && \
   cd ..
 
+# Set working directory within server folder
+WORKDIR /usr/src/app/server
+
 # Setup the environment
 ENV NODE_ENV production
 ENV PORT 5000
@@ -70,4 +73,4 @@ EXPOSE 5000
 
 # Run the node process directly instead of using `npm run start`:
 # SEE: https://github.com/nodejs/docker-node/blob/a2eb9f80b0fd224503ee2678867096c9e19a51c2/docs/BestPractices.md#cmd
-CMD ["node", "server/dist/index.js"]
+CMD ["node", "dist/index.js"]
diff --git a/client/package-lock.json b/client/package-lock.json
index 209f7b8e52..ce61b014fa 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@coralproject/talk",
-  "version": "8.5.0",
+  "version": "8.5.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@coralproject/talk",
-      "version": "8.5.0",
+      "version": "8.5.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@ampproject/toolbox-cache-url": "^2.9.0",
diff --git a/client/package.json b/client/package.json
index b5e544b393..e1714d5977 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "8.5.0",
+  "version": "8.5.1",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [
diff --git a/common/package-lock.json b/common/package-lock.json
index d3ba1c5703..0e94ee3ed7 100644
--- a/common/package-lock.json
+++ b/common/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "common",
-  "version": "8.5.0",
+  "version": "8.5.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "common",
-      "version": "8.5.0",
+      "version": "8.5.1",
       "license": "ISC",
       "dependencies": {
         "coral-config": "../config/dist",
diff --git a/common/package.json b/common/package.json
index 93d7dabfdd..67709e9a0a 100644
--- a/common/package.json
+++ b/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "8.5.0",
+  "version": "8.5.1",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -44,4 +44,4 @@
     "typescript": "^3.9.5",
     "url-regex-safe": "^2.0.2"
   }
-}
\ No newline at end of file
+}
diff --git a/config/package-lock.json b/config/package-lock.json
index decc9435d5..f5c43b71aa 100644
--- a/config/package-lock.json
+++ b/config/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "common",
-  "version": "8.5.0",
+  "version": "8.5.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "common",
-      "version": "8.5.0",
+      "version": "8.5.1",
       "license": "ISC",
       "dependencies": {
         "typescript": "^3.9.5"
diff --git a/config/package.json b/config/package.json
index e706264524..bda0dd5a2f 100644
--- a/config/package.json
+++ b/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "8.5.0",
+  "version": "8.5.1",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,4 +14,4 @@
   "dependencies": {
     "typescript": "^3.9.5"
   }
-}
\ No newline at end of file
+}
diff --git a/server/package-lock.json b/server/package-lock.json
index fb1e91ec77..7b928f52da 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@coralproject/talk",
-  "version": "8.5.0",
+  "version": "8.5.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@coralproject/talk",
-      "version": "8.5.0",
+      "version": "8.5.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@ampproject/toolbox-cache-url": "^2.9.0",
diff --git a/server/package.json b/server/package.json
index 7e10926209..3e6acac8ea 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "8.5.0",
+  "version": "8.5.1",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [
@@ -431,4 +431,4 @@
     "not OperaMini all",
     "not dead"
   ]
-}
\ No newline at end of file
+}