diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 78df10fa6..f60597738 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -165,6 +165,11 @@
     "mapped_ldap_groups": "Zugeordnete LDAP-Gruppen",
     "mapped_oidc_groups": "Zugeordnete OpenID Connect-Gruppen",
     "mapped_teams": "Zugeordnete Teams",
+    "match_mode": {
+      "and": "Stimmen Sie sowohl den Namespace als auch den Namen an",
+      "label": "Komponentenanpassungsmodus",
+      "or": "Stimmen Sie den Namespace oder den Namen überein"
+    },
     "maven": "Maven",
     "members": "Mitglieder",
     "mime_type": "Mime Typ",
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 2582ce737..ca9a1ed5c 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -165,6 +165,11 @@
     "mapped_ldap_groups": "Mapped LDAP groups",
     "mapped_oidc_groups": "Mapped OpenID Connect Groups",
     "mapped_teams": "Mapped Teams",
+    "match_mode": {
+      "and": "Match both namespace AND name",
+      "label": "Component matching mode",
+      "or": "Match namespace OR name"
+    },
     "maven": "Maven",
     "members": "Members",
     "mime_type": "Mime type",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 0826dca08..09ea429a8 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -165,6 +165,11 @@
     "mapped_ldap_groups": "Grupos LDAP asignados",
     "mapped_oidc_groups": "Grupos de OpenID Connect asignados",
     "mapped_teams": "Equipos mapeados",
+    "match_mode": {
+      "and": "Coincidir con el espacio de nombres y el nombre",
+      "label": "Modo de coincidencia de componentes",
+      "or": "Espacio de nombres o nombre de coincidencia"
+    },
     "maven": "Maven",
     "members": "Miembros",
     "mime_type": "Tipo de Mimica",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index f314c2b7e..9c9f8ea2a 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -165,6 +165,11 @@
     "mapped_ldap_groups": "Groupes LDAP associés",
     "mapped_oidc_groups": "Groupes OpenID Connect associés",
     "mapped_teams": "Équipes associées",
+    "match_mode": {
+      "and": "Faire correspondre à la fois l'espace de noms et le nom",
+      "label": "Mode de correspondance des composants",
+      "or": "Correspondre à l'espace de noms ou au nom"
+    },
     "maven": "Maven",
     "members": "Membres",
     "mime_type": "Type MIME",
diff --git a/src/i18n/locales/hi.json b/src/i18n/locales/hi.json
index aa8b3dd12..cdbf41e21 100644
--- a/src/i18n/locales/hi.json
+++ b/src/i18n/locales/hi.json
@@ -165,6 +165,11 @@
     "mapped_ldap_groups": "मैप किए गए LDAP समूह",
     "mapped_oidc_groups": "मैप किए गए OpenID कनेक्ट समूह",
     "mapped_teams": "मैप की गई टीमें",
+    "match_mode": {
+      "and": "नामस्थान और नाम दोनों का मिलान करें",
+      "label": "घटक मिलान विधा",
+      "or": "नेमस्पेस या नाम का मिलान करें"
+    },
     "maven": "मावेन",
     "members": "सदस्यों",
     "mime_type": "माइम प्रकार",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 84d3cf6e6..7578e88af 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -165,6 +165,11 @@
     "mapped_ldap_groups": "Gruppi LDAP mappati",
     "mapped_oidc_groups": "Gruppi OpenID Connect mappati",
     "mapped_teams": "Squadre mappate",
+    "match_mode": {
+      "and": "Abbinare sia lo spazio dei nomi che il nome",
+      "label": "Modalità di corrispondenza componente",
+      "or": "Abbina lo spazio dei nomi o il nome"
+    },
     "maven": "Esperto di",
     "members": "Membri",
     "mime_type": "Tipo mimo",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 8268a2cac..130d57e88 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -165,6 +165,11 @@
     "mapped_ldap_groups": "マッピングされたLDAPグループ",
     "mapped_oidc_groups": "マッピングされた OpenID Connect グループ",
     "mapped_teams": "マッピングされたチーム",
+    "match_mode": {
+      "and": "名前空間と名前の両方を一致させます",
+      "label": "コンポーネントマッチングモード",
+      "or": "名前空間または名前を一致させます"
+    },
     "maven": "Maven",
     "members": "メンバー",
     "mime_type": "MIMEタイプ",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index e98c1b516..42e6c37ee 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -165,6 +165,11 @@
     "mapped_ldap_groups": "Mapowane grupy LDAP",
     "mapped_oidc_groups": "Mapowane grupy połączeń OpenID",
     "mapped_teams": "Mapowane zespoły",
+    "match_mode": {
+      "and": "Dopasuj zarówno przestrzeń nazw, jak i nazwę",
+      "label": "Tryb dopasowywania komponentów",
+      "or": "Dopasuj przestrzeń nazw lub nazwę"
+    },
     "maven": "Mavena",
     "members": "Członkowie",
     "mime_type": "Typ mima",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 0dcc6dab0..94617ee14 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -165,6 +165,11 @@
     "mapped_ldap_groups": "Grupos LDAP mapeados",
     "mapped_oidc_groups": "Grupos OpenID Connect mapeados",
     "mapped_teams": "Equipes mapeadas",
