diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7f83e7a..872b414 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -130,6 +130,7 @@ jobs:
           docker buildx build --platform linux/ppc64le --push -t mplatform/mquery:linux_ppc64le_${RELEASE_VER} -f packaging/Dockerfile.linux .
           docker buildx build --platform linux/s390x --push -t mplatform/mquery:linux_s390x_${RELEASE_VER} -f packaging/Dockerfile.linux .
           docker buildx build --platform linux/386 --push -t mplatform/mquery:linux_i386_${RELEASE_VER} -f packaging/Dockerfile.linux .
+          docker buildx build --platform linux/riscv64 --push -t mplatform/mquery:linux_riscv64_${RELEASE_VER} -f packaging/Dockerfile.linux .
         working-directory: src/github.com/estesp/mquery
 
   containers-win:
diff --git a/packaging/cross.sh b/packaging/cross.sh
index 7c262aa..2128c3f 100755
--- a/packaging/cross.sh
+++ b/packaging/cross.sh
@@ -21,6 +21,9 @@ PLATFORMS=(
 
   # MIPS
   linux/mips64le
+
+  # Risc-V
+  linux/riscv64
 )
 
 FAILURES=()
diff --git a/packaging/pushml-pre.yaml b/packaging/pushml-pre.yaml
index 504e7aa..2ff0304 100644
--- a/packaging/pushml-pre.yaml
+++ b/packaging/pushml-pre.yaml
@@ -20,6 +20,11 @@ manifests:
     platform:
       architecture: s390x
       os: linux
+  -
+    image: mplatform/mquery:linux_riscv64_VERS
+    platform:
+      architecture: riscv64
+      os: linux
   -
     image: mplatform/mquery:linux_arm64_VERS
     platform:
diff --git a/packaging/pushml.yaml b/packaging/pushml.yaml
index 80890ec..bafd8c6 100644
--- a/packaging/pushml.yaml
+++ b/packaging/pushml.yaml
@@ -1,51 +1,56 @@
 image: mplatform/mquery:VERS
 tags: [ "latest" ]
-manifests: 
-  - 
+manifests:
+  -
     image: mplatform/mquery:linux_ppc64le_VERS
-    platform: 
+    platform:
       architecture: ppc64le
       os: linux
-  - 
+  -
     image: mplatform/mquery:linux_amd64_VERS
-    platform: 
+    platform:
       architecture: amd64
       os: linux
-  - 
+  -
     image: mplatform/mquery:linux_i386_VERS
-    platform: 
+    platform:
       architecture: 386
       os: linux
-  - 
+  -
     image: mplatform/mquery:linux_s390x_VERS
-    platform: 
+    platform:
       architecture: s390x
       os: linux
-  - 
+  -
+    image: mplatform/mquery:linux_riscv64_VERS
+    platform:
+      architecture: riscv64
+      os: linux
+  -
     image: mplatform/mquery:linux_arm64_VERS
-    platform: 
+    platform:
       architecture: arm64
       os: linux
       variant: v8
-  - 
+  -
     image: mplatform/mquery:linux_arm_v7_VERS
-    platform: 
+    platform:
       architecture: arm
       os: linux
       variant: v7
-  - 
+  -
     image: mplatform/mquery:linux_arm_v6_VERS
-    platform: 
+    platform:
       architecture: arm
       os: linux
       variant: v6
-  - 
+  -
     image: mplatform/mquery:win2019_VERS
-    platform: 
+    platform:
       architecture: amd64
       os: windows
-  - 
+  -
     image: mplatform/mquery:win2016_VERS
-    platform: 
+    platform:
       architecture: amd64
       os: windows