diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 1f2b4a0..59ba858 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-files = VERSION .bumpversion.cfg README.rst docs/conf.py
+files = VERSION .bumpversion.cfg README.rst docs/conf.py Dockerfile
 commit = True
 tag = False
 current_version = 0.1.0
diff --git a/Dockerfile b/Dockerfile
index 5b8fed9..a7d8128 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -56,11 +56,11 @@ RUN apk add --update --no-cache --virtual .build-deps \
     && rm -rf /etc/nginx/conf.d/default.conf
 
 # Copy the modified Nginx conf
-COPY docker/templates/etc/nginx/nginx.conf /etc/nginx/nginx.conf
-COPY docker/templates/etc/nginx/conf.d/nginx.conf /etc/nginx/conf.d/
+COPY provision/docker/templates/etc/nginx/nginx.conf /etc/nginx/nginx.conf
+COPY provision/docker/templates/etc/nginx/conf.d/nginx.conf /etc/nginx/conf.d/
 # Custom Supervisord config
-COPY docker/templates/etc/supervisord.conf /etc/
-COPY docker/templates/etc/supervisor/conf.d/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY provision/docker/templates/etc/supervisord.conf /etc/
+COPY provision/docker/templates/etc/supervisor/conf.d/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
 EXPOSE 80
 
diff --git a/Makefile b/Makefile
index 3f40acb..26eb985 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,8 @@ EXTRAS_DIR:= $(ROOT_DIR)/extras
 SCRIPT_DIR=$(EXTRAS_DIR)/scripts
 SOURCE_DIR=$(ROOT_DIR)/
 REQUIREMENTS_DIR=$(ROOT_DIR)/requirements/
+PROVISION_DIR=$(ROOT_DIR)/provision/
+DOCKER_COMPOSE_DIR=$(PROVISION_DIR)/docker-compose/
 FILE_README=$(ROOT_DIR)/README.rst
 
 include *.mk
diff --git a/docker-compose.yml b/docker-compose.yml
index 2352c33..a037212 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,7 @@ services:
       - APP_NAME=python-facebook-chatbot
     build:
       context: .
-      dockerfile: docker/app/Dockerfile
+      dockerfile: provision/docker/app/Dockerfile
     volumes:
       - .:/usr/src
     env_file:
@@ -26,7 +26,7 @@ services:
     image: labpositiva/latex:3.6.1
     build:
       context: .
-      dockerfile: docker/docs/Dockerfile
+      dockerfile: provision/docker/docs/Dockerfile
     volumes:
       - .:/usr/src
     env_file:
diff --git a/docker.mk b/docker.mk
index a719511..e9b45d3 100644
--- a/docker.mk
+++ b/docker.mk
@@ -7,7 +7,7 @@ docker.run: clean
 	@if [ "${env}" == "" ]; then \
 		docker-compose run --rm --service-ports "${service}" bash; \
 	else \
-		docker-compose -f docker-compose.yml -f docker-compose/"${env}".yml run --rm --service-ports "${service}" bash; \
+		docker-compose -f docker-compose.yml -f $(DOCKER_COMPOSE_DIR)/"${env}".yml run --rm --service-ports "${service}" bash; \
 	fi
 
 docker.build: clean
@@ -15,7 +15,7 @@ docker.build: clean
 	@if [ "${env}" == "" ]; then \
 		docker-compose build; \
 	else \
-		docker-compose -f docker-compose.yml -f docker-compose/"${env}".yml build; \
+		docker-compose -f docker-compose.yml -f $(DOCKER_COMPOSE_DIR)/"${env}".yml build; \
 	fi
 
 docker.down: clean
@@ -23,7 +23,7 @@ docker.down: clean
 	@if [ "${env}" == "" ]; then \
 		docker-compose -p "${PROJECT}" down --remove-orphans; \
 	else \
-		docker-compose -f docker-compose.yml -f docker-compose/"${env}".yml down --remove-orphans; \
+		docker-compose -f docker-compose.yml -f $(DOCKER_COMPOSE_DIR)/"${env}".yml down --remove-orphans; \
 	fi
 
 docker.ssh: clean
@@ -34,7 +34,7 @@ docker.status: clean
 	@if [ "${env}" == "" ]; then \
 		docker-compose -p "${PROJECT}" ps; \
 	else \
-		docker-compose -p "${PROJECT}" -f docker-compose.yml -f docker-compose/"${env}".yml ps; \
+		docker-compose -p "${PROJECT}" -f docker-compose.yml -f $(DOCKER_COMPOSE_DIR)/"${env}".yml ps; \
 	fi
 
 docker.stop: clean
@@ -42,7 +42,7 @@ docker.stop: clean
 	@if [ "${env}" == "" ]; then \
 		docker-compose -p "${PROJECT}" stop; \
 	else \
-		docker-compose -f docker-compose.yml -f docker-compose/"${env}".yml stop; \
+		docker-compose -f docker-compose.yml -f $(DOCKER_COMPOSE_DIR)/"${env}".yml stop; \
 	fi
 
 docker.cleanup: clean
@@ -59,7 +59,7 @@ docker.up: clean
 	@if [ "${env}" == "" ]; then \
 		docker-compose -p "${PROJECT}" up --remove-orphans; \
 	else \
-		docker-compose -f docker-compose.yml -f docker-compose/"${env}".yml up --remove-orphans; \
+		docker-compose -f docker-compose.yml -f $(DOCKER_COMPOSE_DIR)/"${env}".yml up --remove-orphans; \
 	fi
 
 docker.list: clean
@@ -67,5 +67,5 @@ docker.list: clean
 	@if [ "${env}" == "" ]; then \
 		docker-compose -p "${PROJECT_DEV}" ps; \
 	else \
-		docker-compose -f docker-compose.yml -f docker-compose/"${env}".yml ps; \
+		docker-compose -f docker-compose.yml -f $(DOCKER_COMPOSE_DIR)/"${env}".yml ps; \
 	fi
diff --git a/docker-compose/prod.yml b/provision/docker-compose/prod.yml
similarity index 100%
rename from docker-compose/prod.yml
rename to provision/docker-compose/prod.yml
diff --git a/docker-compose/stage.yml b/provision/docker-compose/stage.yml
similarity index 100%
rename from docker-compose/stage.yml
rename to provision/docker-compose/stage.yml
diff --git a/docker-compose/test.yml b/provision/docker-compose/test.yml
similarity index 80%
rename from docker-compose/test.yml
rename to provision/docker-compose/test.yml
index ba642d4..2b4d521 100644
--- a/docker-compose/test.yml
+++ b/provision/docker-compose/test.yml
@@ -10,4 +10,4 @@ services:
       - APP_NAME=python-facebook-chatbot
     build:
       context: .
-      dockerfile: docker/app-test/Dockerfile
+      dockerfile: provision/docker/app-test/Dockerfile
diff --git a/docker/app-test/Dockerfile b/provision/docker/app-test/Dockerfile
similarity index 87%
rename from docker/app-test/Dockerfile
rename to provision/docker/app-test/Dockerfile
index eafcb53..979c7b4 100644
--- a/docker/app-test/Dockerfile
+++ b/provision/docker/app-test/Dockerfile
@@ -56,11 +56,11 @@ RUN apk add --update --no-cache --virtual .build-deps \
     && rm -rf /etc/nginx/conf.d/default.conf
 
 # Copy the modified Nginx conf
-COPY docker/templates/etc/nginx/nginx.conf /etc/nginx/nginx.conf
-COPY docker/templates/etc/nginx/conf.d/nginx.conf /etc/nginx/conf.d/
+COPY provision/docker/templates/etc/nginx/nginx.conf /etc/nginx/nginx.conf
+COPY provision/docker/templates/etc/nginx/conf.d/nginx.conf /etc/nginx/conf.d/
 # Custom Supervisord config
-COPY docker/templates/etc/supervisord.conf /etc/
-COPY docker/templates/etc/supervisor/conf.d/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY provision/docker/templates/etc/supervisord.conf /etc/
+COPY provision/docker/templates/etc/supervisor/conf.d/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
 EXPOSE 80
 
diff --git a/docker/app/Dockerfile b/provision/docker/app/Dockerfile
similarity index 87%
rename from docker/app/Dockerfile
rename to provision/docker/app/Dockerfile
index 4d02f32..f342e9b 100644
--- a/docker/app/Dockerfile
+++ b/provision/docker/app/Dockerfile
@@ -56,11 +56,11 @@ RUN apk add --update --no-cache --virtual .build-deps \
     && rm -rf /etc/nginx/conf.d/default.conf
 
 # Copy the modified Nginx conf
-COPY docker/templates/etc/nginx/nginx.conf /etc/nginx/nginx.conf
-COPY docker/templates/etc/nginx/conf.d/nginx.conf /etc/nginx/conf.d/
+COPY provision/docker/templates/etc/nginx/nginx.conf /etc/nginx/nginx.conf
+COPY provision/docker/templates/etc/nginx/conf.d/nginx.conf /etc/nginx/conf.d/
 # Custom Supervisord config
-COPY docker/templates/etc/supervisord.conf /etc/
-COPY docker/templates/etc/supervisor/conf.d/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY provision/docker/templates/etc/supervisord.conf /etc/
+COPY provision/docker/templates/etc/supervisor/conf.d/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
 EXPOSE 80
 
diff --git a/docker/docs/Dockerfile b/provision/docker/docs/Dockerfile
similarity index 100%
rename from docker/docs/Dockerfile
rename to provision/docker/docs/Dockerfile
diff --git a/docker/templates/etc/nginx/conf.d/nginx.conf b/provision/docker/templates/etc/nginx/conf.d/nginx.conf
similarity index 100%
rename from docker/templates/etc/nginx/conf.d/nginx.conf
rename to provision/docker/templates/etc/nginx/conf.d/nginx.conf
diff --git a/docker/templates/etc/nginx/nginx.conf b/provision/docker/templates/etc/nginx/nginx.conf
similarity index 100%
rename from docker/templates/etc/nginx/nginx.conf
rename to provision/docker/templates/etc/nginx/nginx.conf
diff --git a/docker/templates/etc/supervisor/conf.d/supervisord.conf b/provision/docker/templates/etc/supervisor/conf.d/supervisord.conf
similarity index 100%
rename from docker/templates/etc/supervisor/conf.d/supervisord.conf
rename to provision/docker/templates/etc/supervisor/conf.d/supervisord.conf
diff --git a/docker/templates/etc/supervisord.conf b/provision/docker/templates/etc/supervisord.conf
similarity index 100%
rename from docker/templates/etc/supervisord.conf
rename to provision/docker/templates/etc/supervisord.conf