diff --git a/Gemfile b/Gemfile
index 6e8a83dea..61369ea5e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,7 @@ gem 'devise', '~> 4.9.4'
 gem 'dotenv-rails', '~> 3.1'
 gem 'factory_bot_rails', '~> 6.4.4'
 gem 'faker',                  '~> 3.5.1'
-gem 'govuk_design_system_formbuilder', '~> 5.7'
+gem 'govuk_design_system_formbuilder', '~> 5.8'
 gem 'govuk_notify_rails', '~> 3.0.0'
 gem 'grape', '~> 2.2.0'
 gem 'grape-entity',           '~> 1.0.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index fb7e583c0..99a3605de 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -273,7 +273,7 @@ GEM
       raabro (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    govuk_design_system_formbuilder (5.7.1)
+    govuk_design_system_formbuilder (5.8.0)
       actionview (>= 6.1)
       activemodel (>= 6.1)
       activesupport (>= 6.1)
@@ -713,7 +713,7 @@ DEPENDENCIES
   faker (~> 3.5.1)
   faraday (~> 2.12)
   faraday-follow_redirects (~> 0.3)
-  govuk_design_system_formbuilder (~> 5.7)
+  govuk_design_system_formbuilder (~> 5.8)
   govuk_notify_rails (~> 3.0.0)
   grape (~> 2.2.0)
   grape-entity (~> 1.0.1)