diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 40a5b32b01..afbf039963 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -38,7 +38,7 @@ jobs:
           IMAGE_VERSION=${VERSION:1}
           echo "IMAGE_VERSION: ${IMAGE_VERSION}"
 
-          PLATFORMS="linux/amd64,linux/ppc64le,linux/arm64"
+          PLATFORMS="linux/amd64,linux/ppc64le,linux/arm64,linux/riscv64"
 
           echo "Building and pushing version ${IMAGE_VERSION} of image ${IMAGE_NAME}"
           echo '${{ secrets.DOCKER_PASSWORD }}' | docker login -u '${{ secrets.DOCKER_USERNAME }}' --password-stdin
@@ -60,7 +60,7 @@ jobs:
             -t "${IMAGE_NAME}:4" \
             -t "${IMAGE_NAME}:latest" \
             .
-          
+
           cd github-action
           docker buildx build \
             --label "org.opencontainers.image.authors=https://github.com/mikefarah/yq/graphs/contributors" \
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 757f694f61..5ce0161730 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -29,6 +29,7 @@ builds:
       - linux_mipsle
       - linux_ppc64
       - linux_ppc64le
+      - linux_riscv64
       - linux_s390x
       - netbsd_386
       - netbsd_amd64
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 93aab0e2aa..c5b26601f4 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -13,6 +13,7 @@ architectures:
   - build-on: armhf
   - build-on: amd64
   - build-on: i386
+  - build-on: riscv64
 apps:
   yq:
     command: bin/yq