diff --git a/lib/generators/arclight/install_generator.rb b/lib/generators/arclight/install_generator.rb
index aa7b4dfce..3bacb7171 100644
--- a/lib/generators/arclight/install_generator.rb
+++ b/lib/generators/arclight/install_generator.rb
@@ -22,7 +22,7 @@ def include_arclight_solrdocument
     def install_blacklight_locale_picker
       gem 'blacklight-locale_picker'
 
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         run 'bundle install'
       end
 
diff --git a/template.rb b/template.rb
index f9d5a92cf..d5aa2668a 100644
--- a/template.rb
+++ b/template.rb
@@ -2,9 +2,9 @@
 
 gem 'arclight'
 
-run 'bundle install'
+after_bundle do
+  generate 'blacklight:install', '--devise'
+  generate 'arclight:install', '-f'
 
-generate 'blacklight:install', '--devise'
-generate 'arclight:install', '-f'
-
-rake 'db:migrate'
+  rake 'db:migrate'
+end