diff --git a/changelog/unreleased/use-alpine-latest.md b/changelog/unreleased/use-alpine-latest.md
new file mode 100644
index 0000000..7a6b458
--- /dev/null
+++ b/changelog/unreleased/use-alpine-latest.md
@@ -0,0 +1,5 @@
+Bugfix: build docker images with alpine:latest instead of alpine:edge
+
+ARM builds were failing when built on alpine:edge, so we switched to alpine:latest instead.
+
+https://github.com/owncloud/ocis-ocs/pull/20
diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64
index 0ed22cd..bc84307 100644
--- a/docker/Dockerfile.linux.amd64
+++ b/docker/Dockerfile.linux.amd64
@@ -1,4 +1,4 @@
-FROM amd64/alpine:edge
+FROM amd64/alpine:latest
 
 RUN apk update && \
 	apk upgrade && \
diff --git a/docker/Dockerfile.linux.arm b/docker/Dockerfile.linux.arm
index 108f999..812f8d5 100644
--- a/docker/Dockerfile.linux.arm
+++ b/docker/Dockerfile.linux.arm
@@ -1,4 +1,4 @@
-FROM arm32v6/alpine:edge
+FROM arm32v6/alpine:latest
 
 RUN apk update && \
 	apk upgrade && \
diff --git a/docker/Dockerfile.linux.arm64 b/docker/Dockerfile.linux.arm64
index 053b141..d9c673f 100644
--- a/docker/Dockerfile.linux.arm64
+++ b/docker/Dockerfile.linux.arm64
@@ -1,4 +1,4 @@
-FROM arm64v8/alpine:edge
+FROM arm64v8/alpine:latest
 
 RUN apk update && \
 	apk upgrade && \