diff --git a/app/views/layouts/steps.html.erb b/app/views/layouts/steps.html.erb
index 5b8bd3b122..127b44fa2f 100644
--- a/app/views/layouts/steps.html.erb
+++ b/app/views/layouts/steps.html.erb
@@ -2,6 +2,7 @@
<%= render "sections/head" %>
<%= body_tag do %>
+ <%= render "sections/govuk_javascript" %>
<%= render HeaderComponent.new(breadcrumbs: true) %>
<%= main_tag do %>
diff --git a/app/views/layouts/teaching_event.html.erb b/app/views/layouts/teaching_event.html.erb
index bf48eaed9b..6811a8b681 100644
--- a/app/views/layouts/teaching_event.html.erb
+++ b/app/views/layouts/teaching_event.html.erb
@@ -2,6 +2,7 @@
<%= render "sections/head" %>
<%= body_tag do %>
+ <%= render "sections/govuk_javascript" %>
<%= render HeaderComponent.new(breadcrumbs: true) %>
<%= main_tag do %>
diff --git a/app/views/layouts/teaching_events.html.erb b/app/views/layouts/teaching_events.html.erb
index b47f516290..557876a286 100644
--- a/app/views/layouts/teaching_events.html.erb
+++ b/app/views/layouts/teaching_events.html.erb
@@ -2,6 +2,7 @@
<%= render "sections/head" %>
<%= body_tag do %>
+ <%= render "sections/govuk_javascript" %>
<%= render HeaderComponent.new %>
<%= main_tag do %>
diff --git a/app/views/layouts/welcome.html.erb b/app/views/layouts/welcome.html.erb
index 5761d08b4e..b3ca588e44 100644
--- a/app/views/layouts/welcome.html.erb
+++ b/app/views/layouts/welcome.html.erb
@@ -2,6 +2,7 @@
<%= render "sections/head" %>
<%= body_tag do %>
+ <%= render "sections/govuk_javascript" %>
<%= render(partial: "sections/content_errors") %>
<%= render HeaderComponent.new %>
diff --git a/app/views/mailing_list/steps/_postcode.html.erb b/app/views/mailing_list/steps/_postcode.html.erb
index f74937eef5..aea657917d 100644
--- a/app/views/mailing_list/steps/_postcode.html.erb
+++ b/app/views/mailing_list/steps/_postcode.html.erb
@@ -9,7 +9,7 @@
If you give us your postcode, we'll let you know about events happening near you.
<% end %> -
+
What if I do not have a UK postcode?
diff --git a/app/views/sections/_govuk_javascript.html.erb b/app/views/sections/_govuk_javascript.html.erb
new file mode 100644
index 0000000000..e300ddc169
--- /dev/null
+++ b/app/views/sections/_govuk_javascript.html.erb
@@ -0,0 +1 @@
+
diff --git a/app/views/sections/_head.html.erb b/app/views/sections/_head.html.erb
index 0eff5288f3..a1e131b86c 100644
--- a/app/views/sections/_head.html.erb
+++ b/app/views/sections/_head.html.erb
@@ -13,8 +13,9 @@
<% if Rails.env.test? && params.key?(:fake_browser_time) %>
<% js_packs.unshift('fake_browser_time') %>
<% end %>
- <%= javascript_pack_tag *js_packs, 'data-turbolinks-track': 'reload', data:
+ <%= javascript_pack_tag *js_packs, type: 'module', data:
{
+ "turbolinks-track": 'reload',
"sentry-dsn": sentry_dsn,
"sentry-environment": Rails.env,
"gtm-id": ENV["GTM_ID"],
diff --git a/app/views/teacher_training_adviser/steps/_gcse_maths_english.html.erb b/app/views/teacher_training_adviser/steps/_gcse_maths_english.html.erb
index bd143eed1d..f31603505b 100644
--- a/app/views/teacher_training_adviser/steps/_gcse_maths_english.html.erb
+++ b/app/views/teacher_training_adviser/steps/_gcse_maths_english.html.erb
@@ -2,7 +2,7 @@
<%= f.govuk_collection_radio_buttons :has_gcse_maths_and_english_id, f.object.class::OPTIONS, :last, nil, inline: true, legend: { tag: "h1" } %>
-