diff --git a/build/Dockerfile b/build/Dockerfile
index 1971c40..b2f01f4 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,15 +1,14 @@
-# Use carlosedp/golang for riscv64 support
-FROM carlosedp/golang:1.18 AS build
+FROM debian:sid-slim AS build
 
 # Install dependencies
-RUN apt-get update && apt-get install -y git build-essential libsecret-1-dev
+RUN apt-get update && apt-get install -y git golang build-essential libsecret-1-dev
 
 # Build
 WORKDIR /build/
 COPY build.sh VERSION /build/
 RUN bash build.sh
 
-FROM ubuntu:jammy
+FROM debian:sid-slim
 LABEL maintainer="Xiaonan Shen <s@sxn.dev>"
 
 EXPOSE 25/tcp
diff --git a/deb/Dockerfile b/deb/Dockerfile
index 8aa8bc7..ddebcac 100644
--- a/deb/Dockerfile
+++ b/deb/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy
+FROM debian:sid-slim
 LABEL maintainer="Xiaonan Shen <s@sxn.dev>"
 
 EXPOSE 25/tcp