diff --git a/custom/openldap-minion/Makefile b/custom/openldap-minion/Makefile
index 37ea0f9..669d4c1 100644
--- a/custom/openldap-minion/Makefile
+++ b/custom/openldap-minion/Makefile
@@ -1,9 +1,10 @@
+NAME_TAG = ghcr.io/saltstack/salt-ci-containers/openldap-minion:latest
 SALT_PATH ?= $(shell python -c 'import os, salt; print(os.path.abspath(salt.__file__ + "../../.."))')
 
 all: build
 
 build:
-	docker build -t openldap-minion:latest -f latest.Dockerfile .
+	docker build -t '$(NAME_TAG)' -f latest.Dockerfile .
 
 run:
 	if [ -d $(SALT_PATH) ]; then \
@@ -15,9 +16,9 @@ run:
 			--name openldap-minion \
 			-it \
 			--mount type=bind,source=$(SALT_PATH),target=/salt \
-			openldap-minion:latest \
+			'$(NAME_TAG)' \
 			sh; \
 	fi
 
 clean:
-	docker rmi openldap-minion
+	docker rmi '$(NAME_TAG)'
diff --git a/custom/openldap-minion/latest.Dockerfile b/custom/openldap-minion/latest.Dockerfile
index 0a31579..a814737 100644
--- a/custom/openldap-minion/latest.Dockerfile
+++ b/custom/openldap-minion/latest.Dockerfile
@@ -6,7 +6,9 @@ RUN install_packages \
     python3-jinja2 \
     python3-ldap \
     python3-msgpack \
+    python3-pip \
     python3-pycryptodome \
     python3-yaml \
     python3-zmq
+RUN pip install pytest-salt-factories
 USER 1001
diff --git a/custom/virt-minion/Makefile b/custom/virt-minion/Makefile
index e1c9731..2a06501 100644
--- a/custom/virt-minion/Makefile
+++ b/custom/virt-minion/Makefile
@@ -1,9 +1,10 @@
+NAME_TAG = ghcr.io/saltstack/salt-ci-containers/virt-minion:latest
 SALT_PATH ?= $(shell python -c 'import os, salt; print(os.path.abspath(salt.__file__ + "../../.."))')
 
 all: build
 
 build:
-	docker build -t virt-minion .
+	docker build -t '$(NAME_TAG)' -f latest.Dockerfile .
 
 run:
 	if [ -d $(SALT_PATH) ]; then \
@@ -15,8 +16,8 @@ run:
 			--name virt-minion-0 \
 			-it \
 			--mount type=bind,source=$(SALT_PATH),target=/salt \
-			virt-minion \
+			'$(NAME_TAG)' \
 			sh; \
 	fi
 clean:
-	docker rmi virt-minion
+	docker rmi '$(NAME_TAG)'