+    "match_mode": {
+      "and": "Combine o espaço para nome e o nome",
+      "label": "Modo de correspondência de componentes",
+      "or": "Combinar namespace ou nome"
+    },
     "maven": "Maven",
     "members": "Membros",
     "mime_type": "Tipo Mime",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 07d4eff35..592c66244 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -165,6 +165,11 @@
     "mapped_ldap_groups": "Grupos LDAP mapeados",
     "mapped_oidc_groups": "Grupos OpenID Connect mapeados",
     "mapped_teams": "Equipes mapeadas",
+    "match_mode": {
+      "and": "Combine o espaço para nome e o nome",
+      "label": "Modo de correspondência de componentes",
+      "or": "Combinar namespace ou nome"
+    },
     "maven": "Maven",
     "members": "Membros",
     "mime_type": "Tipo Mime",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 367bd4056..bb86d4080 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -165,6 +165,11 @@
     "mapped_ldap_groups": "Сопоставленные группы LDAP",
     "mapped_oidc_groups": "Сопоставленные группы OpenID Connect",
     "mapped_teams": "Сопоставленные команды",
+    "match_mode": {
+      "and": "Сопоставьте пространство имен и имя",
+      "label": "Режим сопоставления компонентов",
+      "or": "Сопоставьте пространство имен или имя"
+    },
     "maven": "Maven",
     "members": "Участники",
     "mime_type": "Тип MIME",
diff --git a/src/i18n/locales/uk-UA.json b/src/i18n/locales/uk-UA.json
index 663b4fa5c..d5c158f6a 100644
--- a/src/i18n/locales/uk-UA.json
+++ b/src/i18n/locales/uk-UA.json
@@ -165,6 +165,11 @@
     "mapped_ldap_groups": "Зіставлені групи LDAP",
     "mapped_oidc_groups": "Зіставлені групи OpenID Connect",
     "mapped_teams": "Зіставлені команди",
+    "match_mode": {
+      "and": "Відповідати як простору імен, так і імені",
+      "label": "Режим відповідності компонентів",
+      "or": "Простір імен відповідності"
+    },
     "maven": "Maven",
     "members": "Учасники",
     "mime_type": "Тип MIME",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index 69ddea501..f612fc73b 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -165,6 +165,11 @@
     "mapped_ldap_groups": "映射 LDAP 组",
     "mapped_oidc_groups": "映射的 OpenID 连接组",
     "mapped_teams": "映射团队",
+    "match_mode": {
+      "and": "匹配命名空间和名称",
+      "label": "元件匹配方式",
+      "or": "匹配命名空间或名称"
+    },
     "maven": "Maven",
     "members": "成员",
     "mime_type": "Mime 类型",
diff --git a/src/views/administration/configuration/InternalComponents.vue b/src/views/administration/configuration/InternalComponents.vue
index 74832bc0b..58e7949b4 100644
--- a/src/views/administration/configuration/InternalComponents.vue
+++ b/src/views/administration/configuration/InternalComponents.vue
@@ -4,14 +4,6 @@
       <p>
         {{ $t('admin.internal_component_desc') }}
       </p>
-      <b-validated-input-group-form-input
-        id="internalComponentsConfigGroupsRegex"
-        :label="$t('admin.namespace_regex')"
-        input-group-size="mb-3"
-        type="text"
-        v-model="namespaceRegex"
-        :tooltip="$t('admin.namespace_regex_desc')"
-      />
       <b-validated-input-group-form-input
         id="internalComponentsConfigNamesRegex"
         :label="$t('admin.name_regex')"
@@ -20,6 +12,25 @@
         v-model="nameRegex"
         :tooltip="$t('admin.name_regex_desc')"
       />
+      <b-validated-input-group-form-input
+        id="internalComponentsConfigGroupsRegex"
+        :label="$t('admin.namespace_regex')"
+        input-group-size="mb-3"
+        type="text"
+        v-model="namespaceRegex"
+        :tooltip="$t('admin.namespace_regex_desc')"
+      />
+      <b-form-group
+        :label="$t('admin.match_mode.label')"
+        label-for="internalComponentsConfigMatchMode"
+        class="mb-3"
+      >
+        <b-form-select
+          id="internalComponentsConfigMatchMode"
+          v-model="matchMode"
+          :options="matchModeOptions"
+        />
+      </b-form-group>
     </b-card-body>
     <b-card-footer>
       <b-button variant="outline-primary" class="px-4" @click="saveChanges">{{
@@ -53,8 +64,17 @@ export default {
     return {
       namespaceRegex: '',
       nameRegex: '',
+      matchMode: 'OR',
     };
   },
+  computed: {
+    matchModeOptions() {
+      return [
+        { value: 'OR', text: this.$t('admin.match_mode.or') },
+        { value: 'AND', text: this.$t('admin.match_mode.and') },
+      ];
+    },
+  },
   methods: {
     saveChanges: function () {
       this.updateConfigProperties([
@@ -68,6 +88,11 @@ export default {
           propertyName: 'names.regex',
           propertyValue: this.nameRegex,
         },
+        {
+          groupName: 'internal-components',
+          propertyName: 'match-mode',
+          propertyValue: this.matchMode,
+        },
       ]);
     },
     identifyInternalComponents: function () {
@@ -93,6 +118,9 @@ export default {
           case 'groups.regex':
             this.namespaceRegex = item.propertyValue;
             break;
+          case 'match-mode':
+            this.matchMode = item.propertyValue || 'OR';
+            break;
           case 'names.regex':
             this.nameRegex = item.propertyValue;
             break;