diff --git a/app/views/foreman/smart_proxies/_content_tab.html.erb b/app/views/foreman/smart_proxies/_content_tab.html.erb
index c54de330c98..62c2b815079 100644
--- a/app/views/foreman/smart_proxies/_content_tab.html.erb
+++ b/app/views/foreman/smart_proxies/_content_tab.html.erb
@@ -1,3 +1,5 @@
-<%= javascript_include_tag *webpack_asset_paths('katello', extension: 'js') %>
+<% content_for(:javascripts) do -%>
+  <%= javascript_include_tag *webpack_asset_paths('katello', extension: 'js') %>
+<% end %>
 <% @smartProxyId= @smart_proxy.id %>
 <%= react_component('Content', smartProxyId: @smartProxyId, organizationId: Organization.current&.id,)  %>
diff --git a/app/views/overrides/activation_keys/_host_environment_select.html.erb b/app/views/overrides/activation_keys/_host_environment_select.html.erb
index a5da5a8e03b..63df7fb4283 100644
--- a/app/views/overrides/activation_keys/_host_environment_select.html.erb
+++ b/app/views/overrides/activation_keys/_host_environment_select.html.erb
@@ -1,5 +1,7 @@
 <% f ||= form %>
-<%= javascript "katello/hosts/host_and_hostgroup_edit" %>
+<% content_for(:javascripts) do -%>
+  <%= javascript "katello/hosts/host_and_hostgroup_edit" %>
+<% end %>
 <style>
     option.kt-env { margin-left: 0em; }
     option.kt-cv  { margin-left: 1em; }
diff --git a/app/views/overrides/activation_keys/_host_tab_pane.html.erb b/app/views/overrides/activation_keys/_host_tab_pane.html.erb
index 5910c6a4a8c..561c0ae1245 100644
--- a/app/views/overrides/activation_keys/_host_tab_pane.html.erb
+++ b/app/views/overrides/activation_keys/_host_tab_pane.html.erb
@@ -1,5 +1,6 @@
-
-<%= javascript "katello/hosts/activation_key_edit" %>
+<% content_for(:javascripts) do -%>
+  <%= javascript "katello/hosts/activation_key_edit" %>
+<% end %>
 
 
 <div class="tab-pane" id="activation_keys">
diff --git a/app/views/overrides/organizations/_edit_override.html.erb b/app/views/overrides/organizations/_edit_override.html.erb
index 68c1e9dabdf..add4985b132 100644
--- a/app/views/overrides/organizations/_edit_override.html.erb
+++ b/app/views/overrides/organizations/_edit_override.html.erb
@@ -1,7 +1,7 @@
 <% if @taxonomy.is_a?(Organization) %>
-
-  <%= javascript_include_tag 'katello/organizations/download_certificate' %>
-
+  <% content_for(:javascripts) do -%>
+    <%= javascript_include_tag 'katello/organizations/download_certificate' %>
+  <% end %>
   <%= text_f f, :label, :disabled => true, :class => 'input-xlarge' %>
   <%= selectable_f(f, :service_level, options_for_select(service_level_options, service_level_selected), {}, :label => _('Default System SLA')) %>