diff --git a/Dockerfile b/Dockerfile
index c08a389..f0219f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,15 @@
 # syntax=docker/dockerfile:1
 
-ARG ALPINE_VERSION=3.19
+ARG ALPINE_VERSION=3.20
 ARG S6_VERSION=2.2.0.3
 
-ARG SAMBA_VERSION=4.18.9
+ARG SAMBA_VERSION=4.19.6
 ARG WSDD2_VERSION=e37443ac4c757dbf14167ec3f754ebe88244ad4b
 
 FROM --platform=${BUILDPLATFORM} crazymax/alpine-s6:${ALPINE_VERSION}-${S6_VERSION} AS wsdd2-src
-RUN apk --update --no-cache add git
 WORKDIR /src
-RUN git init . && git remote add origin "https://github.com/Netgear/wsdd2.git"
 ARG WSDD2_VERSION
-RUN git fetch origin "${WSDD2_VERSION}" && git checkout -q FETCH_HEAD
+ADD "https://github.com/Netgear/wsdd2.git#${WSDD2_VERSION}" .
 
 # TODO: do cross-compilation in this stage to build wsdd2
 FROM crazymax/alpine-s6:${ALPINE_VERSION}-${S6_VERSION} AS wsdd2
diff --git a/README.md b/README.md
index 4ef3b0d..369de59 100644
--- a/README.md
+++ b/README.md
@@ -81,6 +81,7 @@ Image: crazymax/samba:latest
    - linux/arm64
    - linux/386
    - linux/ppc64le
+   - linux/riscv64
    - linux/s390x
 ```
 
diff --git a/docker-bake.hcl b/docker-bake.hcl
index ae73b87..d21e9cb 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -30,6 +30,7 @@ target "image-all" {
     "linux/arm64",
     "linux/386",
     "linux/ppc64le",
+    "linux/riscv64",
     "linux/s390x"
   ]
 }