diff --git a/.dockerignore b/.dockerignore
index 5eca8e1b80..c528ea1189 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -7,3 +7,4 @@ data/
 !.build/linux-arm64/
 !.build/linux-ppc64le/
 !.build/linux-s390x/
+!.build/linux-riscv64/
diff --git a/Makefile b/Makefile
index 8bc4a3dcaa..ad4b90f020 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 # Needs to be defined before including Makefile.common to auto-generate targets
-DOCKER_ARCHS ?= amd64 armv7 arm64 ppc64le s390x
+DOCKER_ARCHS ?= amd64 armv7 arm64 ppc64le riscv64 s390x
 
 UI_PATH = web/ui
 UI_NODE_MODULES_PATH = $(UI_PATH)/node_modules