diff --git a/app/views/admin/dev_ops_report/_report.html.haml b/app/views/admin/dev_ops_report/_report.html.haml
index 7e464bcde3bf622c6c1cb6b2c55c8c6f0878f78c..444b1db1500924a25b27265367b62edb39cdb34a 100644
--- a/app/views/admin/dev_ops_report/_report.html.haml
+++ b/app/views/admin/dev_ops_report/_report.html.haml
@@ -1,20 +1,30 @@
-.devops
-  .devops-header
-    %h2.devops-header-title{ class: "devops-#{score_level(@metric.average_percentage_score)}-score" }
-      = number_to_percentage(@metric.average_percentage_score, precision: 1)
-    .devops-header-subtitle
-      = _('DevOps')
-      %br
-      = _('Score')
-      = link_to sprite_icon('question-o', css_class: 'devops-header-icon'), help_page_path('user/admin_area/analytics/dev_ops_report')
+- usage_ping_enabled = Gitlab::CurrentSettings.usage_ping_enabled
 
-  .devops-cards.board-card-container
-    - @metric.cards.each do |card|
-      = render 'card', card: card
+- if usage_ping_enabled && show_callout?('dev_ops_report_intro_callout_dismissed')
+  = render 'callout'
 
-  .devops-steps.d-none.d-lg-block
-    - @metric.idea_to_production_steps.each_with_index do |step, index|
-      .devops-step{ class: "devops-#{score_level(step.percentage_score)}-score" }
-        = custom_icon("i2p_step_#{index + 1}")
-        %h4.devops-step-title
-          = step.title
+- if !usage_ping_enabled
+  #js-devops-empty-state{ data: { is_admin: current_user&.admin.to_s, empty_state_svg_path: image_path('illustrations/convdev/convdev_no_index.svg'), enable_usage_ping_link: metrics_and_profiling_admin_application_settings_path(anchor: 'js-usage-settings'), docs_link: help_page_path('development/product_analytics/usage_ping') } }
+- elsif @metric.blank?
+  = render 'no_data'
+- else
+  .devops
+    .devops-header
+      %h2.devops-header-title{ class: "devops-#{score_level(@metric.average_percentage_score)}-score" }
+        = number_to_percentage(@metric.average_percentage_score, precision: 1)
+      .devops-header-subtitle
+        = _('DevOps')
+        %br
+        = _('Score')
+        = link_to sprite_icon('question-o', css_class: 'devops-header-icon'), help_page_path('user/admin_area/analytics/dev_ops_report')
+
+    .devops-cards.board-card-container
+      - @metric.cards.each do |card|
+        = render 'card', card: card
+
+    .devops-steps.d-none.d-lg-block
+      - @metric.idea_to_production_steps.each_with_index do |step, index|
+        .devops-step{ class: "devops-#{score_level(step.percentage_score)}-score" }
+          = custom_icon("i2p_step_#{index + 1}")
+          %h4.devops-step-title
+            = step.title
diff --git a/app/views/admin/dev_ops_report/show.html.haml b/app/views/admin/dev_ops_report/show.html.haml
index 2ebdadb99a60b1916d3b4e1bd9911143e336d4ce..3499b68ee1adf035325def8d4dd15480b469b6c6 100644
--- a/app/views/admin/dev_ops_report/show.html.haml
+++ b/app/views/admin/dev_ops_report/show.html.haml
@@ -1,15 +1,6 @@
 - page_title _('DevOps Report')
-- usage_ping_enabled = Gitlab::CurrentSettings.usage_ping_enabled
 - add_page_specific_style 'page_bundles/dev_ops_report'
 
 .container
-  - if usage_ping_enabled && show_callout?('dev_ops_report_intro_callout_dismissed')
-    = render 'callout'
-
   .gl-mt-3
-  - if !usage_ping_enabled
-    #js-devops-empty-state{ data: { is_admin: current_user&.admin.to_s, empty_state_svg_path: image_path('illustrations/convdev/convdev_no_index.svg'), enable_usage_ping_link: metrics_and_profiling_admin_application_settings_path(anchor: 'js-usage-settings'), docs_link: help_page_path('development/product_analytics/usage_ping') } }
-  - elsif @metric.blank?
-    = render 'no_data'
-  - else
     = render 'report'