diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..080ffc9
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,8 @@
+.dockerignore
+.git
+.gitignore
+customize
+docker-compose.yml
+Dockerfile
+cryptpad/.git
+.gitmodules
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..25a9f2b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "cryptpad"]
+	path = cryptpad
+	url = https://github.com/xwiki-labs/cryptpad.git
diff --git a/Dockerfile b/Dockerfile
index 18cc6c7..0a6b2d9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,17 +5,12 @@ FROM node:12-buster-slim AS build
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq git
 RUN npm install -g bower
 
-# Allow to create docker image from different repository or branch
-ARG REPO=https://github.com/xwiki-labs/cryptpad.git
-ARG BRANCH=master
-
 # Create folder for cryptpad
 RUN mkdir /cryptpad
 WORKDIR /cryptpad
 
-# Get cryptpad from upstream
-RUN git clone --depth 1 --branch ${BRANCH} --single-branch ${REPO} .\
-    && rm -rf .git
+# Get cryptpad from repository submodule
+COPY cryptpad /cryptpad
 
 # Install dependencies
 RUN npm install --production \
diff --git a/cryptpad b/cryptpad
new file mode 160000
index 0000000..e58dfba
--- /dev/null
+++ b/cryptpad
@@ -0,0 +1 @@
+Subproject commit e58dfbabd4f989983078160b7d9ffcbd4b3fa98f
diff --git a/customize/.gitkeep b/customize/.gitkeep
new file mode 100644
index 0000000..e69de29