diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 3bdafa0..c5f19cb 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -9,7 +9,7 @@ jobs:
   build-8:
     runs-on: almalinux-8
     container:
-      image: git.query.consul/unkin/almalinux8-runnerdnd:latest
+      image: git.query.consul/unkin/almalinux8-actionsdind:latest
       options: --privileged
 
     steps:
@@ -33,7 +33,7 @@ jobs:
   build-9:
     runs-on: almalinux-8
     container:
-      image: git.query.consul/unkin/almalinux9-runnerdnd:latest
+      image: git.query.consul/unkin/almalinux9-actionsdind:latest
       options: --privileged
 
     steps:
diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 08a129c..5fbd520 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -10,7 +10,7 @@ jobs:
   deploy-8:
     runs-on: almalinux-8
     container:
-      image: git.query.consul/unkin/almalinux8-runnerdnd:latest
+      image: git.query.consul/unkin/almalinux8-actionsdind:latest
       options: --privileged
 
     steps:
@@ -39,7 +39,7 @@ jobs:
   deploy-9:
     runs-on: almalinux-8
     container:
-      image: git.query.consul/unkin/almalinux9-runnerdnd:latest
+      image: git.query.consul/unkin/almalinux9-actionsdind:latest
       options: --privileged
 
     steps:
diff --git a/Makefile b/Makefile
index 5b0a05e..7e634a1 100644
--- a/Makefile
+++ b/Makefile
@@ -4,14 +4,17 @@ RPMS_DIR := $(ROOT_DIR)/rpms
 REPO_OPTIONS := --disablerepo=* --enablerepo=unkin
 
 # Automatically find all package/version directories
-PACKAGES := $(shell find $(RPMS_DIR) -mindepth 2 -maxdepth 2 -type d | sed "s|$(RPMS_DIR)/||" | grep -v "/scripts")
+PACKAGES := $(shell find $(RPMS_DIR) -mindepth 2 -maxdepth 2 -type d | sed "s|$(RPMS_DIR)/||" | grep -Ev '(scripts|/resources)')
 
 # Default target to build all packages and versions
 .PHONY: all list cache build clean
 all: cache $(PACKAGES)
 
 list:
-	@echo "$(PACKAGES)"
+	@echo "Builds:"
+	@for package in $(PACKAGES); do \
+		echo "  '$$package'"; \
+	done
 
 cache:
 	echo "Refreshing DNF cache..." && \
diff --git a/rpms/cni-plugins/Dockerfile b/rpms/cni-plugins/Dockerfile
index fd8c6ea..149f08f 100644
--- a/rpms/cni-plugins/Dockerfile
+++ b/rpms/cni-plugins/Dockerfile
@@ -1,5 +1,5 @@
 # Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8-buildagent:latest
+FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
 
 # Create output directory for RPMs
 RUN mkdir -p /app/dist
diff --git a/rpms/consul/Dockerfile b/rpms/consul/Dockerfile
index ac2c372..8338fd9 100644
--- a/rpms/consul/Dockerfile
+++ b/rpms/consul/Dockerfile
@@ -1,5 +1,5 @@
 # Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8-buildagent:latest
+FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
 
 # Create output directory for RPMs
 RUN mkdir -p /app/dist
diff --git a/rpms/nfpm/Dockerfile b/rpms/nfpm/Dockerfile
index 24d1b18..8fafb7b 100644
--- a/rpms/nfpm/Dockerfile
+++ b/rpms/nfpm/Dockerfile
@@ -1,5 +1,5 @@
 # Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8-buildagent:latest
+FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
 
 # Create output directory for RPMs
 RUN mkdir -p /app/dist
diff --git a/rpms/nomad/Dockerfile b/rpms/nomad/Dockerfile
index 33296e3..7028421 100644
--- a/rpms/nomad/Dockerfile
+++ b/rpms/nomad/Dockerfile
@@ -1,5 +1,5 @@
 # Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8-buildagent:latest
+FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
 
 # Create output directory for RPMs
 RUN mkdir -p /app/dist
diff --git a/rpms/packer/Dockerfile b/rpms/packer/Dockerfile
index e26aa2e..8a81557 100644
--- a/rpms/packer/Dockerfile
+++ b/rpms/packer/Dockerfile
@@ -1,5 +1,5 @@
 # Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8-buildagent:latest
+FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
 
 # Create output directory for RPMs
 RUN mkdir -p /app/dist
diff --git a/rpms/ruff/Dockerfile b/rpms/ruff/Dockerfile
index 93e10a9..65a8045 100644
--- a/rpms/ruff/Dockerfile
+++ b/rpms/ruff/Dockerfile
@@ -1,5 +1,5 @@
 # Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8-buildagent:latest
+FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
 
 # Create output directory for RPMs
 RUN mkdir -p /app/dist
diff --git a/rpms/terraform/Dockerfile b/rpms/terraform/Dockerfile
index 3877b7d..94cff6d 100644
--- a/rpms/terraform/Dockerfile
+++ b/rpms/terraform/Dockerfile
@@ -1,5 +1,5 @@
 # Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8-buildagent:latest
+FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
 
 # Create output directory for RPMs
 RUN mkdir -p /app/dist
diff --git a/rpms/terragrunt/Dockerfile b/rpms/terragrunt/Dockerfile
index df049c7..ab0cf22 100644
--- a/rpms/terragrunt/Dockerfile
+++ b/rpms/terragrunt/Dockerfile
@@ -1,5 +1,5 @@
 # Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8-buildagent:latest
+FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
 
 # Create output directory for RPMs
 RUN mkdir -p /app/dist
diff --git a/rpms/uv/Dockerfile b/rpms/uv/Dockerfile
index 1583ae1..a02d01f 100644
--- a/rpms/uv/Dockerfile
+++ b/rpms/uv/Dockerfile
@@ -1,5 +1,5 @@
 # Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8-buildagent:latest
+FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
 
 # Create output directory for RPMs
 RUN mkdir -p /app/dist
diff --git a/rpms/vault/Dockerfile b/rpms/vault/Dockerfile
index eacfaef..b4992ff 100644
--- a/rpms/vault/Dockerfile
+++ b/rpms/vault/Dockerfile
@@ -1,5 +1,5 @@
 # Start with the AlmaLinux 8.10 base image
-FROM git.query.consul/unkin/almalinux8-buildagent:latest
+FROM git.query.consul/unkin/almalinux8-rpmbuilder:latest
 
 # Create output directory for RPMs
 RUN mkdir -p /app/dist