diff --git a/custom/linux/agent/amd/podman.amd.Dockerfile b/custom/linux/agent/amd/podman.amd.Dockerfile
index bc850192..62829c5b 100644
--- a/custom/linux/agent/amd/podman.amd.Dockerfile
+++ b/custom/linux/agent/amd/podman.amd.Dockerfile
@@ -42,9 +42,9 @@ RUN mkdir -p /var/lib/shared/overlay-images  \
     touch /var/lib/shared/vfs-images/images.lock;  \
     touch /var/lib/shared/vfs-layers/layers.lock;
 
-# Add configuration files to use overlayFS
-ADD https://raw.githubusercontent.com/containers/libpod/master/contrib/podmanimage/stable/containers.conf /etc/containers/containers.conf
-ADD https://raw.githubusercontent.com/containers/libpod/master/contrib/podmanimage/stable/podman-containers.conf /home/buildagent/.config/containers/containers.conf
+# Add configuration files to use configure overlayFS / FUSE properly
+COPY linux/agent/configs/podman/rootful.containers.conf /etc/containers/containers.conf
+COPY linux/agent/configs/podman/rootless.containers.conf /home/buildagent/.config/containers/containers.conf
 
 # Update access policy for configuration files (containers.conf, storage.conf), update storage configuration ...
 # ... to enable FUSE storage.
diff --git a/custom/linux/agent/configs/podman/rootful.containers.conf b/custom/linux/agent/configs/podman/rootful.containers.conf
new file mode 100644
index 00000000..6de8f90c
--- /dev/null
+++ b/custom/linux/agent/configs/podman/rootful.containers.conf
@@ -0,0 +1,12 @@
+[containers]
+cgroupns="host"
+cgroups="disabled"
+ipcns="host"
+utsns="host"
+netns="host"
+userns="host"
+log_driver = "k8s-file"
+[engine]
+cgroup_manager = "cgroupfs"
+runtime="crun"
+events_logger="file"
diff --git a/custom/linux/agent/configs/podman/rootless.containers.conf b/custom/linux/agent/configs/podman/rootless.containers.conf
new file mode 100644
index 00000000..46349640
--- /dev/null
+++ b/custom/linux/agent/configs/podman/rootless.containers.conf
@@ -0,0 +1,5 @@
+[containers]
+volumes = [
+	"/proc:/proc",
+]
+default_sysctls = []
\ No newline at end of file