diff --git a/common/container-puppet.py b/common/container-puppet.py
index 7ccd1b0663..5df30c3c2d 100755
--- a/common/container-puppet.py
+++ b/common/container-puppet.py
@@ -408,7 +408,6 @@ def mp_puppet_config(*args):
                 '--env', 'NO_ARCHIVE=%s' % os.environ.get('NO_ARCHIVE', ''),
                 '--env', 'STEP=%s' % os.environ.get('STEP', '6'),
                 '--env', 'NET_HOST=%s' % os.environ.get('NET_HOST', 'false'),
-                '--log-driver', 'json-file',
                 '--volume', '/etc/localtime:/etc/localtime:ro',
                 '--volume', '%s:/etc/config.pp:ro' % tmp_man.name,
                 '--volume', '/etc/puppet/:/tmp/puppet-etc/:ro',
@@ -425,7 +424,8 @@ def mp_puppet_config(*args):
 
         if container_cli == 'podman':
             log_path = os.path.join(container_log_stdout_path, uname)
-            logging = ['--log-opt',
+            logging = ['--log-driver', 'k8s-file',
+                       '--log-opt',
                        'path=%s.log' % log_path]
             common_dcmd.extend(logging)