diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cf3d6628..fa92ea98 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,7 +15,8 @@ jobs:
           - 2.5
           - 2.6
           - 2.7
-          - 3.0
+          - '3.0'
+          - 3.1
         exclude:
           - ruby: 2.5
             gemfile: gemfiles/Gemfile-rails-main
@@ -29,6 +30,12 @@ jobs:
             gemfile: gemfiles/Gemfile-rails-5-2
           - ruby: 3.0
             gemfile: gemfiles/Gemfile-rails-5-2
+          - ruby: 3.1
+            gemfile: gemfiles/Gemfile-rails-5-2
+          - ruby: 3.1
+            gemfile: gemfiles/Gemfile-rails-6-0
+          - ruby: 3.1
+            gemfile: gemfiles/Gemfile-rails-6-1
     runs-on: ubuntu-latest
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3da5ae32..526c8995 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## Unreleased
 
-* Add support for Rails 7.0 rc (no changes required)
+* Add support for Rails 7.0 (no changes required)
 
 ## 5.1.0
 
diff --git a/Gemfile b/Gemfile
index 0664866b..eac9a4dd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'country_select'
-gem 'activemodel', '~> 7.0.0.rc1'
-gem 'actionpack', '~> 7.0.0.rc1'
-gem 'railties', '~> 7.0.0.rc1'
+gem 'activemodel', '~> 7.0.0'
+gem 'actionpack', '~> 7.0.0'
+gem 'railties', '~> 7.0.0'
 gem 'rake'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5abf3fcb..543c35e5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,47 +8,48 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.0.rc1)
-      actionview (= 7.0.0.rc1)
-      activesupport (= 7.0.0.rc1)
+    actionpack (7.0.2.2)
+      actionview (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.0.rc1)
-      activesupport (= 7.0.0.rc1)
+    actionview (7.0.2.2)
+      activesupport (= 7.0.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (7.0.0.rc1)
-      activesupport (= 7.0.0.rc1)
-    activesupport (7.0.0.rc1)
+    activemodel (7.0.2.2)
+      activesupport (= 7.0.2.2)
+    activesupport (7.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     builder (3.2.4)
     concurrent-ruby (1.1.9)
-    countries (4.1.1)
-      i18n_data (~> 0.13.1)
+    countries (4.2.2)
+      i18n_data (~> 0.15.0)
       sixarm_ruby_unaccent (~> 1.1)
-    country_select (6.0.0)
-      countries (~> 4.0)
+    country_select (6.1.1)
+      countries (~> 4.2)
       sort_alphabetical (~> 1.1)
     crass (1.0.6)
     erubi (1.10.0)
-    i18n (1.8.11)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    i18n_data (0.13.1)
-    loofah (2.12.0)
+    i18n_data (0.15.0)
+      simple_po_parser (~> 1.1)
+    loofah (2.14.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mini_portile2 (2.6.1)
-    minitest (5.14.4)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     racc (1.6.0)
     rack (2.2.3)
@@ -59,31 +60,32 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (7.0.0.rc1)
-      actionpack (= 7.0.0.rc1)
-      activesupport (= 7.0.0.rc1)
+    railties (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rake (13.0.6)
+    simple_po_parser (1.1.5)
     sixarm_ruby_unaccent (1.2.0)
     sort_alphabetical (1.1.0)
       unicode_utils (>= 1.2.2)
-    thor (1.1.0)
+    thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode_utils (1.4.0)
-    zeitwerk (2.5.1)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (~> 7.0.0.rc1)
-  activemodel (~> 7.0.0.rc1)
+  actionpack (~> 7.0.0)
+  activemodel (~> 7.0.0)
   country_select
-  railties (~> 7.0.0.rc1)
+  railties (~> 7.0.0)
   rake
   simple_form!