diff --git a/Gemfile.lock b/Gemfile.lock
index f3ea32669..b7ad6b1d4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,7 @@
 GIT
   remote: https://github.com/basecamp/file_repository
   revision: 8c8d1594f3ec7e8c0938e6a7f7def521692344e4
+  ref: 8c8d1594f3ec7e8c0938e6a7f7def521692344e4
   specs:
     file_repository (1.4.6)
 
@@ -14,6 +15,7 @@ GIT
 GIT
   remote: https://github.com/basecamp/portfolio
   revision: 86411a53d19a42ce44705a50ebe7c22828597991
+  ref: 86411a53d19a42ce44705a50ebe7c22828597991
   specs:
     portfolio (5.2.0)
       activesupport
@@ -22,6 +24,7 @@ GIT
 GIT
   remote: https://github.com/basecamp/queenbee-plugin
   revision: eb01c697de1ad028afc65cc7d9b5345a7a8e849f
+  ref: eb01c697de1ad028afc65cc7d9b5345a7a8e849f
   specs:
     queenbee (3.2.0)
       activeresource
@@ -31,6 +34,7 @@ GIT
 GIT
   remote: https://github.com/basecamp/queuety
   revision: bf7e2a552fb674533d3e092f06dbf9b5d1ebc753
+  ref: bf7e2a552fb674533d3e092f06dbf9b5d1ebc753
   branch: rails4
   specs:
     queuety (4.0.2)
@@ -48,6 +52,7 @@ GIT
 GIT
   remote: https://github.com/basecamp/service_concurrency_prevention
   revision: 320da99431718615ed86f8723e8b9d3259c602a3
+  ref: 320da99431718615ed86f8723e8b9d3259c602a3
   specs:
     service_concurrency_prevention (1.1.1)
       activesupport
@@ -55,6 +60,7 @@ GIT
 GIT
   remote: https://github.com/basecamp/signal_id
   revision: d6c2a5ceed7bb57bf7dcdebdb439e7cd526fca09
+  ref: d6c2a5ceed7bb57bf7dcdebdb439e7cd526fca09
   branch: rails4
   specs:
     signal_id (4.3.2)
@@ -85,6 +91,7 @@ GIT
 GIT
   remote: https://github.com/jeremy/mysql2.git
   revision: b5766f5d296745d6aed014c8c0b7d82ef149ade1
+  ref: b5766f5d296745d6aed014c8c0b7d82ef149ade1
   branch: force_latin1_to_utf8
   specs:
     mysql2 (0.5.4.latin1utf8)
diff --git a/bin/setup b/bin/setup
index b1af0dc4c..6dcdd3881 100755
--- a/bin/setup
+++ b/bin/setup
@@ -4,6 +4,7 @@ def system!(*args) system(*args, exception: true) end
 
 puts "== Installing dependencies =="
 system("gem install bundler --conservative")
+system("bundle config set --local auto_install true")
 system("bundle check") || system!("bundle install")
 
 if ENV.fetch("SAAS_EXTENSION", "") != ""
diff --git a/gems/fizzy-saas/Gemfile b/gems/fizzy-saas/Gemfile
index 6eb0cfbd9..fb630c48a 100644
--- a/gems/fizzy-saas/Gemfile
+++ b/gems/fizzy-saas/Gemfile
@@ -3,11 +3,11 @@ git_source(:bc) { |repo| "https://github.com/basecamp/#{repo}" }
 
 # 37id and Queenbee integration
 need_signal_id = ENV.fetch("LOCAL_AUTHENTICATION", "") == ""
