diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..a089e295
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+**/.git
\ No newline at end of file
diff --git a/dockercontainer/DockerFile-mangosd b/dockercontainer/DockerFile-mangosd
index 846dd5d3..e516c983 100644
--- a/dockercontainer/DockerFile-mangosd
+++ b/dockercontainer/DockerFile-mangosd
@@ -2,7 +2,12 @@
 FROM ubuntu:18.04 as build-step
 
 RUN apt-get -y update
-RUN apt-get -y install curl autoconf automake cmake libbz2-dev libace-dev libssl-dev libmysqlclient-dev libtool build-essential
+RUN apt-get -y install curl autoconf automake libbz2-dev libace-dev libssl-dev libmysqlclient-dev libtool build-essential gpg wget
+
+RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null && \
+    echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ bionic main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null && \
+    apt-get update
+RUN apt-get -y install cmake
 
 COPY . /mangoserver
 RUN mkdir /mangoserver/build
diff --git a/dockercontainer/DockerFile-realmd b/dockercontainer/DockerFile-realmd
index 7bfbad12..b7074116 100644
--- a/dockercontainer/DockerFile-realmd
+++ b/dockercontainer/DockerFile-realmd
@@ -2,8 +2,13 @@
 FROM ubuntu:18.04 as build-step
 
 RUN apt-get -y update
-RUN apt-get -y install curl autoconf automake cmake libbz2-dev libace-dev libssl-dev libmysqlclient-dev libtool build-essential
+RUN apt-get -y install curl autoconf automake libbz2-dev libace-dev libssl-dev libmysqlclient-dev libtool build-essential gpg wget
 
+RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null && \
+    echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ bionic main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null && \
+    apt-get update
+RUN apt-get -y install cmake
+    
 COPY . /mangoserver
 RUN mkdir /mangoserver/build
 WORKDIR /mangoserver/build
@@ -20,8 +25,8 @@ RUN apt-get -y update && apt-get -y upgrade
 RUN apt-get -y install libmysqlclient20 openssl
 
 COPY --from=build-step /mangos /mangos
+COPY --from=build-step /etc/realmd.conf.dist ../etc/realmd.conf.dist
 WORKDIR /mangos/bin
-RUN cp ../etc/realmd.conf.dist ../etc/realmd.conf
 RUN chmod +x realmd
 
 EXPOSE 3724