diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 1f2bed1b52..800ce4c8b2 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -6,9 +6,9 @@
   <body class="govuk-template__body ">
     <%= render partial: "shared/analytics/google_noscript" %>
 
-    <script>
+    <%= nonced_javascript_tag do %>
       document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');
-    </script>
+    <% end %>
 
     <a href="#main-content" class="govuk-skip-link">Skip to main content</a>
 
diff --git a/app/views/layouts/api_docs.html.erb b/app/views/layouts/api_docs.html.erb
index 0f6b16183b..c34bea7842 100644
--- a/app/views/layouts/api_docs.html.erb
+++ b/app/views/layouts/api_docs.html.erb
@@ -11,9 +11,9 @@
     <%= render partial: "layouts/shared/govuk_javascript" %>
     <%= render partial: "shared/analytics/google_noscript" %>
 
-    <script>
+    <%= nonced_javascript_tag do %>
       document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');
-    </script>
+    <% end %>
 
     <a href="#main-content" class="govuk-skip-link">Skip to main content</a>
 
diff --git a/app/views/layouts/shared/_govuk_javascript.html.erb b/app/views/layouts/shared/_govuk_javascript.html.erb
index 0729a45f96..c14820a396 100644
--- a/app/views/layouts/shared/_govuk_javascript.html.erb
+++ b/app/views/layouts/shared/_govuk_javascript.html.erb
@@ -1,3 +1,3 @@
-<script nonce="<%= request.content_security_policy_nonce %>">
+<%= nonced_javascript_tag do %>
   document.body.className += ' js-enabled' + ('noModule' in HTMLScriptElement.prototype ? ' govuk-frontend-supported' : '');
-</script>
+<% end %>
diff --git a/app/views/layouts/shared/_head.html.erb b/app/views/layouts/shared/_head.html.erb
index b43f015e82..c2333a21fa 100644
--- a/app/views/layouts/shared/_head.html.erb
+++ b/app/views/layouts/shared/_head.html.erb
@@ -27,8 +27,8 @@
   <%= yield :head %>
 
   <% if Rails.env.development? %>
-    <script>
+    <%= nonced_javascript_tag do %>
       console.log(<%= session.to_json.html_safe %>)
-    </script>
+    <% end %>
   <% end %>
 </head>
