diff --git a/appmanager/Dockerfile b/appmanager/Dockerfile
index 5c90b18..248c052 100644
--- a/appmanager/Dockerfile
+++ b/appmanager/Dockerfile
@@ -1,16 +1,16 @@
 FROM golang:1-alpine AS build
 
+ARG GOOS=linux
+ARG GOARCH=amd64
+ARG CGO_ENABLED=0
+ARG GO111MODULE=on
+
 RUN apk update && apk upgrade && \
     apk add --no-cache bash git openssh
 
 WORKDIR /helm
-RUN wget https://get.helm.sh/helm-v3.2.1-linux-arm64.tar.gz
-RUN tar -xvf helm-v3.2.1-linux-arm64.tar.gz
-
-ENV GOOS linux
-ENV GOARCH $BUILDPLATFORM
-ENV CGO_ENABLED 0
-ENV GO111MODULE on
+RUN wget -O helm.tar.gz https://get.helm.sh/helm-v3.2.1-$GOOS-$GOARCH.tar.gz
+RUN tar -xvf helm.tar.gz
 
 WORKDIR $GOPATH/src/github.com/giolekva/pcloud/appmanager
 COPY . .
@@ -19,5 +19,5 @@
 FROM alpine:latest
 COPY --from=build /go/bin/app-manager /usr/bin
 RUN chmod a+x /usr/bin/app-manager
-COPY --from=build /helm/linux-arm64/helm /usr/bin/helm
+COPY --from=build /helm/*/helm /usr/bin/helm
 RUN chmod a+x /usr/bin/helm