diff --git a/Puppetfile b/Puppetfile
index 87953cdb..6c23aecc 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -22,4 +22,4 @@ mod 'theforeman/puppet',             :git => 'https://github.com/theforeman/pupp
 # Top-level katello modules
 mod 'katello/foreman_proxy_content', :git => 'https://github.com/theforeman/puppet-foreman_proxy_content'
 mod 'katello/certs',                 :git => 'https://github.com/theforeman/puppet-certs'
-mod 'katello/katello',               :git => 'https://github.com/theforeman/puppet-katello'
+mod 'katello/katello',               :git => 'https://github.com/ekohl/puppet-katello', branch: 'globals'
diff --git a/config/katello-answers.yaml b/config/katello-answers.yaml
index 4dee1e37..b48f4680 100644
--- a/config/katello-answers.yaml
+++ b/config/katello-answers.yaml
@@ -10,6 +10,11 @@
 certs:
   group: foreman
 katello: true
+global: true
+application: true
+pulp: true
+candlepin: true
+qpid: true
 foreman:
   initial_organization: Default Organization
   initial_location: Default Location
diff --git a/config/katello.yaml b/config/katello.yaml
index ba3d1ee0..81f16cab 100644
--- a/config/katello.yaml
+++ b/config/katello.yaml
@@ -26,5 +26,23 @@
 # If using the Debian ruby-kafo package, uncomment this
 # :kafo_modules_dir: /usr/lib/ruby/vendor_ruby/kafo/modules
 
-# Unused, but remains present for older config migrations
-:mapping: {}
+:mapping:
+  :global:
+    :dir_name: 'katello'
+    :manifest_name: 'globals'
+  :pulp:
+    :dir_name: 'katello'
+    :manifest_name: 'pulp'
+    :params_name: 'params'
+  :candlepin:
+    :dir_name: 'katello'
+    :manifest_name: 'candlepin'
+    :params_name: 'params'
+  :qpid:
+    :dir_name: 'katello'
+    :manifest_name: 'qpid'
+    :params_name: 'params'
+  :application:
+    :dir_name: 'katello'
+    :manifest_name: 'application'
+    :params_name: 'params'