diff --git a/invenio.cfg b/invenio.cfg
index 0b6936c7..6d297d5f 100644
--- a/invenio.cfg
+++ b/invenio.cfg
@@ -42,7 +42,7 @@ from invenio_rdm_records.services.components import DefaultRecordsComponents
 from invenio_oauthclient.views.client import auto_redirect_login
 
 from invenio_communities.communities.services import facets as community_facets
-from zenodo_rdm.custom_fields import CUSTOM_FIELDS_UI, CUSTOM_FIELDS, CUSTOM_FIELDS_FACETS, NAMESPACES, COMMUNITY_NAMESPACES,COMMUNITY_FIELDS, COMMUNITY_FIELDS_UI
+from zenodo_rdm.custom_fields import CUSTOM_FIELDS_UI, CUSTOM_FIELDS, CUSTOM_FIELDS_FACETS, NAMESPACES, COMMUNITY_FIELDS, COMMUNITY_FIELDS_UI
 from zenodo_rdm.views import frontpage_view_function
 from zenodo_rdm.permissions import ZenodoCommunityPermissionPolicy, ZenodoRDMRecordPermissionPolicy
 from zenodo_rdm.api import ZenodoRDMRecord, ZenodoRDMDraft
@@ -645,8 +645,6 @@ COMMUNITIES_CUSTOM_FIELDS_UI = COMMUNITY_FIELDS_UI
 
 COMMUNITIES_CUSTOM_FIELDS = COMMUNITY_FIELDS
 
-COMMUNITIES_NAMESPACES = COMMUNITY_NAMESPACES
-
 # Invenio-Communities
 # ==============
 COMMUNITIES_GROUPS_ENABLED = False
diff --git a/site/zenodo_rdm/custom_fields/__init__.py b/site/zenodo_rdm/custom_fields/__init__.py
index 84d9f559..692daeca 100644
--- a/site/zenodo_rdm/custom_fields/__init__.py
+++ b/site/zenodo_rdm/custom_fields/__init__.py
@@ -34,11 +34,7 @@
     THESIS_NAMESPACE,
 )
 
-from .community_fields import (
-    COMMUNITY_FIELDS,
-    COMMUNITY_FIELDS_UI,
-    COMMUNITY_NAMESPACES,
-)
+from .community_fields import COMMUNITY_FIELDS, COMMUNITY_FIELDS_UI
 from .domain_fields import (
     AUDIOVIS_FIELDS,
     AUDIOVIS_FIELDS_UI,
diff --git a/site/zenodo_rdm/custom_fields/community_fields.py b/site/zenodo_rdm/custom_fields/community_fields.py
index d70c0a2e..ac614219 100644
--- a/site/zenodo_rdm/custom_fields/community_fields.py
+++ b/site/zenodo_rdm/custom_fields/community_fields.py
@@ -14,18 +14,20 @@
         "section": _("Subjects"),
         "fields": [
             dict(
-                field="es:subjects",
-                ui_widget="AutocompleteDropdown",
+                field="subjects",
+                ui_widget="SubjectAutocompleteDropdown",
                 props=dict(
                     label="Keywords and subjects",
                     icon="tag",
                     description="The subjects related to the community",
                     placeholder="Search for a subject by name e.g. Psychology ...",
-                    autocompleteFrom="/api/vocabularies/languages",
+                    autocompleteFrom="api/subjects",
+                    noQueryMessage="Search for subjects...",
                     autocompleteFromAcceptHeader="application/vnd.inveniordm.v1+json",
                     required=False,
                     multiple=True,
                     clearable=True,
+                    allowAdditions=False,
                 ),
             )
         ],
@@ -34,15 +36,9 @@
 
 
 COMMUNITY_FIELDS = {
-    VocabularyCF(
-        name="es:subjects",
-        vocabulary_id="es:subjects",
+    SubjectCF(
+        name="subjects",
         multiple=True,
         dump_options=False,
     )
 }
-
-
-COMMUNITY_NAMESPACES = {
-    "es": "https://op.europa.eu/en/web/eu-vocabularies/dataset/-/resource?uri=http://publications.europa.eu/resource/dataset/euroscivoc",
-}