diff --git a/releaseVersion b/releaseVersion
index 0e73971b094..8baaf74656b 100644
--- a/releaseVersion
+++ b/releaseVersion
@@ -1 +1 @@
-2.317.0-podman5
+2.317.0-podman6
diff --git a/src/Runner.Worker/Container/DockerCommandManager.cs b/src/Runner.Worker/Container/DockerCommandManager.cs
index 0c3e6bba2f9..99182a67b4f 100644
--- a/src/Runner.Worker/Container/DockerCommandManager.cs
+++ b/src/Runner.Worker/Container/DockerCommandManager.cs
@@ -116,6 +116,8 @@ public async Task<string> DockerCreate(IExecutionContext context, ContainerInfo
             // TODO: pull opts from env
             dockerOptions.Add("--privileged");
             dockerOptions.Add("--cgroupns host");
+            dockerOptions.Add("--uidmap 1001:0:1");
+            dockerOptions.Add("--uidmap 0:1:1001");
             //dockerOptions.Add("--userns keep-id");
             if (!string.IsNullOrEmpty(container.ContainerWorkDirectory))
             {
diff --git a/src/runnerversion b/src/runnerversion
index 0e73971b094..8baaf74656b 100644
--- a/src/runnerversion
+++ b/src/runnerversion
@@ -1 +1 @@
-2.317.0-podman5
+2.317.0-podman6