diff --git a/.gitignore b/.gitignore
index ab1b0ed3..f515d402 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,8 @@ rs/
 
 solar.log
 x-venv/
+.tmp/
+modules/
 
 celery*.pid
 celery*.log
diff --git a/main.yml b/main.yml
index 14158e8f..23a3ec1b 100644
--- a/main.yml
+++ b/main.yml
@@ -31,16 +31,16 @@
     - apt: name=puppet state=present
     - git: repo=https://github.com/CGenie/hiera-redis dest=/root/hiera-redis
     - shell: gem build hiera-redis.gemspec && gem install hiera-redis-3.0.0.gem chdir=/root/hiera-redis
+    - file: path=/etc/puppet/Puppetfile state=touch
     - template: src=/vagrant/hiera.yaml dest=/etc/puppet/hiera.yaml
     - file: path=/etc/puppet/hieradata state=directory
+    # Make paths puppet 4 compatible
     - file: path=/etc/puppetlabs/code/ state=directory
     - file: src=/etc/puppet/hiera.yaml dest=/etc/puppetlabs/code/hiera.yaml state=link
+    - file: src=/etc/puppet/hieradata dest=/etc/puppetlabs/code/hieradata state=link
+    - file: src=/etc/puppet/modules dest=/etc/puppetlabs/code/modules state=link
     - apt: name=ruby-dev state=present
-    - shell: gem install librarian-puppet
-    - file: path=/tmp/puppet-modules/modules state=directory
-    - file: path=/tmp/puppet-modules/Puppetfile state=touch
-    - file: path=/etc/puppet/modules state=absent
-    - file: src=/tmp/puppet-modules/modules dest=/etc/puppet/modules state=link
+    - shell: gem install librarian-puppet --no-ri --no-rdoc
 
       # Setup additional development tools
     - apt: name=vim state=present
diff --git a/resources/keystone_puppet/meta.yaml b/resources/keystone_puppet/meta.yaml
index e55a9055..8ee657ad 100644
--- a/resources/keystone_puppet/meta.yaml
+++ b/resources/keystone_puppet/meta.yaml
@@ -25,7 +25,7 @@ input:
 
     git:
       schema: {repository: str!, branch: str!}
-      value: {repository: 'https://github.com/openstack/puppet-keystone', branch: 'stable/juno'}
+      value: {repository: 'https://github.com/openstack/puppet-keystone', branch: '5.1.0'}
 
 #    forge:
 #      schema: str!
diff --git a/solar/solar/core/handlers/puppet.py b/solar/solar/core/handlers/puppet.py
index 34ef1229..a7f5e031 100644
--- a/solar/solar/core/handlers/puppet.py
+++ b/solar/solar/core/handlers/puppet.py
@@ -98,7 +98,7 @@ class LibrarianPuppet(ResourceSSHMixin):
 
         puppetlabs = self._ssh_command(
             self.resource,
-            'sudo', 'cat', '/tmp/puppet-modules/Puppetfile'
+            'sudo', 'cat', '/etc/puppet/Puppetfile'
         )
 
         git = self.resource.args['git'].value
@@ -134,14 +134,14 @@ class LibrarianPuppet(ResourceSSHMixin):
         self._scp_command(
             self.resource,
             '/tmp/Puppetfile',
-            '/tmp/puppet-modules/Puppetfile',
+            '/etc/puppet/Puppetfile',
             use_sudo=True
         )
 
         self._ssh_command(
             self.resource,
             'sudo', 'librarian-puppet', 'install',
-            cwd='/tmp/puppet-modules'
+            cwd='/etc/puppet'
         )