diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5a7914af..f757fb7f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,8 +40,10 @@ jobs:
         include:
         # JAVA 25
           - variant: java25
-            baseImage: eclipse-temurin:25-jre
-            platforms: linux/amd64,linux/arm64
+            # NOTE: 25-jre is also Noble (currently), but this variant needs to be 25-jre-noble specifically to include riscv64
+            # Keep this aligned in verify-pr.yml also
+            baseImage: eclipse-temurin:25-jre-noble
+            platforms: linux/amd64,linux/arm64,linux/riscv64
             mcVersion: latest
           - variant: java25-alpine
             baseImage: eclipse-temurin:25-jre-alpine
diff --git a/.github/workflows/verify-pr.yml b/.github/workflows/verify-pr.yml
index 9ac2fd9e..581db1ba 100644
--- a/.github/workflows/verify-pr.yml
+++ b/.github/workflows/verify-pr.yml
@@ -29,7 +29,8 @@ jobs:
         include:
         # JAVA 21/25:
           - variant: java25
-            baseImage: eclipse-temurin:25-jre
+            # stay aligned with build.yml
+            baseImage: eclipse-temurin:25-jre-noble
             platforms: linux/amd64,linux/arm64
             mcVersion: latest
           - variant: java25-alpine
diff --git a/build/ubuntu/install-packages.sh b/build/ubuntu/install-packages.sh
index c91525bc..9b169870 100755
--- a/build/ubuntu/install-packages.sh
+++ b/build/ubuntu/install-packages.sh
@@ -38,7 +38,7 @@ apt-get install -y \
 apt-get clean
 
 # Download and install patched knockd
-curl -fsSL -o /tmp/knock.tar.gz https://github.com/Metalcape/knock/releases/download/0.8.1/knock-0.8.1-$TARGET.tar.gz
+curl -fsSL -o /tmp/knock.tar.gz https://github.com/Opvolger/knock/releases/download/0.8.1/knock-0.8.1-$TARGET.tar.gz
 tar -xf /tmp/knock.tar.gz -C /usr/local/ && rm /tmp/knock.tar.gz
 ln -s /usr/local/sbin/knockd /usr/sbin/knockd
 setcap cap_net_raw=ep /usr/local/sbin/knockd
diff --git a/docs/versions/java.md b/docs/versions/java.md
index 96b1e32c..f49eb0b6 100644
--- a/docs/versions/java.md
+++ b/docs/versions/java.md
@@ -10,20 +10,20 @@ or explicitly include the tag, such as
 
 where `<tag>` refers to the first column of this table:
 
-| Tag            | Java version | Linux  | JVM Type           | Architecture        | Note |
-|----------------|--------------|--------|--------------------|---------------------|------|
-| latest         | 25           | Ubuntu | Hotspot            | amd64, arm64        |      |
-| stable         | 25           | Ubuntu | Hotspot            | amd64, arm64        |      |
-| java25         | 25           | Ubuntu | Hotspot            | amd64, arm64        |      |
-| java25-alpine  | 25           | Alpine | Hotspot            | amd64, arm64        |      |
-| java25-jdk     | 25           | Ubuntu | Hotspot+JDK        | amd64, arm64        |      |
-| java21         | 21           | Ubuntu | Hotspot            | amd64, arm64        |      |
-| java21-jdk     | 21           | Ubuntu | Hotspot+JDK        | amd64, arm64        |      |
-| java21-alpine  | 21           | Alpine | Hotspot            | amd64, arm64        |      |
-| java17         | 17           | Ubuntu | Hotspot            | amd64, arm64, armv7 |      |
-| java16         | 16           | Ubuntu | Hotspot            | amd64, arm64, armv7 | (1)  |
-| java11         | 11           | Ubuntu | Hotspot            | amd64, arm64, armv7 |      |
-| java8          | 8            | Ubuntu | Hotspot            | amd64, arm64, armv7 |      |
+| Tag           | Java version | Linux  | JVM Type    | Architecture          | Note |
+|---------------|--------------|--------|-------------|-----------------------|------|
+| latest        | 25           | Ubuntu | Hotspot     | amd64, arm64, riscv64 |      |
+| stable        | 25           | Ubuntu | Hotspot     | amd64, arm64, riscv64 |      |
+| java25        | 25           | Ubuntu | Hotspot     | amd64, arm64, riscv64 |      |
+| java25-alpine | 25           | Alpine | Hotspot     | amd64, arm64          |      |
+| java25-jdk    | 25           | Ubuntu | Hotspot+JDK | amd64, arm64          |      |
+| java21        | 21           | Ubuntu | Hotspot     | amd64, arm64          |      |
+| java21-jdk    | 21           | Ubuntu | Hotspot+JDK | amd64, arm64          |      |
+| java21-alpine | 21           | Alpine | Hotspot     | amd64, arm64          |      |
+| java17        | 17           | Ubuntu | Hotspot     | amd64, arm64, armv7   |      |
+| java16        | 16           | Ubuntu | Hotspot     | amd64, arm64, armv7   | (1)  |
+| java11        | 11           | Ubuntu | Hotspot     | amd64, arm64, armv7   |      |
+| java8         | 8            | Ubuntu | Hotspot     | amd64, arm64, armv7   |      |
 
 Notes
 
diff --git a/images.json b/images.json
index aad1ccf3..dfe915db 100644
--- a/images.json
+++ b/images.json
@@ -5,7 +5,7 @@
     "java": "25",
     "distribution": "ubuntu",
     "jvm": "hotspot",
-    "architectures": ["amd64", "arm64"],
+    "architectures": ["amd64", "arm64", "riscv64"],
     "lts": true
   },
   {
@@ -14,7 +14,7 @@
     "java": "25",
     "distribution": "ubuntu",
     "jvm": "hotspot",
-    "architectures": ["amd64", "arm64"],
+    "architectures": ["amd64", "arm64", "riscv64"],
     "lts": true
   },
   {
@@ -22,7 +22,7 @@
     "java": "25",
     "distribution": "ubuntu",
     "jvm": "hotspot",
-    "architectures": ["amd64", "arm64"]
+    "architectures": ["amd64", "arm64", "riscv64"]
   },
   {
     "tag": "java25-alpine",