diff --git a/Gemfile b/Gemfile
index 5b6eb29..bcd9ea9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-plugin "bundler-multilock", "1.1.2"
+plugin "bundler-multilock", "1.2.0"
 return unless Plugin.installed?("bundler-multilock")
 
 Plugin.send(:load_plugin, "bundler-multilock")
@@ -11,21 +11,17 @@ gemspec
 
 lockfile "activerecord-6.1" do
   gem "activerecord", "~> 6.1.0"
-  gem "activerecord-pg-extensions", "~> 0.4"
-  gem "activesupport", "~> 6.1.0"
+  gem "activerecord-pg-extensions", "~> 0.4.4"
   gem "railties", "~> 6.1.0"
 end
 
 lockfile "activerecord-7.0" do
   gem "activerecord", "~> 7.0.0"
-  gem "activerecord-pg-extensions", "~> 0.5"
-  gem "activesupport", "~> 7.0.0"
   gem "railties", "~> 7.0.0"
 end
 
-lockfile "activerecord-7.1" do
+lockfile do
   gem "activerecord", "~> 7.1.0"
   gem "activerecord-pg-extensions", "~> 0.5"
-  gem "activesupport", "~> 7.1.0"
   gem "railties", "~> 7.1.0"
 end
diff --git a/Gemfile.activerecord-6.1.lock b/Gemfile.activerecord-6.1.lock
index dbf813c..02d7f87 100644
--- a/Gemfile.activerecord-6.1.lock
+++ b/Gemfile.activerecord-6.1.lock
@@ -204,8 +204,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 6.1.0)
-  activerecord-pg-extensions (~> 0.4)
-  activesupport (~> 6.1.0)
+  activerecord-pg-extensions (~> 0.4.4)
   bundler
   byebug
   diplomat (~> 2.5.1)
diff --git a/Gemfile.activerecord-7.0.lock b/Gemfile.activerecord-7.0.lock
index f67dd1e..af6e79a 100644
--- a/Gemfile.activerecord-7.0.lock
+++ b/Gemfile.activerecord-7.0.lock
@@ -28,9 +28,9 @@ GEM
     activerecord (7.0.8)
       activemodel (= 7.0.8)
       activesupport (= 7.0.8)
-    activerecord-pg-extensions (0.5.3)
-      activerecord (~> 7.0.0)
-      railties (~> 7.0.0)
+    activerecord-pg-extensions (0.5.4)
+      activerecord (>= 7.0, < 7.2)
+      railties (>= 7.0, < 7.2)
     activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
@@ -204,8 +204,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 7.0.0)
-  activerecord-pg-extensions (~> 0.5)
-  activesupport (~> 7.0.0)
   bundler
   byebug
   diplomat (~> 2.5.1)
