diff --git a/Dockerfile b/Dockerfile
index a5709e2..010a8c6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,37 @@
-FROM archlinux/base:latest
+FROM manjarolinux/base:latest
 
+LABEL maintainer="Kishan Takoordyal <kishan@kinesis.games>"
+
+# Update package repositories
 RUN pacman -Syy --noconfirm
 
+# Install some dependencies
 RUN pacman -S iputils nano gcc glibc nodejs npm unzip --noconfirm
 
+# Install NodeJS & npm
 RUN node -v && \
     npm i npm@latest -g && \
     npm -v
 
+# Install Rust compilers + cargo
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh && \
-    rustc --version
+    rustc --version && \
+    cargo version
 
+# Test if Cargo works properly by running a hello world program
 RUN cargo new hello_world && \
     cd hello_world/ && \
     cargo run
 
+# Install latest version of Deno
 RUN curl -fsSL https://deno.land/x/install/install.sh | sh && \
     deno upgrade && \
     deno --version
+
+EXPOSE 80/tcp
+EXPOSE 443/tcp
+EXPOSE 8080/tcp
+EXPOSE 3000/tcp
+EXPOSE 20000/tcp
+EXPOSE 21000/tcp
+EXPOSE 3306/tcp