diff --git a/tripleoclient/config/undercloud.py b/tripleoclient/config/undercloud.py
index 28392c81c..f937e08a7 100644
--- a/tripleoclient/config/undercloud.py
+++ b/tripleoclient/config/undercloud.py
@@ -284,6 +284,10 @@ class UndercloudConfig(StandaloneConfig):
                         default=True,
                         help=_('Enable or disable SELinux during the '
                                'deployment.')),
+            cfg.BoolOpt('undercloud_enable_paunch',
+                        default=True,
+                        help=_('Enable or disable Paunch to manage '
+                               'containers.')),
             cfg.BoolOpt('undercloud_update_packages',
                         default=False,
                         help=_(
diff --git a/tripleoclient/tests/config/test_config_undercloud.py b/tripleoclient/tests/config/test_config_undercloud.py
index b60ca2b85..9e7cbd2e0 100644
--- a/tripleoclient/tests/config/test_config_undercloud.py
+++ b/tripleoclient/tests/config/test_config_undercloud.py
@@ -67,6 +67,7 @@ class TestUndercloudConfig(base.TestCase):
                     'templates',
                     'undercloud_admin_host',
                     'undercloud_debug',
+                    'undercloud_enable_paunch',
                     'undercloud_enable_selinux',
                     'undercloud_hostname',
                     'undercloud_log_file',
@@ -133,6 +134,7 @@ class TestUndercloudConfig(base.TestCase):
                     'templates',
                     'undercloud_admin_host',
                     'undercloud_debug',
+                    'undercloud_enable_paunch',
                     'undercloud_enable_selinux',
                     'undercloud_hostname',
                     'undercloud_log_file',
diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py
index 63722e4d6..78d017457 100644
--- a/tripleoclient/v1/undercloud_config.py
+++ b/tripleoclient/v1/undercloud_config.py
@@ -432,6 +432,11 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
     else:
         env_data['SELinuxMode'] = 'permissive'
 
+    if CONF.get('undercloud_enable_paunch'):
+        env_data['EnablePaunch'] = True
+    else:
+        env_data['EnablePaunch'] = False
+
     if CONF.get('undercloud_ntp_servers', None):
         env_data['NtpServer'] = CONF['undercloud_ntp_servers']