diff --git a/typo3/sysext/form/Configuration/Yaml/FormElements/CountrySelect.yaml b/typo3/sysext/form/Configuration/Yaml/FormElements/CountrySelect.yaml
index 48504648c904e45865336bcc64b140f69a9b9a90..c010375b4c0794fef0fcc435c41219dbc8297edd 100644
--- a/typo3/sysext/form/Configuration/Yaml/FormElements/CountrySelect.yaml
+++ b/typo3/sysext/form/Configuration/Yaml/FormElements/CountrySelect.yaml
@@ -124,7 +124,7 @@ prototypes:
             condition: 'getRootFormProperty("renderingOptions.templateVariant") == "version2"'
             properties:
               containerClassAttribute: 'form-element form-element-select mb-3'
-              elementClassAttribute: form-control
+              elementClassAttribute: form-select
               elementErrorClassAttribute: ~
               labelClassAttribute: form-label
     formEditor:
diff --git a/typo3/sysext/form/Configuration/Yaml/FormElements/MultiSelect.yaml b/typo3/sysext/form/Configuration/Yaml/FormElements/MultiSelect.yaml
index 538e48c6e3f852029d62e0c3c3f0166853e19f98..11b0e7838beaeef15e341e10087f838b6661a802 100644
--- a/typo3/sysext/form/Configuration/Yaml/FormElements/MultiSelect.yaml
+++ b/typo3/sysext/form/Configuration/Yaml/FormElements/MultiSelect.yaml
@@ -172,7 +172,7 @@ prototypes:
             condition: 'getRootFormProperty("renderingOptions.templateVariant") == "version2"'
             properties:
               containerClassAttribute: 'form-element form-element-multiselect mb-3'
-              elementClassAttribute: 'form-control xlarge'
+              elementClassAttribute: 'form-select xlarge'
               elementErrorClassAttribute: ~
               labelClassAttribute: form-label
     formEditor:
diff --git a/typo3/sysext/form/Configuration/Yaml/FormElements/SingleSelect.yaml b/typo3/sysext/form/Configuration/Yaml/FormElements/SingleSelect.yaml
index 062cb33d0b28d25c609c5480493b90db14a0c543..da10f603e11a37a6f12b879db53bc1673a801244 100644
--- a/typo3/sysext/form/Configuration/Yaml/FormElements/SingleSelect.yaml
+++ b/typo3/sysext/form/Configuration/Yaml/FormElements/SingleSelect.yaml
@@ -135,7 +135,7 @@ prototypes:
             condition: 'getRootFormProperty("renderingOptions.templateVariant") == "version2"'
             properties:
               containerClassAttribute: 'form-element form-element-select mb-3'
-              elementClassAttribute: form-control
+              elementClassAttribute: form-select
               elementErrorClassAttribute: ~
               labelClassAttribute: form-label
     formEditor: