diff --git a/typo3/sysext/form/Configuration/Yaml/FormElements/CountrySelect.yaml b/typo3/sysext/form/Configuration/Yaml/FormElements/CountrySelect.yaml
index 105091b6aa4aaa096b7650220315bad3a7e0bdb6..3a915d8c58310769f86be85b40eeb93310488abf 100644
--- a/typo3/sysext/form/Configuration/Yaml/FormElements/CountrySelect.yaml
+++ b/typo3/sysext/form/Configuration/Yaml/FormElements/CountrySelect.yaml
@@ -105,7 +105,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 b207dc5378d3f19369e2e75e9ae434de8575f652..65682e4ed88d5ac0f31ba3b969131b7c4a04d61b 100644
--- a/typo3/sysext/form/Configuration/Yaml/FormElements/MultiSelect.yaml
+++ b/typo3/sysext/form/Configuration/Yaml/FormElements/MultiSelect.yaml
@@ -150,7 +150,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 b0cc59a5546efe9faa38df88e52283edb77689dd..f665034df0c17b77109cb8c17014ec6f709a89c8 100644
--- a/typo3/sysext/form/Configuration/Yaml/FormElements/SingleSelect.yaml
+++ b/typo3/sysext/form/Configuration/Yaml/FormElements/SingleSelect.yaml
@@ -104,7 +104,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: