diff --git a/tripleo_ansible/ansible_plugins/modules/paunch.py b/tripleo_ansible/ansible_plugins/modules/paunch.py
index c3f31f23e..04cf25032 100644
--- a/tripleo_ansible/ansible_plugins/modules/paunch.py
+++ b/tripleo_ansible/ansible_plugins/modules/paunch.py
@@ -146,21 +146,7 @@ class PaunchManager:
                                                    log_file=self.log_file)
 
         if self.config:
-            if os.path.isdir(self.config):
-                container_configs = {}
-                config_files = [c_json for c_json in
-                                os.listdir(self.config)
-                                if c_json.startswith('hashed-')
-                                and c_json.endswith('.json')]
-                for cf in config_files:
-                    with open(os.path.join(self.config, cf), 'r') as f:
-                        c = re.sub('^hashed-', '', os.path.splitext(cf)[0])
-                        container_configs[c] = {}
-                        container_configs[c].update(yaml.safe_load(f))
-                self.config_yaml = container_configs
-            else:
-                with open(self.config, 'r') as f:
-                    self.config_yaml = yaml.safe_load(f)
+            self.config_yaml = putils_common.load_config(self.config)
 
         if self.action == 'apply':
             self.paunch_apply()