diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d840799..2fa759ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,3 @@
 include:
 - project: 'mautrix/ci'
-  file: '/gov2.yml'
-
-variables:
-  BINARY_NAME_V2: mautrix-telegram
+  file: '/gov2-as-default.yml'
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..962ffaa5
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,20 @@
+FROM golang:1-alpine3.23 AS builder
+
+RUN apk add --no-cache git ca-certificates build-base su-exec olm-dev
+
+COPY . /build
+WORKDIR /build
+RUN ./build.sh
+
+FROM alpine:3.23
+
+ENV UID=1337 \
+    GID=1337
+
+RUN apk add --no-cache ffmpeg su-exec ca-certificates olm bash jq curl yq-go lottieconverter
+
+COPY --from=builder /build/mautrix-telegram /usr/bin/mautrix-telegram
+COPY --from=builder /build/docker-run.sh /docker-run.sh
+VOLUME /data
+
+CMD ["/docker-run.sh"]
diff --git a/Dockerfile.v2.ci b/Dockerfile.ci
similarity index 100%
rename from Dockerfile.v2.ci
rename to Dockerfile.ci