diff --git a/contrib/Dockerfile b/contrib/Dockerfile
index e25865b..e1b1b97 100644
--- a/contrib/Dockerfile
+++ b/contrib/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.10 as base
+FROM docker.io/library/ubuntu:22.10 as base
 
 RUN apt-get -qq update -y \
     && DEBIAN_FRONTEND=noninteractive \
diff --git a/contrib/Makefile b/contrib/Makefile
index c0eb8b6..8056bd0 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -1,5 +1,22 @@
+all:
+	@echo "Build targets: "
+	@echo "build			Build an image for building tools with Docker"
+	@echo "run			Run a shell using the above image with Docker"
+	@echo "podman-build       	Build an image with podman"
+	@echo "podman-run		Run a shell using above image with podman"
+	@echo "podman-run-make		Run the above image with podman and build the FPGA bitstream"
+
 build:
-	docker build -t key1 .
+	docker build -t tkey-builder .
 
 run:
-	docker run --mount type=bind,source="`pwd`/../",target=/build -w /build -it key1 /usr/bin/bash
+	docker run --mount type=bind,source="`pwd`/../",target=/build -w /build -it tkey-builder /usr/bin/bash
+
+podman-build:
+	podman build -t tkey-builder .
+
+podman-run:
+	podman run --mount type=bind,source="`pwd`/../",target=/build -w /build -it tkey-builder /usr/bin/bash
+
+podman-run-make:
+	podman run --mount type=bind,source="`pwd`/../hw/application_fpga",target=/build -w /build -it tkey-builder make