diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 73431cd8..3c238552 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -8,6 +8,11 @@ jobs:
       matrix:
         ruby: ["3.0", "3.1", "3.2", "3.3"]
         db: [sqlite, mysql, postgres]
+        exclude:
+          - ruby: "3.2"
+            db: sqlite
+          - ruby: "3.2"
+            db: postgres
 
     steps:
       - uses: actions/checkout@v1
diff --git a/Dockerfile b/Dockerfile
index cbac9f7a..f1f6d7cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.0
+FROM ruby:3.1
 
 # throw errors if Gemfile has been modified since Gemfile.lock
 RUN bundle config --global frozen 1
@@ -13,7 +13,7 @@ RUN bundle install --jobs 4
 
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-RUN apt-get update && apt-get install -y yarn netcat
+RUN apt-get update && apt-get install -y yarn netcat-openbsd
 
 RUN mkdir /app/log
 
diff --git a/Dockerfile-3.1 b/Dockerfile-3.0
similarity index 98%
rename from Dockerfile-3.1
rename to Dockerfile-3.0
index 13ee22a2..534d5c92 100644
--- a/Dockerfile-3.1
+++ b/Dockerfile-3.0
@@ -1,4 +1,4 @@
-FROM ruby:3.1
+FROM ruby:3.0
 
 # throw errors if Gemfile has been modified since Gemfile.lock
 RUN bundle config --global frozen 1
diff --git a/test-envs/docker-compose-3.0-mysql.yml b/test-envs/docker-compose-3.0-mysql.yml
index 67e67f17..2cd0413f 100644
--- a/test-envs/docker-compose-3.0-mysql.yml
+++ b/test-envs/docker-compose-3.0-mysql.yml
@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile-3.0
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
diff --git a/test-envs/docker-compose-3.0-postgres.yml b/test-envs/docker-compose-3.0-postgres.yml
index a66d41b2..0c6d9b03 100644
--- a/test-envs/docker-compose-3.0-postgres.yml
+++ b/test-envs/docker-compose-3.0-postgres.yml
@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile-3.0
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
diff --git a/test-envs/docker-compose-3.0-sqlite.yml b/test-envs/docker-compose-3.0-sqlite.yml
index 4fd50bd5..ba4d3709 100644
--- a/test-envs/docker-compose-3.0-sqlite.yml
+++ b/test-envs/docker-compose-3.0-sqlite.yml
@@ -3,7 +3,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile-3.0
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
diff --git a/test-envs/docker-compose-3.1-mysql.yml b/test-envs/docker-compose-3.1-mysql.yml
index 03f609e5..67e67f17 100644
--- a/test-envs/docker-compose-3.1-mysql.yml
+++ b/test-envs/docker-compose-3.1-mysql.yml
@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile-3.1
+      dockerfile: Dockerfile
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
diff --git a/test-envs/docker-compose-3.1-postgres.yml b/test-envs/docker-compose-3.1-postgres.yml
index 8c826727..a66d41b2 100644
--- a/test-envs/docker-compose-3.1-postgres.yml
+++ b/test-envs/docker-compose-3.1-postgres.yml
@@ -10,7 +10,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile-3.1
+      dockerfile: Dockerfile
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV
diff --git a/test-envs/docker-compose-3.1-sqlite.yml b/test-envs/docker-compose-3.1-sqlite.yml
index 925c1bc3..4fd50bd5 100644
--- a/test-envs/docker-compose-3.1-sqlite.yml
+++ b/test-envs/docker-compose-3.1-sqlite.yml
@@ -3,7 +3,7 @@ services:
   web:
     build:
       context: ..
-      dockerfile: Dockerfile-3.1
+      dockerfile: Dockerfile
     environment:
       # These are set in script/ci-build, so we need to pass-thru them.
       RAILS_ENV: $RAILS_ENV