diff --git a/Dockerfile b/Dockerfile
index 9fe94425b..8aff60a97 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,15 @@
 FROM ubuntu:latest
 
-RUN apt update 
-RUN apt upgrade -y
-RUN apt install -y wget tar gzip unzip file
-RUN wget https://releases.mattermost.com/focalboard/0.5.0/focalboard-server-linux-amd64.tar.gz
-RUn unzip -o focalboard-server-linux-amd64.tar.gz
-RUN tar -xvzf focalboard-server-linux-amd64.tar.gz
-RUN mv focalboard /opt
+# Make sure that the underlying container is patched to the latest versions
+RUN apt update && \
+    apt upgrade -y && \
+    apt install -y wget tar gzip unzip file
+
+# Now install Focalboard as a seperate layer
+RUN wget https://releases.mattermost.com/focalboard/0.5.0/focalboard-server-linux-amd64.tar.gz && \
+    unzip -o focalboard-server-linux-amd64.tar.gz && \
+    tar -xvzf focalboard-server-linux-amd64.tar.gz && \
+    mv focalboard /opt
 
 EXPOSE 8000