diff --git a/.github/workflows/build-and-push-image.yml b/.github/workflows/build-and-push-image.yml
index 78a28ce..2c40d72 100644
--- a/.github/workflows/build-and-push-image.yml
+++ b/.github/workflows/build-and-push-image.yml
@@ -33,5 +33,6 @@ jobs:
      - name: Build and push to DockerHub
        uses: docker/build-push-action@v2
        with:
+         platforms: linux/amd64,linux/arm64
          tags: "${{env.CALVER_TARGET}}, ${{env.LATEST_TARGET}}"
          push: true
diff --git a/Dockerfile b/Dockerfile
index 0c37623..641c7ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.10 AS base
+FROM ubuntu:bionic-20220315 AS base
 
 RUN apt-get update && apt-get install --yes --no-install-recommends \
     # support singularity build/pull workflows
@@ -22,10 +22,12 @@ RUN apt-get update && apt-get install --yes --no-install-recommends \
     cryptsetup \
   && rm -rf /var/lib/apt/lists/*
 
+ARG TARGETARCH
+
 RUN export VERSION=1.16.4 \
- && wget --quiet https://golang.org/dl/go${VERSION}.linux-amd64.tar.gz \
- && tar -C /usr/local -xzf go${VERSION}.linux-amd64.tar.gz \
- && rm /go${VERSION}.linux-amd64.tar.gz
+ && wget --quiet https://golang.org/dl/go${VERSION}.linux-${TARGETARCH}.tar.gz \
+ && tar -C /usr/local -xzf go${VERSION}.linux-${TARGETARCH}.tar.gz \
+ && rm /go${VERSION}.linux-${TARGETARCH}.tar.gz
 
 ENV PATH=$PATH:/usr/local/go/bin