diff --git a/.drone.star b/.drone.star
index 57e9291..3a5363c 100644
--- a/.drone.star
+++ b/.drone.star
@@ -163,8 +163,7 @@ def linux(ctx, arch):
                 'dry_run': True,
                 "dockerfile": "docker/Dockerfile.%s" % (arch),
                 "repo": "owncloudci/%s" % (ctx.repo.name),
-                "auto_tag": True,
-                "auto_tag_suffix": "%s" % (arch),
+                "tags": "latest",
             },
         })
 
diff --git a/docker/Dockerfile.amd64 b/docker/Dockerfile.amd64
index 04311dc..14cdba9 100644
--- a/docker/Dockerfile.amd64
+++ b/docker/Dockerfile.amd64
@@ -1,4 +1,4 @@
-FROM plugins/base:linux-amd64@sha256:edb6c2457ea2a40777b0af733e8662a54e366635ce9885ff3ba14cd072650fad
+FROM amd64/alpine:3.12
 
 LABEL maintainer="ownCloud DevOps <devops@owncloud.com>"
 LABEL org.opencontainers.image.authors="ownCloud DevOps <devops@owncloud.com>"
diff --git a/docker/Dockerfile.arm b/docker/Dockerfile.arm
index ebc4e43..3733833 100644
--- a/docker/Dockerfile.arm
+++ b/docker/Dockerfile.arm
@@ -1,4 +1,4 @@
-FROM plugins/base:linux-arm@sha256:186ca996404622ab931059474268acee0ffd64dcbf163b8a7385111f1c51af49
+FROM arm32v7/alpine:3.12
 
 LABEL maintainer="ownCloud DevOps <devops@owncloud.com>"
 LABEL org.opencontainers.image.authors="ownCloud DevOps <devops@owncloud.com>"
diff --git a/docker/Dockerfile.arm64 b/docker/Dockerfile.arm64
index 69275c8..474269d 100644
--- a/docker/Dockerfile.arm64
+++ b/docker/Dockerfile.arm64
@@ -1,4 +1,4 @@
-FROM plugins/base:linux-arm64@sha256:9bdb27fa8e8d1ecdb966638d2fc2e0dfed02f9c74f89fae6fe96acf4efb2c771
+FROM arm64v8/alpine:3.12
 
 LABEL maintainer="ownCloud DevOps <devops@owncloud.com>"
 LABEL org.opencontainers.image.authors="ownCloud DevOps <devops@owncloud.com>"