diff --git a/Makefile b/Makefile
index d64c9f4..fd71968 100644
--- a/Makefile
+++ b/Makefile
@@ -20,9 +20,18 @@ VERSION ?= v0.0.0
 REVMARK ?= Draft
 DOCKER_IMG := riscvintl/riscv-docs-base-container-image:latest
 ifneq ($(SKIP_DOCKER),true)
-	DOCKER_CMD := docker run --rm -v ${PWD}:/build -w /build \
-	${DOCKER_IMG} \
-	/bin/sh -c
+	DOCKER_IS_PODMAN = \
+		$(shell ! docker -v 2>&1 | grep podman >/dev/null ; echo $$?)
+	ifeq "$(DOCKER_IS_PODMAN)" "1"
+		DOCKER_VOL_SUFFIX = :z
+	endif
+
+	DOCKER_CMD := \
+		docker run --rm \
+			-v ${PWD}:/build${DOCKER_VOL_SUFFIX} \
+			-w /build \
+			${DOCKER_IMG} \
+			/bin/sh -c
 	DOCKER_QUOTE := "
 endif