diff --git a/Freechat/Dockerfile b/Freechat/Dockerfile
index f4cbdc9..df2e0f1 100644
--- a/Freechat/Dockerfile
+++ b/Freechat/Dockerfile
@@ -1,14 +1,30 @@
 FROM debian:sid-slim
-MAINTAINER Alejandro Santillana alejandros714@protonmail.com
 
 # Pre-reqs for sql and building later on
-RUN apt-get update && apt-get install -y curl libmysqlclient-dev build-essential
-RUN apt-get install libssl-dev
+RUN apt-get update && apt-get install \
+	git curl \
+	libmysqlclient-dev build-essential \
+	libssl-dev ca-certificates \
+	-y --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
-# Installing Nightly version of Rust as mysql_async requires it
+
+# Setup node
+RUN apt-get install nodejs npm
+	-y --no-install-recommends && rm -rf /var/lib/apt/lists/*
+
+# Setup Python
+RUN apt-get install python
+	-y --no-install-recommends && rm -rf /var/lib/apt/lists/*
+
+# Setup rust
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \
-	sh -s -- -y --default-toolchain nightly-2020-01-24
+	sh -s -- -y --default-toolchain stable
 
 ENV PATH="/root/.cargo/bin:${PATH}"
 
-RUN cargo install diesel_cli --no-default-features --features mysql
+RUN git clone https://gitlab.com/shockrah/freechat /opt/freechat/
+WORKDIR /opt/freechat/
+RUN bash docker-auto-build.sh --no-cargo-cache
+
+COPY sample.env /opt/freechat/.env
+