diff --git a/common/container-puppet.py b/common/container-puppet.py
index 1b9ec81fdf..365f27e210 100755
--- a/common/container-puppet.py
+++ b/common/container-puppet.py
@@ -307,7 +307,12 @@ def mp_puppet_config(*args):
         pull_image(config_image)
 
         common_dcmd = [cli_cmd, 'run',
-                '--user', 'root',
+                # Using '0' and not 'root' because it seems podman is susceptible to a race condition
+                # https://bugzilla.redhat.com/show_bug.cgi?id=1776766 and
+                # https://bugs.launchpad.net/tripleo/+bug/1803544 which are still lurking
+                # by using a UID we skip the code that parses /etc/passwd entirely and basically
+                # paper over this issue
+                '--user', '0',
                 '--name', uname,
                 '--env', 'PUPPET_TAGS=%s' % puppet_tags,
                 '--env', 'NAME=%s' % config_volume,