diff --git a/.dockerignore b/.dockerignore
index 0b35429f..c528ea11 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,8 +1,10 @@
+data/
 .build/
 .tarballs/
 
 !.build/linux-amd64/
-!.build/linux-armv7
-!.build/linux-arm64
-!.build/linux-ppc64le
-!.build/linux-s390x
+!.build/linux-armv7/
+!.build/linux-arm64/
+!.build/linux-ppc64le/
+!.build/linux-s390x/
+!.build/linux-riscv64/
diff --git a/Makefile.common b/Makefile.common
index 52fe9daa..90795084 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -90,7 +90,9 @@ ifdef DOCKERFILE_PATH
 $(error DOCKERFILE_PATH is deprecated. Use DOCKERFILE_VARIANTS ?= $(DOCKERFILE_PATH) in the Makefile)
 endif
 
-DOCKER_ARCHS            ?= amd64
+DOCKER_ARCHS ?= amd64 armv7 arm64 ppc64le riscv64 s390x
+DOCKERFILE_ARCH_EXCLUSIONS ?=
+DOCKER_REGISTRY_ARCH_EXCLUSIONS ?= quay.io:riscv64
 DOCKERFILE_VARIANTS     ?= $(wildcard Dockerfile Dockerfile.*)
 
 # Function to extract variant from Dockerfile label.