diff --git a/Dockerfile b/Dockerfile
index 47bd5dc..412b6d9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:alpine as builder
+FROM golang:1-alpine3.12 as builder
 
 ENV VERSION=v0.1.2
 
@@ -6,15 +6,16 @@ RUN apk --no-cache add \
     git \
     gcc \
     olm-dev \
-    libstdc++ \
+    libc-dev \
     musl-dev
 
+RUN ln -s /usr/lib/libstdc++.so.6 /usr/lib/libstdc++.so
+
 WORKDIR /build
 RUN git clone https://github.com/tulir/mautrix-whatsapp.git
 WORKDIR /build/mautrix-whatsapp
 RUN git checkout $VERSION
 
-RUN go get
 RUN go build -o /build/bin/mautrix-whatsapp
 
 FROM thallian/confd-env:latest
@@ -28,7 +29,7 @@ RUN apk --no-cache add \
     ca-certificates \
     libstdc++
 
-RUN apk --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main add \
+RUN apk --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community add \
     olm
 
 WORKDIR /var/lib/matrix-bridge