diff --git a/images/Dockerfile b/images/Dockerfile
index fcc36998be5..5f7d100d714 100644
--- a/images/Dockerfile
+++ b/images/Dockerfile
@@ -30,7 +30,7 @@ ENV ImageOS=ubuntu24
 
 # 'gpg-agent' and 'software-properties-common' are needed for the 'add-apt-repository' command that follows
 RUN apt update -y \
-    && apt install -y --no-install-recommends sudo lsb-release gpg-agent software-properties-common podman podman-docker \
+    && apt install -y --no-install-recommends sudo lsb-release gpg-agent software-properties-common podman podman-docker uidmap \
     && rm -rf /var/lib/apt/lists/*
 
 # Configure git-core/ppa based on guidance here:  https://git-scm.com/download/linux
diff --git a/releaseVersion b/releaseVersion
index 3d3f3a8d35e..343a7e1bfc5 100644
--- a/releaseVersion
+++ b/releaseVersion
@@ -1 +1 @@
-2.317.0-podman3
+2.317.0-podman4
diff --git a/src/Runner.Worker/Container/DockerCommandManager.cs b/src/Runner.Worker/Container/DockerCommandManager.cs
index d6b61446d07..2e21f4bfe8e 100644
--- a/src/Runner.Worker/Container/DockerCommandManager.cs
+++ b/src/Runner.Worker/Container/DockerCommandManager.cs
@@ -116,7 +116,7 @@ public async Task<string> DockerCreate(IExecutionContext context, ContainerInfo
             // TODO: pull opts from env
             dockerOptions.Add("--privileged");
             dockerOptions.Add("--cgroupns host");
-            dockerOptions.Add("--userns host");
+            dockerOptions.Add("--userns keep-id");
             if (!string.IsNullOrEmpty(container.ContainerWorkDirectory))
             {
                 dockerOptions.Add($"--workdir {container.ContainerWorkDirectory}");
diff --git a/src/runnerversion b/src/runnerversion
index 3d3f3a8d35e..343a7e1bfc5 100644
--- a/src/runnerversion
+++ b/src/runnerversion
@@ -1 +1 @@
-2.317.0-podman3
+2.317.0-podman4