diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..6c0b062b7
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,6 @@
+files/
+Dockerfile
+docker-manifest.tmpl
+docker-manifest-unstable.tmpl
+*.db
+*.zip
diff --git a/.drone.yml b/.drone.yml
index df6689838..04294448e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -662,36 +662,6 @@ steps:
     image: docker:git
     commands:
       - git fetch --tags
-  - name: docker-arm-unstable
-    image: plugins/docker:linux-arm
-    pull: true
-    settings:
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-      repo: vikunja/api
-      tags: unstable-linux-arm
-    depends_on: [ fetch-tags ]
-    when:
-      ref:
-        - refs/heads/main
-
-  - name: docker-arm
-    image: plugins/docker:linux-arm
-    pull: true
-    settings:
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-      repo: vikunja/api
-      auto_tag: true
-      auto_tag_suffix: linux-arm
-    depends_on: [ fetch-tags ]
-    when:
-      ref:
-        - "refs/tags/**"
 
   - name: docker-arm64-unstable
     image: plugins/docker:linux-arm64
@@ -874,6 +844,6 @@ steps:
         - failure
 ---
 kind: signature
-hmac: 9078662aed29b2f5cf1b7a988d5bffb82234710fa790436c38314552930833d2
+hmac: 24ae934ccafb57159927ab62ba4d00f85490d1330feef264833a6605494b75b2
 
 ...
diff --git a/Dockerfile b/Dockerfile
index ab625eeec..591e6a863 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,8 +17,7 @@ RUN if [ -n "${VIKUNJA_VERSION}" ]; then git checkout "${VIKUNJA_VERSION}"; fi \
 # The actual image
 # Note: I wanted to use the scratch image here, but unfortunatly the go-sqlite bindings require cgo and
 # because of this, the container would not start when I compiled the image without cgo.
-# We're using debian as a base image here because the latest alpine image does not work with arm.
-FROM debian:buster-slim
+FROM alpine:3.16
 LABEL maintainer="maintainers@vikunja.io"
 
 WORKDIR /app/vikunja/
@@ -28,13 +27,14 @@ ENV VIKUNJA_SERVICE_ROOTPATH=/app/vikunja/
 # Dynamic permission changing stuff
 ENV PUID 1000
 ENV PGID 1000
-RUN addgroup --gid ${PGID} vikunja && \
-  chown ${PUID} -R /app/vikunja && \
-  useradd --shell /bin/sh --gid vikunja --uid ${PUID} --home-dir /app/vikunja vikunja
+RUN apk --no-cache add shadow && \
+  addgroup -g ${PGID} vikunja && \
+  adduser -s /bin/sh -D -G vikunja -u ${PUID} vikunja -h /app/vikunja -H && \
+  chown vikunja -R /app/vikunja
 COPY run.sh /run.sh
 
-# Fix time zone settings not working
-RUN apt-get update && apt-get install -y tzdata && apt-get clean
+# Add time zone data
+RUN apk --no-cache add tzdata
 
 # Files permissions
 RUN mkdir /app/vikunja/files && \
diff --git a/docker-manifest-unstable.tmpl b/docker-manifest-unstable.tmpl
index d06b47536..32a798617 100644
--- a/docker-manifest-unstable.tmpl
+++ b/docker-manifest-unstable.tmpl
@@ -10,8 +10,3 @@ manifests:
     platform:
       architecture: arm64
       os: linux
-  -
-    image: vikunja/api:unstable-linux-arm
-    platform:
-      architecture: arm
-      os: linux
diff --git a/docker-manifest.tmpl b/docker-manifest.tmpl
index 4561c5f03..d0ee75682 100644
--- a/docker-manifest.tmpl
+++ b/docker-manifest.tmpl
@@ -16,8 +16,3 @@ manifests:
     platform:
       architecture: arm64
       os: linux
-  -
-    image: vikunja/api:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
-    platform:
-      architecture: arm
-      os: linux