diff --git a/Containerfile b/Containerfile
index cd11e34..5b46655 100644
--- a/Containerfile
+++ b/Containerfile
@@ -16,13 +16,11 @@
 
 FROM quay.io/centos/centos:stream9
 
-ADD /setup.sh /xpackages.txt /root/
-ADD /containers.conf /home/podman/.config/containers/containers.conf
-ADD /podman.service /podman.socket /prune.service /prune.timer /home/podman/.config/systemd/user/
-ADD /runner.service /home/runner/.config/systemd/user/
-ADD kmsglog.conf /etc/systemd/system.conf.d/
+ADD /root/ /root/
+ADD /etc/ /etc/
+ADD /home/ /home/
 
-# Allow image-builders to choose another version becides "latest" should
+# Allow image-builders to choose another version besides "latest" should
 # an incompatible change be introduced.
 ARG RUNNER_VERSION=latest
 
diff --git a/kmsglog.conf b/etc/systemd/system.conf.d/kmsglog.conf
similarity index 100%
rename from kmsglog.conf
rename to etc/systemd/system.conf.d/kmsglog.conf
diff --git a/containers.conf b/home/podman/.config/containers/containers.conf
similarity index 100%
rename from containers.conf
rename to home/podman/.config/containers/containers.conf
diff --git a/podman.service b/home/podman/.config/systemd/user/podman.service
similarity index 100%
rename from podman.service
rename to home/podman/.config/systemd/user/podman.service
diff --git a/podman.socket b/home/podman/.config/systemd/user/podman.socket
similarity index 100%
rename from podman.socket
rename to home/podman/.config/systemd/user/podman.socket
diff --git a/prune.service b/home/podman/.config/systemd/user/prune.service
similarity index 100%
rename from prune.service
rename to home/podman/.config/systemd/user/prune.service
diff --git a/prune.timer b/home/podman/.config/systemd/user/prune.timer
similarity index 100%
rename from prune.timer
rename to home/podman/.config/systemd/user/prune.timer
diff --git a/runner.service b/home/runner/.config/systemd/user/runner.service
similarity index 100%
rename from runner.service
rename to home/runner/.config/systemd/user/runner.service
diff --git a/setup.sh b/root/setup.sh
similarity index 100%
rename from setup.sh
rename to root/setup.sh
diff --git a/xpackages.txt b/root/xpackages.txt
similarity index 100%
rename from xpackages.txt
rename to root/xpackages.txt