diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000000..23d2c90c9c7
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,5 @@
+*.bat
+Bin
+Build
+.git
+.github
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index c0a721081bc..c71690a8ca0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,6 +21,15 @@ RUN apt-get update && \
 VOLUME /build
 WORKDIR /build
 
+RUN mkdir -p Client Server Shared utils vendor
+
+COPY Client Client
+COPY Server Server
+COPY Shared Shared
+COPY utils utils
+COPY vendor vendor
+COPY ./* .
+
 # Copy entrypoint script
 COPY utils/docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
@@ -29,4 +38,4 @@ RUN chmod +x /docker-entrypoint.sh
 COPY utils/compat /compat
 
 # Set entrypoint
-ENTRYPOINT bash /docker-entrypoint.sh
+ENTRYPOINT bash /docker-entrypoint.sh
\ No newline at end of file
diff --git a/docker-build.bat b/docker-build.bat
new file mode 100644
index 00000000000..3f8222585d6
--- /dev/null
+++ b/docker-build.bat
@@ -0,0 +1,9 @@
+@echo off
+
+set NAME=mtasa
+
+docker build . -t "%NAME%"
+for /f "delims=" %%i in ('docker images -q %NAME%') do set ID=%%i
+
+echo.
+echo ID: %ID%
\ No newline at end of file
diff --git a/docker-build.sh b/docker-build.sh
new file mode 100644
index 00000000000..c0fac954be8
--- /dev/null
+++ b/docker-build.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+NAME="mtasa"
+
+docker build . -t $NAME
+ID = $(docker images -q $NAME)
+
+echo ""
+echo "ID: $ID"
\ No newline at end of file
diff --git a/utils/docker-entrypoint.sh b/utils/docker-entrypoint.sh
index 698bac72fa2..7b22b6e3667 100644
--- a/utils/docker-entrypoint.sh
+++ b/utils/docker-entrypoint.sh
@@ -21,11 +21,6 @@ if [[ $AS_BUILDAGENT = "1" ]]; then
 fi
 
 # Manually invoke build process
-# So, first make a shallow clone of the repository if it not exists
-umask 000
-if [ ! -f ./premake5.lua ]; then
-    git clone --depth=1 https://github.com/multitheftauto/mtasa-blue.git .
-fi
 
 # Start manual building
 export GLIBC_COMPAT=true