Index: ext/config/conf.d/puppetserver.conf
--- ext/config/conf.d/puppetserver.conf.orig
+++ ext/config/conf.d/puppetserver.conf
@@ -2,16 +2,16 @@
 jruby-puppet: {
     # Where the puppet-agent dependency places puppet, facter, etc...
     # Puppet server expects to load Puppet from this location
-    ruby-load-path: [/opt/puppetlabs/puppet/lib/ruby/vendor_ruby]
+    ruby-load-path: [ "" ]
 
     # This setting determines where JRuby will install gems.  It is used for loading gems,
     # and also by the `puppetserver gem` command line tool.
-    gem-home: /opt/puppetlabs/server/data/puppetserver/jruby-gems
+    gem-home: ${LOCALSTATEDIR}/puppetlabs/puppetserver/data/jruby-gems
 
     # This setting defines the complete "GEM_PATH" for jruby.  If set, it should include
     # the gem-home directory as well as any other directories that gems can be loaded
     # from (including the vendored gems directory for gems that ship with puppetserver)
-    gem-path: [${jruby-puppet.gem-home}, "/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems", "/opt/puppetlabs/puppet/lib/ruby/vendor_gems"]
+    gem-path: [${jruby-puppet.gem-home}]
 
     # PLEASE NOTE: Use caution when modifying the below settings. Modifying
     # these settings will change the value of the corresponding Puppet settings
@@ -34,7 +34,7 @@ jruby-puppet: {
 
     # (optional) path to puppet var dir; if not specified, will use
     # /opt/puppetlabs/server/data/puppetserver
-    server-var-dir: /opt/puppetlabs/server/data/puppetserver
+    server-var-dir: ${LOCALSTATEDIR}/puppetlabs/puppetserver/data
 
     # (optional) path to puppet run dir; if not specified, will use
     # /var/run/puppetlabs/puppetserver