diff --git a/Gemfile.activerecord-7.1.lock b/Gemfile.activerecord-7.1.lock
deleted file mode 100644
index 11018de..0000000
--- a/Gemfile.activerecord-7.1.lock
+++ /dev/null
@@ -1,259 +0,0 @@
-PATH
-  remote: .
-  specs:
-    switchman-inst-jobs (4.0.15)
-      inst-jobs (>= 2.4.9, < 4.0)
-      parallel (>= 1.19)
-      railties (>= 6.1, < 7.2)
-      switchman (~> 3.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (7.1.0)
-      actionview (= 7.1.0)
-      activesupport (= 7.1.0)
-      nokogiri (>= 1.8.5)
-      rack (>= 2.2.4)
-      rack-session (>= 1.0.1)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    actionview (7.1.0)
-      activesupport (= 7.1.0)
-      builder (~> 3.1)
-      erubi (~> 1.11)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    activemodel (7.1.0)
-      activesupport (= 7.1.0)
-    activerecord (7.1.0)
-      activemodel (= 7.1.0)
-      activesupport (= 7.1.0)
-      timeout (>= 0.4.0)
-    activerecord-pg-extensions (0.5.4)
-      activerecord (>= 7.0, < 7.2)
-      railties (>= 7.0, < 7.2)
-    activesupport (7.1.0)
-      base64
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    after_transaction_commit (2.2.2)
-      activerecord (>= 5.2)
-    ast (2.4.2)
-    base64 (0.1.1)
-    bigdecimal (3.1.4)
-    builder (3.2.4)
-    byebug (11.1.3)
-    coderay (1.1.3)
-    concurrent-ruby (1.2.2)
-    connection_pool (2.4.1)
-    crass (1.0.6)
-    debug_inspector (1.1.0)
-    deep_merge (1.2.2)
-    diff-lcs (1.5.0)
-    diplomat (2.5.1)
-      deep_merge (~> 1.2)
-      faraday (>= 0.9)
-    docile (1.4.0)
-    drb (2.1.1)
-      ruby2_keywords
-    erubi (1.12.0)
-    et-orbi (1.2.7)
-      tzinfo
-    faraday (2.7.4)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
-    fugit (1.8.1)
-      et-orbi (~> 1, >= 1.2.7)
-      raabro (~> 1.4)
-    guardrail (3.0.3)
-      activerecord (>= 6.1, < 7.2)
-      railties (>= 6.1, < 7.2)
-    i18n (1.14.1)
-      concurrent-ruby (~> 1.0)
-    inst-jobs (3.1.13)
-      activerecord (>= 6.0)
-      activerecord-pg-extensions (~> 0.4)
-      activesupport (>= 6.0)
-      after_transaction_commit (>= 1.0, < 3)
-      debug_inspector (~> 1.0)
-      fugit (~> 1.3)
-      railties (>= 6.0)
-    io-console (0.6.0)
-    irb (1.8.1)
-      rdoc
-      reline (>= 0.3.8)
-    json (2.6.3)
-    language_server-protocol (3.17.0.3)
-    loofah (2.21.3)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    method_source (1.0.0)
-    minitest (5.20.0)
-    mutex_m (0.1.2)
-    newrelic_rpm (9.2.2)
-    nokogiri (1.15.4-aarch64-linux)
-      racc (~> 1.4)
-    nokogiri (1.15.4-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
-      racc (~> 1.4)
-    parallel (1.23.0)
-    parser (3.2.2.3)
-      ast (~> 2.4.1)
-      racc
-    pg (1.5.3)
-    pry (0.14.2)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    psych (5.1.0)
-      stringio
-    raabro (1.4.0)
-    racc (1.7.1)
-    rack (2.2.8)
-    rack-session (1.0.1)
-      rack (< 3)
-    rack-test (2.1.0)
-      rack (>= 1.3)
-    rackup (1.0.0)
-      rack (< 3)
-      webrick
-    rails-dom-testing (2.2.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
-      loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    railties (7.1.0)
-      actionpack (= 7.1.0)
-      activesupport (= 7.1.0)
-      irb
-      rackup (>= 1.0.0)
-      rake (>= 12.2)
-      thor (~> 1.0, >= 1.2.2)
-      zeitwerk (~> 2.6)
-    rainbow (3.1.1)
-    rake (13.0.6)
-    rdoc (6.5.0)
-      psych (>= 4.0.0)
-    regexp_parser (2.8.1)
-    reline (0.3.9)
-      io-console (~> 0.5)
-    rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-rails (5.1.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      railties (>= 5.2)
-      rspec-core (~> 3.10)
-      rspec-expectations (~> 3.10)
-      rspec-mocks (~> 3.10)
-      rspec-support (~> 3.10)
-    rspec-support (3.12.0)
-    rubocop (1.56.3)
-      base64 (~> 0.1.1)
-      json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
-      parallel (~> 1.10)
-      parser (>= 3.2.2.3)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.18.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.23.1)
-      rubocop (~> 1.33)
-    rubocop-inst (1.0.2)
-      rubocop (~> 1.50)
-      rubocop-performance (~> 1.17)
-    rubocop-performance (1.19.0)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.21.0)
-      activesupport (>= 4.2.0)
-      rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
-    rubocop-rspec (2.24.0)
-      rubocop (~> 1.33)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-    ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.4)
-    stringio (3.0.8)
-    switchman (3.5.13)
-      activerecord (>= 6.1.4, < 7.2)
-      guardrail (~> 3.0.1)
-      parallel (~> 1.22)
-      railties (>= 6.1, < 7.2)
-    thor (1.2.2)
-    timeout (0.4.0)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
-    webrick (1.8.1)
-    zeitwerk (2.6.12)
-
-PLATFORMS
-  aarch64-linux
-  arm64-darwin
-  x86_64-darwin
-  x86_64-linux
-
-DEPENDENCIES
-  activerecord (~> 7.1.0)
-  activerecord-pg-extensions (~> 0.5)
-  activesupport (~> 7.1.0)
-  bundler
-  byebug
-  diplomat (~> 2.5.1)
-  newrelic_rpm
-  pg (~> 1.0)
-  pry (~> 0)
-  railties (~> 7.1.0)
-  rake (~> 13)
-  rspec (~> 3.10)
-  rspec-rails (~> 5.0)
-  rubocop-inst (~> 1)
-  rubocop-rails (~> 2.10)
-  rubocop-rake (~> 0.6)
-  rubocop-rspec (~> 2.4)
-  simplecov (~> 0.21)
-  switchman-inst-jobs!
-
-BUNDLED WITH
-   2.4.19
diff --git a/Gemfile.lock b/Gemfile.lock
index 7990e92..549634e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,40 +10,50 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.8)
-      actionview (= 7.0.8)
-      activesupport (= 7.0.8)
-      rack (~> 2.0, >= 2.2.4)
+    actionpack (7.1.0)
+      actionview (= 7.1.0)
+      activesupport (= 7.1.0)
+      nokogiri (>= 1.8.5)
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.8)
-      activesupport (= 7.0.8)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actionview (7.1.0)
+      activesupport (= 7.1.0)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (7.0.8)
-      activesupport (= 7.0.8)
-    activerecord (7.0.8)
-      activemodel (= 7.0.8)
-      activesupport (= 7.0.8)
-    activerecord-pg-extensions (0.5.3)
-      activerecord (~> 7.0.0)
-      railties (~> 7.0.0)
-    activesupport (7.0.8)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activemodel (7.1.0)
+      activesupport (= 7.1.0)
+    activerecord (7.1.0)
+      activemodel (= 7.1.0)
+      activesupport (= 7.1.0)
+      timeout (>= 0.4.0)
+    activerecord-pg-extensions (0.5.4)
+      activerecord (>= 7.0, < 7.2)
+      railties (>= 7.0, < 7.2)
+    activesupport (7.1.0)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     after_transaction_commit (2.2.2)
       activerecord (>= 5.2)
     ast (2.4.2)
     base64 (0.1.1)
