diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py
index 3c863ae660..0b7d6caafe 100755
--- a/docker/docker-puppet.py
+++ b/docker/docker-puppet.py
@@ -28,7 +28,10 @@ import tempfile
 import time
 import multiprocessing
 
+from paunch import runner as containers_runner
+
 logger = None
+RUNNER = containers_runner.DockerRunner('docker-puppet')
 
 
 def get_logger():
@@ -309,12 +312,14 @@ def mp_puppet_config(*args):
             man_file.write('include ::tripleo::packages\n')
             man_file.write(manifest)
 
-        rm_container('docker-puppet-%s' % config_volume)
+        uname = RUNNER.unique_container_name('docker-puppet-%s' %
+                                             config_volume)
+        rm_container(uname)
         pull_image(config_image)
 
         dcmd = ['/usr/bin/docker', 'run',
                 '--user', 'root',
-                '--name', 'docker-puppet-%s' % config_volume,
+                '--name', uname,
                 '--env', 'PUPPET_TAGS=%s' % puppet_tags,
                 '--env', 'NAME=%s' % config_volume,
                 '--env', 'HOSTNAME=%s' % short_hostname(),
@@ -377,7 +382,7 @@ def mp_puppet_config(*args):
             if cmd_stderr:
                 log.debug(cmd_stderr)
             # only delete successful runs, for debugging
-            rm_container('docker-puppet-%s' % config_volume)
+            rm_container(uname)
 
         log.info('Finished processing puppet configs for %s' % (config_volume))
         return subproc.returncode
diff --git a/lower-constraints.txt b/lower-constraints.txt
index a6ee09cde0..102bfc1545 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -82,6 +82,7 @@ paramiko==2.0.0
 passlib==1.7.0
 Paste==2.0.2
 PasteDeploy==1.5.0
+paunch==3.2.0
 pbr==2.0.0
 pecan==1.0.0
 pika-pool==0.1.3
diff --git a/requirements.txt b/requirements.txt
index bda47437c8..94749284fa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,3 +6,4 @@ PyYAML>=3.12 # MIT
 Jinja2>=2.10 # BSD License (3 clause)
 six>=1.10.0 # MIT
 tripleo-common>=7.1.0 # Apache-2.0
+paunch>=3.2.0 # Apache-2.0