diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..1d04d0d
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,51 @@
+kind: pipeline
+type: docker
+name: docker-build
+
+steps:
+- name: build
+  image: plugins/docker
+  settings:
+    registry: git.jvalver.de
+    username:
+      from_secret: username
+    password:
+      from_secret: password
+    repo: git.jvalver.de/thilawyn/protonmail-bridge-docker
+    dockerfile: build/Dockerfile
+    dry_run: true
+    context: build
+    autotag: true
+    compress: true
+    platform: linux/amd64
+
+trigger:
+  branch:
+    exclude:
+    - master
+
+
+---
+kind: pipeline
+type: docker
+name: docker-build-and-publish
+
+steps:
+- name: build-and-publish
+  image: plugins/docker
+  settings:
+    registry: git.jvalver.de
+    username:
+      from_secret: username
+    password:
+      from_secret: password
+    repo: git.jvalver.de/thilawyn/protonmail-bridge-docker
+    dockerfile: build/Dockerfile
+    context: build
+    autotag: true
+    compress: true
+    platform: linux/amd64
+
+trigger:
+  branch:
+  - master
diff --git a/build/Dockerfile b/build/Dockerfile
index 1971c40..9fdce7a 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,5 +1,4 @@
-# Use carlosedp/golang for riscv64 support
-FROM carlosedp/golang:1.18 AS build
+FROM golang:1.20-bookworm AS build
 
 # Install dependencies
 RUN apt-get update && apt-get install -y git build-essential libsecret-1-dev