+    bigdecimal (3.1.4)
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     crass (1.0.6)
     debug_inspector (1.1.0)
     deep_merge (1.2.2)
@@ -52,6 +62,8 @@ GEM
       deep_merge (~> 1.2)
       faraday (>= 0.9)
     docile (1.4.0)
+    drb (2.1.1)
+      ruby2_keywords
     erubi (1.12.0)
     et-orbi (1.2.7)
       tzinfo
@@ -75,6 +87,10 @@ GEM
       debug_inspector (~> 1.0)
       fugit (~> 1.3)
       railties (>= 6.0)
+    io-console (0.6.0)
+    irb (1.8.1)
+      rdoc
+      reline (>= 0.3.8)
     json (2.6.3)
     language_server-protocol (3.17.0.3)
     loofah (2.21.3)
@@ -82,6 +98,7 @@ GEM
       nokogiri (>= 1.12.0)
     method_source (1.0.0)
     minitest (5.20.0)
+    mutex_m (0.1.2)
     newrelic_rpm (9.2.2)
     nokogiri (1.15.4-aarch64-linux)
       racc (~> 1.4)
@@ -99,11 +116,18 @@ GEM
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    psych (5.1.0)
+      stringio
     raabro (1.4.0)
     racc (1.7.1)
     rack (2.2.8)
+    rack-session (1.0.1)
+      rack (< 3)
     rack-test (2.1.0)
       rack (>= 1.3)
+    rackup (1.0.0)
+      rack (< 3)
+      webrick
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -111,16 +135,21 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.0.8)
-      actionpack (= 7.0.8)
-      activesupport (= 7.0.8)
-      method_source
+    railties (7.1.0)
+      actionpack (= 7.1.0)
+      activesupport (= 7.1.0)
+      irb
+      rackup (>= 1.0.0)
       rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.0.6)
+    rdoc (6.5.0)
+      psych (>= 4.0.0)
     regexp_parser (2.8.1)
+    reline (0.3.9)
+      io-console (~> 0.5)
     rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -185,15 +214,18 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
+    stringio (3.0.8)
     switchman (3.5.13)
       activerecord (>= 6.1.4, < 7.2)
       guardrail (~> 3.0.1)
       parallel (~> 1.22)
       railties (>= 6.1, < 7.2)
     thor (1.2.2)
+    timeout (0.4.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.2)
+    webrick (1.8.1)
     zeitwerk (2.6.12)
 
 PLATFORMS
@@ -203,12 +235,15 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  activerecord (~> 7.1.0)
+  activerecord-pg-extensions (~> 0.5)
   bundler
   byebug
   diplomat (~> 2.5.1)
   newrelic_rpm
   pg (~> 1.0)
   pry (~> 0)
+  railties (~> 7.1.0)
   rake (~> 13)
   rspec (~> 3.10)
   rspec-rails (~> 5.0)
diff --git a/Jenkinsfile b/Jenkinsfile
index 20f7977..536de58 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,8 +18,8 @@ pipeline {
             values '2.7', '3.0', '3.1', '3.2'
           }
           axis {
-            name 'RAILS_VERSION'
-            values '6.1', '7.0', '7.1'
+            name 'LOCKFILE'
+            values 'activerecord-6.1', 'activerecord-7.0', 'Gemfile.lock'
           }
         }
         stages {
@@ -28,8 +28,8 @@ pipeline {
               // Allow postgres to initialize while the build runs
               sh 'docker-compose up -d postgres'
               sh "docker-compose build --pull --build-arg RUBY_VERSION=${RUBY_VERSION} --build-arg app"
-              sh "BUNDLE_LOCKFILE=activerecord-${RAILS_VERSION} docker-compose run --rm app bundle exec rake db:drop db:create db:migrate"
-              sh "BUNDLE_LOCKFILE=activerecord-${RAILS_VERSION} docker-compose run --rm app bundle exec rake"
+              sh "BUNDLE_LOCKFILE=${LOCKFILE} docker-compose run --rm app bundle exec rake db:drop db:create db:migrate"
+              sh "BUNDLE_LOCKFILE=${LOCKFILE} docker-compose run --rm app bundle exec rake"
             }
           }
         }