diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index 1c832fb..945f7b5 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -173,7 +173,7 @@ jobs:
         if: inputs.do_upload
         uses: docker/build-push-action@v6
         with:
-          platforms: linux/amd64,linux/arm64/v8,linux/ppc64le,linux/s390x
+          platforms: linux/amd64,linux/arm64/v8,linux/ppc64le,linux/s390x,linux/riscv64
           push: true
           build-args: |
             BUILD_DATE=${{ steps.get_latest_release_metadata.outputs.build_date }}
diff --git a/Dockerfile b/Dockerfile
index b9689ad..185c365 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21.0.5_11-jre-jammy
+FROM eclipse-temurin:21.0.5_11-jre-noble
 
 ARG BUILD_DATE
 ARG TACHIDESK_RELEASE_TAG