diff --git a/core/includes/form.inc b/core/includes/form.inc
index 4f353d0088..c3e6035e1c 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -293,28 +293,6 @@ function template_preprocess_radios(&$variables) {
   $variables['children'] = $element['#children'];
 }
 
-/**
- * Prepares variables for checkboxes templates.
- *
- * Default template: checkboxes.html.twig.
- *
- * @param array $variables
- *   An associative array containing:
- *   - element: An associative array containing the properties of the element.
- *     Properties used: #children, #attributes.
- */
-function template_preprocess_checkboxes(&$variables) {
-  $element = $variables['element'];
-  $variables['attributes'] = [];
-  if (isset($element['#id'])) {
-    $variables['attributes']['id'] = $element['#id'];
-  }
-  if (isset($element['#attributes']['title'])) {
-    $variables['attributes']['title'] = $element['#attributes']['title'];
-  }
-  $variables['children'] = $element['#children'];
-}
-
 /**
  * Prepares variables for vertical tabs templates.
  *
diff --git a/core/lib/Drupal/Core/Render/Element/Checkboxes.php b/core/lib/Drupal/Core/Render/Element/Checkboxes.php
index 726a53591e..8ad185eb32 100644
--- a/core/lib/Drupal/Core/Render/Element/Checkboxes.php
+++ b/core/lib/Drupal/Core/Render/Element/Checkboxes.php
@@ -51,7 +51,11 @@ public function getInfo() {
       '#pre_render' => [
         [$class, 'preRenderCompositeFormElement'],
       ],
-      '#theme_wrappers' => ['checkboxes'],
+      '#theme_wrappers' => [
+        'container' => [
+          '#attributes' => ['class' => ['form-checkbox']],
+        ],
+      ],
     ];
   }
 
diff --git a/core/modules/system/templates/checkboxes.html.twig b/core/modules/system/templates/checkboxes.html.twig
deleted file mode 100644
index 19209d90fb..0000000000
--- a/core/modules/system/templates/checkboxes.html.twig
+++ /dev/null
@@ -1,17 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for a 'checkboxes' #type form element.
- *
- * Available variables
- * - attributes: A list of HTML attributes for the wrapper element.
- * - children: The rendered checkboxes.
- *
- * @see template_preprocess_checkboxes()
- *
- * @ingroup themeable
- */
- @todo: remove this file once https://www.drupal.org/node/1819284 is resolved.
- This is identical to core/modules/system/templates/container.html.twig
-#}
-<div{{ attributes.addClass('form-checkboxes') }}>{{ children }}</div>
diff --git a/core/themes/claro/templates/form/checkboxes.html.twig b/core/themes/claro/templates/form/checkboxes.html.twig
deleted file mode 100644
index b7bbb9148f..0000000000
--- a/core/themes/claro/templates/form/checkboxes.html.twig
+++ /dev/null
@@ -1,15 +0,0 @@
-{#
-/**
- * @file
- * Theme override for a 'checkboxes' #type form element.
- *
- * Available variables
- * - attributes: A list of HTML attributes for the wrapper element.
- * - children: The rendered checkboxes.
- *
- * @see template_preprocess_checkboxes()
- */
- @todo: remove this file once https://www.drupal.org/node/1819284 is resolved.
- This is identical to core/modules/system/templates/container.html.twig
-#}
-<div{{ attributes.addClass('form-checkboxes','form-boolean-group') }}>{{ children }}</div>
diff --git a/core/themes/olivero/olivero.theme b/core/themes/olivero/olivero.theme
index 37b29a915b..be16b7f2f7 100644
--- a/core/themes/olivero/olivero.theme
+++ b/core/themes/olivero/olivero.theme
@@ -344,7 +344,7 @@ function olivero_preprocess_select(&$variables) {
 /**
  * Implements hook_preprocess_HOOK().
  */
-function olivero_preprocess_checkboxes(&$variables) {
+function olivero_preprocess_container__checkboxes(&$variables) {
   $variables['attributes']['class'][] = 'form-boolean-group';
 }
 
diff --git a/core/themes/stable9/templates/form/checkboxes.html.twig b/core/themes/stable9/templates/form/checkboxes.html.twig
deleted file mode 100644
index 9199f7e4c4..0000000000
--- a/core/themes/stable9/templates/form/checkboxes.html.twig
+++ /dev/null
@@ -1,15 +0,0 @@
-{#
-/**
- * @file
- * Theme override for a 'checkboxes' #type form element.
- *
- * Available variables
- * - attributes: A list of HTML attributes for the wrapper element.
- * - children: The rendered checkboxes.
- *
- * @see template_preprocess_checkboxes()
- */
- @todo: remove this file once https://www.drupal.org/node/1819284 is resolved.
- This is identical to core/modules/system/templates/container.html.twig
-#}
-<div{{ attributes.addClass('form-checkboxes') }}>{{ children }}</div>
diff --git a/core/themes/starterkit_theme/templates/form/checkboxes.html.twig b/core/themes/starterkit_theme/templates/form/checkboxes.html.twig
deleted file mode 100644
index 9199f7e4c4..0000000000
--- a/core/themes/starterkit_theme/templates/form/checkboxes.html.twig
+++ /dev/null
@@ -1,15 +0,0 @@
-{#
-/**
- * @file
- * Theme override for a 'checkboxes' #type form element.
- *
- * Available variables
- * - attributes: A list of HTML attributes for the wrapper element.
- * - children: The rendered checkboxes.
- *
- * @see template_preprocess_checkboxes()
- */
- @todo: remove this file once https://www.drupal.org/node/1819284 is resolved.
- This is identical to core/modules/system/templates/container.html.twig
-#}
-<div{{ attributes.addClass('form-checkboxes') }}>{{ children }}</div>