diff --git a/app/views/admin/application_settings/_repository_mirrors_form.html.haml b/app/views/admin/application_settings/_repository_mirrors_form.html.haml
index 09183ec62609ebabf7c18a0083b656210dbb451f..9d05a5aa234e01fdf16c85fb720bc8e36fc62560 100644
--- a/app/views/admin/application_settings/_repository_mirrors_form.html.haml
+++ b/app/views/admin/application_settings/_repository_mirrors_form.html.haml
@@ -5,7 +5,7 @@
     .form-group
       = f.label :mirror_available, 'Enable mirror configuration', class: 'control-label col-sm-2'
       .col-sm-10
-        .checkbox
+        .form-check
           = f.label :mirror_available do
             = f.check_box :mirror_available
             Allow mirrors to be setup for projects
diff --git a/app/views/admin/application_settings/_terms.html.haml b/app/views/admin/application_settings/_terms.html.haml
index 724246ab7e7faba109eaafb19c1381b911d99c4b..32b060972ece73e7648c3794cca332f09892aae1 100644
--- a/app/views/admin/application_settings/_terms.html.haml
+++ b/app/views/admin/application_settings/_terms.html.haml
@@ -4,7 +4,7 @@
   %fieldset
     .form-group
       .col-sm-12
-        .checkbox
+        .form-check
           = f.label :enforce_terms do
             = f.check_box :enforce_terms
             = _("Require all users to accept Terms of Service when they access GitLab.")
diff --git a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
index 8cb6c446e18887e952b69c954c5782985370f449..988bcfb526572270ad4bce259800f6b6d2668753 100644
--- a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
+++ b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml
@@ -10,21 +10,21 @@
             %p.settings-message.text-center
               = message.html_safe
           = f.fields_for :auto_devops_attributes, @auto_devops do |form|
-            .radio
+            .form-check
               = form.label :enabled_true do
                 = form.radio_button :enabled, 'true'
                 %strong= s_('CICD|Enable Auto DevOps')
                 %br
                 = s_('CICD|The Auto DevOps pipeline configuration will be used when there is no %{ci_file} in the project.').html_safe % { ci_file: ci_file_formatted }
 
-            .radio
+            .form-check
               = form.label :enabled_false do
                 = form.radio_button :enabled, 'false'
                 %strong= s_('CICD|Disable Auto DevOps')
                 %br
                 = s_('CICD|An explicit %{ci_file} needs to be specified before you can begin using Continuous Integration and Delivery.').html_safe % { ci_file: ci_file_formatted }
 
-            .radio
+            .form-check
               = form.label :enabled_ do
                 = form.radio_button :enabled, ''
                 %strong= s_('CICD|Instance default (%{state})') % { state: "#{Gitlab::CurrentSettings.auto_devops_enabled? ? _('enabled') : _('disabled')}" }