diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 67085db6..13035a10 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby: 
-          - 2.7
+          - 3.1
         postgres_image:
           - postgis/postgis:12-3.3
     services:
@@ -53,7 +53,7 @@ jobs:
           sudo apt-get -y install libgeos-dev
       - name: Install gems
         run: |
-          gem install bundler -v 1.17.3
+          gem install bundler -v 2.3
           bundle config path vendor/bundle
           bundle config without 'javascript_testing'
           bundle config with 'docker'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25eff0a9..48294f89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,7 +28,7 @@ In this case you can simply pull down the version you want, and run `docker-comp
   - **Important** Users who use the docker-compose file will need to either: 
     - dump the database first and then reload because this involves a database version upgrade
     - switch the postgres image back to mdillon/postgis:9.5. This is not recommended because postgres v9.5 is no longer supported.
-
+- Using ruby 3.1 as base
 
 ## [5.4.1] - 2021-10-10
 
diff --git a/Dockerfile b/Dockerfile
index 5b429856..a0befb22 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.7
+FROM ruby:3.1
 LABEL maintainer="Max Burnette <mburnet2@illinois.edu>, Rob Kooper <kooper@illinois.edu>"
 
 # arguments that are added at the bottom of BETY
@@ -35,7 +35,7 @@ RUN apt-get update \
         curl \
         git \
         libgeos-dev \
-        netcat \
+        netcat-openbsd \
         nodejs \
         postgresql-client \
     && rm -rf /var/lib/apt/lists/* \
@@ -47,7 +47,7 @@ WORKDIR /home/bety
 
 # install gems (allowing for caching)
 COPY --chown=bety /Gemfile* /home/bety/
-RUN gem install bundler -v 1.17.3 \
+RUN gem install bundler -v 2.3 \
     && bundle config path vendor/bundle \
     && bundle config without 'test development production debug javascript_testing' \
     && bundle config with 'docker' \
diff --git a/Gemfile.lock b/Gemfile.lock
index 1ace07c6..5c473b90 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -55,11 +55,12 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     apipie-rails (0.5.6)
       rails (>= 4.1)
     arel (9.0.0)
+    base64 (0.2.0)
     bootstrap-will_paginate (1.0.0)
       will_paginate
     builder (3.3.0)
@@ -74,7 +75,6 @@ GEM
     capybara-webkit (1.15.1)
       capybara (>= 2.3, < 4.0)
       json
-    childprocess (3.0.0)
     choice (0.1.6)
     coderay (1.1.3)
     coffee-rails (5.0.0)
@@ -88,36 +88,43 @@ GEM
       activesupport (>= 4.2.0, < 6.1)
     concurrent-ruby (1.3.3)
     crass (1.0.6)
-    database_cleaner (2.0.1)
-      database_cleaner-active_record (~> 2.0.0)
-    database_cleaner-active_record (2.0.1)
+    database_cleaner (2.0.2)
+      database_cleaner-active_record (>= 2, < 3)
+    database_cleaner-active_record (2.2.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    diff-lcs (1.4.4)
-    dynamic_form (1.1.4)
+    date (3.3.4)
+    diff-lcs (1.5.1)
+    dynamic_form (1.3.1)
+      actionview (> 5.2.0)
+      activemodel (> 5.2.0)
     erubi (1.13.0)
-    execjs (2.8.1)
-    ffi (1.15.4)
-    globalid (0.5.2)
+    execjs (2.9.1)
+    ffi (1.17.0)
+    globalid (1.1.0)
       activesupport (>= 5.0)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    jquery-rails (4.4.0)
+    jquery-rails (4.6.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (7.0.0)
       railties (>= 3.2.16)
-    json (2.5.1)
-    json-schema (2.8.1)
-      addressable (>= 2.4)
+    json (2.7.2)
+    json-schema (4.3.1)
+      addressable (>= 2.8)
     kgio (2.11.4)
+    logger (1.6.0)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    mail (2.7.1)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     memoist (0.16.2)
@@ -125,33 +132,42 @@ GEM
     mimemagic (0.3.10)
       nokogiri (~> 1)
       rake
-    mini_mime (1.1.1)
-    mini_portile2 (2.6.1)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.7)
     minitest (5.24.1)
     multi_json (1.15.0)
     mustache (1.1.1)
     narray (0.6.0.4)
-    nio4r (2.5.8)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    net-imap (0.4.14)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.0)
+      net-protocol
+    nio4r (2.7.3)
+    nokogiri (1.16.6)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    optimist (3.0.1)
-    passenger (6.0.11)
+    optimist (3.1.0)
+    passenger (6.0.22)
       rack
       rake (>= 0.8.1)
-    pg (1.2.3)
-    protected_attributes_continued (1.8.2)
+    pg (1.5.6)
+    protected_attributes_continued (1.9.0)
       activemodel (>= 5.0)
-    pry (0.13.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.10.1)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
-    pry-rails (0.3.9)
-      pry (>= 0.10.4)
-    public_suffix (4.0.6)
-    rabl (0.14.5)
+      pry (>= 0.13, < 0.15)
+    pry-rails (0.3.11)
+      pry (>= 0.13.0)
+    public_suffix (6.0.0)
+    rabl (0.16.1)
       activesupport (>= 2.3.14)
     racc (1.8.0)
     rack (2.2.9)
@@ -179,8 +195,9 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     rails3-restful-authentication (3.0.1)
     railties (5.2.4.6)
       actionpack (= 5.2.4.6)
@@ -188,11 +205,13 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
-    raindrops (0.19.2)
+    raindrops (0.20.1)
     rake (13.2.1)
     recaptcha (4.8.0)
       json
-    rgeo (2.3.0)
+    rexml (3.3.1)
+      strscan
+    rgeo (3.0.1)
     rgeo-activerecord (6.2.2)
       activerecord (>= 5.0)
       rgeo (>= 1.0.0)
@@ -236,30 +255,36 @@ GEM
       sprockets-rails
       tilt
     seer (0.10.0)
-    selenium-webdriver (3.142.7)
-      childprocess (>= 0.5, < 4.0)
-      rubyzip (>= 1.2.2)
-    sprockets (4.0.2)
+    selenium-webdriver (4.22.0)
+      base64 (~> 0.2)
+      logger (~> 1.4)
+      rexml (~> 3.2, >= 3.2.5)
+      rubyzip (>= 1.2.2, < 3.0)
+      websocket (~> 1.0)
+    sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
+    strscan (3.1.0)
     thor (1.3.1)
     thread_safe (0.3.6)
-    tilt (2.0.10)
-    tzinfo (1.2.10)
+    tilt (2.4.0)
+    timeout (0.4.1)
+    tzinfo (1.2.11)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    unicorn (6.0.0)
+    unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
-    websocket-driver (0.7.5)
+    websocket (1.2.11)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    will_paginate (3.3.1)
+    will_paginate (4.0.1)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yajl-ruby (1.4.3)
@@ -319,4 +344,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.17.3
+   2.3.27