diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..81ee6c8
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,87 @@
+---
+kind: pipeline
+type: docker
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+  - name: api
+    image: plugins/docker
+    settings:
+      registry: registry.itzana.me
+      repo: registry.itzana.me/strafesnet/maptest-api
+      tags:
+        - ${DRONE_BRANCH}-${DRONE_BUILD_NUMBER}
+        - ${DRONE_BRANCH}
+      username:
+        from_secret: REGISTRY_USER
+      password:
+        from_secret: REGISTRY_PASS
+      dockerfile: Containerfile
+      context: .
+    when:
+      branch:
+        - master
+        - staging
+        - ci
+
+  - name: frontend
+    image: plugins/docker
+    settings:
+      registry: registry.itzana.me
+      repo: registry.itzana.me/strafesnet/maptest-frontend
+      tags:
+        - ${DRONE_BRANCH}-${DRONE_BUILD_NUMBER}
+        - ${DRONE_BRANCH}
+      username:
+        from_secret: REGISTRY_USER
+      password:
+        from_secret: REGISTRY_PASS
+      dockerfile: web/Containerfile
+      context: web
+    when:
+      branch:
+        - master
+        - staging
+        - ci
+
+  - name: validator
+    image: plugins/docker
+    settings:
+      registry: registry.itzana.me
+      repo: registry.itzana.me/strafesnet/maptest-validator
+      tags:
+        - ${DRONE_BRANCH}-${DRONE_BUILD_NUMBER}
+        - ${DRONE_BRANCH}
+      username:
+        from_secret: REGISTRY_USER
+      password:
+        from_secret: REGISTRY_PASS
+      dockerfile: validation/Containerfile
+      context: validation
+    when:
+      branch:
+        - master
+        - staging
+        - ci
+
+  - name: deploy
+    image: argoproj/argocd:latest
+    commands:
+      - echo "Deploy!" # Not going to do actually do this until 
+    environment:
+      USERNAME:
+        from_secret: ARGO_USER
+      PASSWORD:
+        from_secret: ARGO_PASS
+    depends_on:
+      - api
+      - frontend
+      - validator
+    when:
+      branch:
+        - master
+        - staging
+        - ci
\ No newline at end of file
diff --git a/Containerfile b/Containerfile
index 7203e1b..4843f8a 100644
--- a/Containerfile
+++ b/Containerfile
@@ -7,9 +7,6 @@ WORKDIR /app
 # Copy go.mod and go.sum files
 COPY go.mod go.sum ./
 
-# Download dependencies
-RUN --mount=type=secret,id=netrc,dst=/root/.netrc go mod download
-
 # Copy the entire project
 COPY . .
 
diff --git a/Makefile b/Makefile
index 5a576f4..8225c30 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,12 @@
-.PHONY: maps-service web validation
 maps-service:
-	DOCKER_BUILDKIT=1 docker build . -f Containerfile -t maps-service \
-		--secret id=netrc,src=/home/quat/.netrc
+	DOCKER_BUILDKIT=1 docker build . -f Containerfile -t maps-service 
+
 web:
 	docker build web -f web/Containerfile -t maps-service-web
+
 validation:
 	docker build validation -f validation/Containerfile -t maps-service-validation
+
+all: maps-service web validation
+
+.PHONY: maps-service web validation