-gem "signal_id", bc: "signal_id", branch: "rails4", require: need_signal_id
-gem "mysql2", github: "jeremy/mysql2", branch: "force_latin1_to_utf8" # needed by signal_id
-gem "queuety", bc: "queuety", branch: "rails4" # needed by signal_id
-gem "service_concurrency_prevention", bc: "service_concurrency_prevention" # needed by queuety
-gem "portfolio", ">= 4.6", bc: "portfolio" # needed by signal_id
-gem "file_repository", "~> 1.4.5", bc: "file_repository" # needed by portfolio
-gem "queenbee", bc: "queenbee-plugin"
+gem "signal_id", bc: "signal_id", branch: "rails4", require: need_signal_id, ref: "d6c2a5ceed7bb57bf7dcdebdb439e7cd526fca09"
+gem "mysql2", github: "jeremy/mysql2", branch: "force_latin1_to_utf8", ref: "b5766f5d296745d6aed014c8c0b7d82ef149ade1" # needed by signal_id
+gem "queuety", bc: "queuety", branch: "rails4", ref: "bf7e2a552fb674533d3e092f06dbf9b5d1ebc753" # needed by signal_id
+gem "service_concurrency_prevention", bc: "service_concurrency_prevention", ref: "320da99431718615ed86f8723e8b9d3259c602a3" # needed by queuety
+gem "portfolio", ">= 4.6", bc: "portfolio", ref: "86411a53d19a42ce44705a50ebe7c22828597991" # needed by signal_id
+gem "file_repository", "~> 1.4.5", bc: "file_repository", ref: "8c8d1594f3ec7e8c0938e6a7f7def521692344e4" # needed by portfolio
+gem "queenbee", bc: "queenbee-plugin", ref: "eb01c697de1ad028afc65cc7d9b5345a7a8e849f"
 gem "activeresource", require: "active_resource" # needed by queenbee
diff --git a/gems/fizzy-saas/Gemfile.lock b/gems/fizzy-saas/Gemfile.lock
index cf142d1f4..f5c6c0ef5 100644
--- a/gems/fizzy-saas/Gemfile.lock
+++ b/gems/fizzy-saas/Gemfile.lock
@@ -1,12 +1,14 @@
 GIT
   remote: https://github.com/basecamp/file_repository
   revision: 8c8d1594f3ec7e8c0938e6a7f7def521692344e4
+  ref: 8c8d1594f3ec7e8c0938e6a7f7def521692344e4
   specs:
     file_repository (1.4.6)
 
 GIT
   remote: https://github.com/basecamp/portfolio
   revision: 86411a53d19a42ce44705a50ebe7c22828597991
+  ref: 86411a53d19a42ce44705a50ebe7c22828597991
   specs:
     portfolio (5.2.0)
       activesupport
@@ -15,6 +17,7 @@ GIT
 GIT
   remote: https://github.com/basecamp/queenbee-plugin
   revision: eb01c697de1ad028afc65cc7d9b5345a7a8e849f
+  ref: eb01c697de1ad028afc65cc7d9b5345a7a8e849f
   specs:
     queenbee (3.2.0)
       activeresource
@@ -24,23 +27,17 @@ GIT
 GIT
   remote: https://github.com/basecamp/queuety
   revision: bf7e2a552fb674533d3e092f06dbf9b5d1ebc753
+  ref: bf7e2a552fb674533d3e092f06dbf9b5d1ebc753
   branch: rails4
   specs:
     queuety (4.0.2)
       activerecord
       service_concurrency_prevention
 
-GIT
-  remote: https://github.com/basecamp/rails-structured-logging
-  revision: 76960cb5c15fc2b6b5f7542e05d7dcc031cef9e6
-  specs:
-    rails_structured_logging (0.2.1)
-      json
-      rails (>= 6.0.0)
-
 GIT
   remote: https://github.com/basecamp/service_concurrency_prevention
   revision: 320da99431718615ed86f8723e8b9d3259c602a3
+  ref: 320da99431718615ed86f8723e8b9d3259c602a3
   specs:
     service_concurrency_prevention (1.1.1)
       activesupport
@@ -48,6 +45,7 @@ GIT
 GIT
   remote: https://github.com/basecamp/signal_id
   revision: d6c2a5ceed7bb57bf7dcdebdb439e7cd526fca09
+  ref: d6c2a5ceed7bb57bf7dcdebdb439e7cd526fca09
   branch: rails4
   specs:
     signal_id (4.3.2)
@@ -64,6 +62,7 @@ GIT
 GIT
   remote: https://github.com/jeremy/mysql2.git
   revision: b5766f5d296745d6aed014c8c0b7d82ef149ade1
+  ref: b5766f5d296745d6aed014c8c0b7d82ef149ade1
   branch: force_latin1_to_utf8
   specs:
     mysql2 (0.5.4.latin1utf8)
@@ -175,7 +174,6 @@ GEM
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.13.2)
     jwt (3.1.2)
       base64
     logger (1.7.0)
@@ -307,7 +305,6 @@ DEPENDENCIES
   portfolio (>= 4.6)!
   queenbee!
   queuety!
-  rails_structured_logging!
   service_concurrency_prevention!
   signal_id!