diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..503e3a99c
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,7 @@
+.bingo
+!.bingo/*.mod
+!.bingo/Variables.mk
+**/.git
+**/bin
+docs
+**/node_modules
diff --git a/Dockerfile b/Dockerfile
index 8b277ce0e..512d2aa3c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,19 +1,12 @@
-FROM golang:1.16-alpine as build
+FROM owncloudci/golang:1.16 as build
 
 COPY ./ /ocis/
-ENV CGO_ENABLED=0
-ENV GOOS=linux
-
-RUN apk update && \
-	apk upgrade --ignore musl-dev && \
-	apk add make gcc bash && \
-	rm -rf /var/cache/apk/*
 
 WORKDIR /ocis/ocis
 RUN make clean generate build
 
 
-FROM alpine:3
+FROM alpine:3.13
 
 RUN apk update && \
 	apk upgrade && \
diff --git a/ocis/docker/Dockerfile.linux.amd64 b/ocis/docker/Dockerfile.linux.amd64
index a5919002d..e8ad7b271 100644
--- a/ocis/docker/Dockerfile.linux.amd64
+++ b/ocis/docker/Dockerfile.linux.amd64
@@ -1,4 +1,4 @@
-FROM amd64/alpine:3.12
+FROM amd64/alpine:3.13
 
 ARG VERSION=""
 ARG REVISION=""
diff --git a/ocis/docker/Dockerfile.linux.arm b/ocis/docker/Dockerfile.linux.arm
index 4df910624..44b160651 100644
--- a/ocis/docker/Dockerfile.linux.arm
+++ b/ocis/docker/Dockerfile.linux.arm
@@ -1,4 +1,4 @@
-FROM arm32v6/alpine:3.12
+FROM arm32v6/alpine:3.13
 
 ARG VERSION=""
 ARG REVISION=""
diff --git a/ocis/docker/Dockerfile.linux.arm64 b/ocis/docker/Dockerfile.linux.arm64
index 1efa4a0b2..6dd5cd7e6 100644
--- a/ocis/docker/Dockerfile.linux.arm64
+++ b/ocis/docker/Dockerfile.linux.arm64
@@ -1,4 +1,4 @@
-FROM arm64v8/alpine:3.12
+FROM arm64v8/alpine:3.13
 
 ARG VERSION=""
 ARG REVISION=""