diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml
index a48143281db1..3984b98d6c93 100644
--- a/.github/workflows/buildkit.yml
+++ b/.github/workflows/buildkit.yml
@@ -25,7 +25,7 @@ env:
   SETUP_BUILDX_VERSION: "latest"
   SETUP_BUILDKIT_IMAGE: "moby/buildkit:latest"
   IMAGE_NAME: "moby/buildkit"
-  PLATFORMS: "linux/amd64,linux/arm/v7,linux/arm64,linux/s390x,linux/ppc64le"
+  PLATFORMS: "linux/amd64,linux/arm/v7,linux/arm64,linux/s390x,linux/ppc64le,linux/riscv64"
   DESTDIR: "./bin"
 
 jobs:
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index 5fce91641938..b6d192b08bb7 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -23,7 +23,7 @@ env:
   SETUP_BUILDX_VERSION: "latest"
   SETUP_BUILDKIT_TAG: "moby/buildkit:latest"
   IMAGE_NAME: "docker/dockerfile-upstream"
-  PLATFORMS: "linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/mips,linux/mipsle,linux/mips64,linux/mips64le,linux/s390x,linux/ppc64le"
+  PLATFORMS: "linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/mips,linux/mipsle,linux/mips64,linux/mips64le,linux/s390x,linux/ppc64le,linux/riscv64"
 
 jobs:
   test:
diff --git a/docker-bake.hcl b/docker-bake.hcl
index ac753f01cd6b..f9a6906195a9 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -84,8 +84,7 @@ target "binaries-cross" {
     "linux/arm64",
     "linux/s390x",
     "linux/ppc64le",
-    # TODO: enable back once https://github.com/moby/buildkit/issues/4316 is fixed
-    // "linux/riscv64",
+    "linux/riscv64",
     "windows/amd64",
     "windows/arm64"
   ]