diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 54780e0..cb20661 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -19,7 +19,7 @@ on:
 env:
   DOCKER_REPO: shenxn/protonmail-bridge
   DOCKER_REPO_DEV: ghcr.io/shenxn/protonmail-bridge-dev
-  PLATFORMS: linux/amd64,linux/arm64/v8
+  PLATFORMS: linux/amd64,linux/arm64/v8,linux/arm/v7,linux/riscv64
 
 jobs:
   build:
diff --git a/build/Dockerfile b/build/Dockerfile
index 475efdb..1971c40 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,5 +1,5 @@
 # Use carlosedp/golang for riscv64 support
-FROM golang:latest AS build
+FROM carlosedp/golang:1.18 AS build
 
 # Install dependencies
 RUN apt-get update && apt-get install -y git build-essential libsecret-1-dev