diff --git a/.gitignore b/.gitignore
index d3bc276056..912cc91a15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+*.swp
+*~
 *.pyc
+applytest
 doc/html/
 manifests/secrets.pp
diff --git a/install_modules.sh b/install_modules.sh
index 7f7ad45027..6fde1aa0b9 100644
--- a/install_modules.sh
+++ b/install_modules.sh
@@ -26,36 +26,17 @@ if ! puppet help module >/dev/null 2>&1 ; then
     apt-get install -y -o Dpkg::Options::="--force-confold" puppet facter
 fi
 
-MODULES="puppetlabs-apt puppetlabs-mysql puppetlabs-dashboard"
+MODULES="puppetlabs-apt puppetlabs-mysql openstackci-dashboard openstackci-vcsrepo"
 MODULE_LIST=`puppet module list`
 
+# Transition away from old things
+if [ -d /etc/puppet/modules/vcsrepo/.git ] ; then
+    rm -rf /etc/puppet/modules/vcsrepo
+fi
+
 for MOD in $MODULES ; do
   if ! echo $MODULE_LIST | grep $MOD >/dev/null 2>&1 ; then
     # This will get run in cron, so silence non-error output
-    puppet module install $MOD >/dev/null
+    puppet module install --force $MOD >/dev/null
   fi
 done
-
-# Install vcsrepo from git
-clone_git git://github.com/openstack-ci/puppet-vcsrepo.git vcsrepo 44eb9ad8
-
-# Fix a problem with the released verison of the dashboard module
-if grep scope.lookupvar ${MODULE_PATH}/dashboard/templates/passenger-vhost.erb | grep dashboard_port >/dev/null 2>&1 ; then
-
-  cd ${MODULE_PATH}/dashboard
-  echo | patch -p1 <<'EOD'
-diff --git a/templates/passenger-vhost.erb b/templates/passenger-vhost.erb
-index a2f6d16..de7dd0a 100644
---- a/templates/passenger-vhost.erb
-+++ b/templates/passenger-vhost.erb
-@@ -1,6 +1,6 @@
--Listen <%= scope.lookupvar("dashboard::params::dashboard_port") %>
-+Listen <%= dashboard_port %>
- 
--<VirtualHost *:<%= scope.lookupvar("dashboard::params::dashboard_port") %>>
-+<VirtualHost *:<%= dashboard_port %>>
-   ServerName <%= name %>
-   DocumentRoot <%= docroot %>
-   RailsBaseURI <%= rails_base_uri %>
-EOD
-fi
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index a3246c8684..a8e9543bb0 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -193,6 +193,33 @@
       - pypi-jobs
 
 
+- project:
+    name: puppet-apparmor
+    github-org: openstack-ci
+    node: precise
+
+    jobs:
+      - gate-{name}-merge
+
+
+- project:
+    name: puppet-dashboard
+    github-org: openstack-ci
+    node: precise
+
+    jobs:
+      - gate-{name}-merge
+
+
+- project:
+    name: puppet-vcsrepo
+    github-org: openstack-ci
+    node: precise
+
+    jobs:
+      - gate-{name}-merge
+
+
 - project:
     name: pypi-mirror
     github-org: openstack-ci
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index 64a41531aa..7bd1d3b37a 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -29,6 +29,15 @@
 - project: openstack-ci/meetbot
   options:
   - close-pull
+- project: openstack-ci/puppet-apparmor
+  options:
+  - close-pull
+- project: openstack-ci/puppet-dashboard
+  options:
+  - close-pull
+- project: openstack-ci/puppet-vcsrepo
+  options:
+  - close-pull
 - project: openstack-ci/pypi-mirror
   options:
   - close-pull
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 310c8523e0..daccf278e3 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -143,6 +143,24 @@ projects:
       - gate-ci-puppet-merge:
         - gate-ci-puppet-syntax
 
+  - name: openstack-ci/puppet-apparmor
+    check:
+      - gate-puppet-apparmor-merge
+    gate:
+      - gate-puppet-apparmor-merge
+
+  - name: openstack-ci/puppet-dashboard
+    check:
+      - gate-puppet-dashboard-merge
+    gate:
+      - gate-puppet-dashboard-merge
+
+  - name: openstack-ci/puppet-vcsrepo
+    check:
+      - gate-puppet-vcsrepo-merge
+    gate:
+      - gate-puppet-vcsrepo-merge
+
   - name: openstack/cinder
     check:
       - gate-cinder-merge: