diff --git a/features/setup/multirepository/multirepository_elastic.feature b/features/setup/multirepository/multirepository_elastic.feature
index 805d683..ace20d8 100644
--- a/features/setup/multirepository/multirepository_elastic.feature
+++ b/features/setup/multirepository/multirepository_elastic.feature
@@ -1,6 +1,6 @@
 Feature: Multirepository setup for testing with Elastic
 
-  @multirepository @IbexaContent @IbexaExperience @IbexaCommerce
+  @multirepository @elastic
   Scenario: Set up new connection and make the default one unaccessible
     Given I append configuration to "parameters" in "config/packages/ibexa_elasticsearch.yaml"
     """
diff --git a/features/setup/multirepository/multirepository_solr.feature b/features/setup/multirepository/multirepository_solr.feature
index 2c7539d..f42c721 100644
--- a/features/setup/multirepository/multirepository_solr.feature
+++ b/features/setup/multirepository/multirepository_solr.feature
@@ -1,6 +1,6 @@
 Feature: Multirepository setup for testing with Solr
 
-  @multirepository
+  @multirepository @solr
   Scenario: Set up new connection and make the default one unaccessible
     Given I append configuration to "parameters" in "config/packages/ibexa_solr.yaml"
     """