diff --git a/Dockerfile_Dojo_Database b/Dockerfile_Dojo_Database
new file mode 100644
index 0000000000000000000000000000000000000000..9e9c6061f6692e96e7168faf2a462d71cf0c3df4
--- /dev/null
+++ b/Dockerfile_Dojo_Database
@@ -0,0 +1,4 @@
+FROM mariadb:10.11
+LABEL maintainer="Michaël Minelli <michael-jean.minelli@hesge.ch>"
+
+ADD Database/docker-entrypoint-initdb.d/ /docker-entrypoint-initdb.d/
\ No newline at end of file
diff --git a/Dockerfile_Dojo_Proxy b/Dockerfile_Dojo_Proxy
new file mode 100644
index 0000000000000000000000000000000000000000..990dbeb2885eeedc38023b359ef2e6153d6c078b
--- /dev/null
+++ b/Dockerfile_Dojo_Proxy
@@ -0,0 +1,9 @@
+FROM nginx:alpine
+LABEL maintainer="Michaël Minelli <michael-jean.minelli@hesge.ch>"
+
+## Copy our default nginx config
+ADD Proxy/certs/ /dojo/certs/
+ADD Proxy/default.conf /etc/nginx/conf.d/
+
+EXPOSE 80
+EXPOSE 443
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index a43bc51a888987fa0c2ae49121f5e328cb5e28c6..284287ee2eac393f27a06c053963a1d2b50bfff8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,9 @@ version: '3.8'
 services:
     dojo-database:
         container_name: dojo-database
-        image: mariadb:10.11
+        build:
+            context: ./
+            dockerfile: Dockerfile_Dojo_Database
         environment:
             MARIADB_DATABASE: '${DATABASE_NAME}'
             MARIADB_ROOT_PASSWORD: '${DATABASE_ROOT_PASSWORD}'
@@ -14,7 +16,6 @@ services:
                     - dojo-database
         volumes:
             - dojo-database:/var/lib/mysql
-            - ./Database/docker-entrypoint-initdb.d/:/docker-entrypoint-initdb.d/
         restart: always
 
     adminer:
@@ -62,11 +63,10 @@ services:
 
     dojo-proxy:
         container_name: dojo-proxy
-        image: nginx:alpine
+        build:
+            context: ./
+            dockerfile: Dockerfile_Dojo_Proxy
         restart: 'always'
-        volumes:
-            - ./Proxy/certs/:/dojo/certs/
-            - ./Proxy/default.conf:/etc/nginx/conf.d/default.conf
         networks:
             dojo-network:
                 aliases: