diff --git a/.gitignore b/.gitignore
index 50a4cb52..01adf20d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,6 @@ __pycache__
 *.pyc
 *.pyd
 *.pyo
-build
 dist
 node_modules
 npm-debug.log
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01c76b3d..a2cc99b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,15 +19,15 @@ build_frontend:
     IMAGE: gcr.io/beneathcrypto/frontend
   script: 
     - docker pull ${IMAGE}:latest || true
-    - docker build -f ./web/Dockerfile -t ${IMAGE}:latest -t ${IMAGE}:${CI_COMMIT_SHORT_SHA} --cache-from ${IMAGE}:latest ./web
+    - docker build -f ./build/web/Dockerfile -t ${IMAGE}:latest -t ${IMAGE}:${CI_COMMIT_SHORT_SHA} --cache-from ${IMAGE}:latest ./web
     - docker push ${IMAGE}:${CI_COMMIT_SHORT_SHA}
     - docker push ${IMAGE}:latest
 
 .build_go:
   script: 
     - docker pull ${IMAGE}:builder || true
-    - docker build -f ./${CMD_NAME}.Dockerfile --target builder -t ${IMAGE}:builder --cache-from ${IMAGE}:builder .
-    - docker build -f ./${CMD_NAME}.Dockerfile -t ${IMAGE}:latest -t ${IMAGE}:${CI_COMMIT_SHORT_SHA} --cache-from ${IMAGE}:builder .
+    - docker build -f ./build/${CMD_NAME}/Dockerfile --target builder -t ${IMAGE}:builder --cache-from ${IMAGE}:builder .
+    - docker build -f ./build/${CMD_NAME}/Dockerfile -t ${IMAGE}:latest -t ${IMAGE}:${CI_COMMIT_SHORT_SHA} --cache-from ${IMAGE}:builder .
     - docker push ${IMAGE}:${CI_COMMIT_SHORT_SHA}
     - docker push ${IMAGE}:latest
     - docker push ${IMAGE}:builder
diff --git a/control.Dockerfile b/build/control/Dockerfile
similarity index 100%
rename from control.Dockerfile
rename to build/control/Dockerfile
diff --git a/gateway.Dockerfile b/build/gateway/Dockerfile
similarity index 100%
rename from gateway.Dockerfile
rename to build/gateway/Dockerfile
diff --git a/pipeline.Dockerfile b/build/pipeline/Dockerfile
similarity index 100%
rename from pipeline.Dockerfile
rename to build/pipeline/Dockerfile
diff --git a/taskqueue.Dockerfile b/build/taskqueue/Dockerfile
similarity index 100%
rename from taskqueue.Dockerfile
rename to build/taskqueue/Dockerfile
diff --git a/web/Dockerfile b/build/web/Dockerfile
similarity index 100%
rename from web/Dockerfile
rename to build/web/Dockerfile