diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0e8d4d6b2..559aefbb0 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -110,7 +110,7 @@ jobs:
       run: bin/php-cs-fixer fix ${{ env.PLUGIN_DIR }} --config=.php-cs-fixer.php -v --dry-run --show-progress=dots --diff
 
     # - name: PHPSTAN - baseline (debug, enable if you need to regenerate baseline for all PHP versions)
-    #   run: bin/phpstan --configuration=plugins/CustomObjectsBundle/phpstan.neon --generate-baseline=var/logs/phpstan-baseline-${{ matrix.php-versions }}.neon --allow-empty-baseline 
+    #   run: bin/phpstan --configuration=${{ env.PLUGIN_DIR }}/phpstan.neon --generate-baseline=var/logs/phpstan-baseline-${{ matrix.php-versions }}.neon --allow-empty-baseline 
 
     - name: PHPSTAN
       run: bin/phpstan --configuration=${{ env.PLUGIN_DIR }}/phpstan.neon
diff --git a/phpstan-baseline-7.4.neon b/phpstan-baseline-7.4.neon
index 1ca1ca913..364905f71 100644
--- a/phpstan-baseline-7.4.neon
+++ b/phpstan-baseline-7.4.neon
@@ -1,47 +1,2 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Call to an undefined method Mautic\\\\LeadBundle\\\\Event\\\\ImportProcessEvent\\:\\:addWarning\\(\\)\\.$#"
-			count: 1
-			path: EventListener/ImportSubscriber.php
-
-		-
-			message: "#^Access to undefined constant Mautic\\\\LeadBundle\\\\Segment\\\\ContactSegmentFilterFactory\\:\\:CUSTOM_OPERATOR\\.$#"
-			count: 1
-			path: EventListener/SegmentFiltersMergeSubscriber.php
-
-		-
-			message: "#^Call to method getFilters\\(\\) on an unknown class Mautic\\\\LeadBundle\\\\Event\\\\LeadListMergeFiltersEvent\\.$#"
-			count: 1
-			path: EventListener/SegmentFiltersMergeSubscriber.php
-
-		-
-			message: "#^Call to method setFilters\\(\\) on an unknown class Mautic\\\\LeadBundle\\\\Event\\\\LeadListMergeFiltersEvent\\.$#"
-			count: 1
-			path: EventListener/SegmentFiltersMergeSubscriber.php
-
-		-
-			message: "#^Parameter \\$event of method MauticPlugin\\\\CustomObjectsBundle\\\\EventListener\\\\SegmentFiltersMergeSubscriber\\:\\:mergeCustomObjectFilters\\(\\) has invalid type Mautic\\\\LeadBundle\\\\Event\\\\LeadListMergeFiltersEvent\\.$#"
-			count: 1
-			path: EventListener/SegmentFiltersMergeSubscriber.php
-
-		-
-			message: "#^Call to an undefined method Mautic\\\\LeadBundle\\\\Segment\\\\ContactSegmentFilterCrate\\:\\:getMergedProperty\\(\\)\\.$#"
-			count: 1
-			path: Helper/QueryFilterHelper.php
-
-		-
-			message: "#^Constant MAUTIC_TABLE_PREFIX not found\\.$#"
-			count: 3
-			path: Helper/QueryFilterHelper.php
-
-		-
-			message: "#^Parameter \\#3 \\$type of method Mautic\\\\LeadBundle\\\\Segment\\\\Query\\\\QueryBuilder\\:\\:setParameter\\(\\) expects string\\|null, int given\\.$#"
-			count: 1
-			path: Helper/QueryFilterHelper.php
-
-		-
-			message: "#^Constant MAUTIC_TABLE_PREFIX not found\\.$#"
-			count: 1
-			path: Segment/Query/Filter/CustomObjectMergedFilterQueryBuilder.php
-
diff --git a/phpstan-baseline-8.0.neon b/phpstan-baseline-8.0.neon
index 7046c1347..364905f71 100644
--- a/phpstan-baseline-8.0.neon
+++ b/phpstan-baseline-8.0.neon
@@ -1,47 +1,2 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Call to an undefined method Mautic\\\\LeadBundle\\\\Event\\\\ImportProcessEvent\\:\\:addWarning\\(\\)\\.$#"
-			count: 1
-			path: EventListener/ImportSubscriber.php
-
-		-
-			message: "#^Access to undefined constant Mautic\\\\LeadBundle\\\\Segment\\\\ContactSegmentFilterFactory\\:\\:CUSTOM_OPERATOR\\.$#"
-			count: 1
-			path: EventListener/SegmentFiltersMergeSubscriber.php
-
-		-
-			message: "#^Call to method getFilters\\(\\) on an unknown class Mautic\\\\LeadBundle\\\\Event\\\\LeadListMergeFiltersEvent\\.$#"
-			count: 1
-			path: EventListener/SegmentFiltersMergeSubscriber.php
-
-		-
-			message: "#^Call to method setFilters\\(\\) on an unknown class Mautic\\\\LeadBundle\\\\Event\\\\LeadListMergeFiltersEvent\\.$#"
-			count: 1
-			path: EventListener/SegmentFiltersMergeSubscriber.php
-
-		-
-			message: "#^Parameter \\$event of method MauticPlugin\\\\CustomObjectsBundle\\\\EventListener\\\\SegmentFiltersMergeSubscriber\\:\\:mergeCustomObjectFilters\\(\\) has invalid type Mautic\\\\LeadBundle\\\\Event\\\\LeadListMergeFiltersEvent\\.$#"
-			count: 1
-			path: EventListener/SegmentFiltersMergeSubscriber.php
-
-		-
-			message: "#^Call to an undefined method Mautic\\\\LeadBundle\\\\Segment\\\\ContactSegmentFilterCrate\\:\\:getMergedProperty\\(\\)\\.$#"
-			count: 1
-			path: Helper/QueryFilterHelper.php
-
-		-
-			message: "#^Constant MAUTIC_TABLE_PREFIX not found\\.$#"
-			count: 1
-			path: Helper/QueryFilterHelper.php
-
-		-
-			message: "#^Parameter \\#3 \\$type of method Mautic\\\\LeadBundle\\\\Segment\\\\Query\\\\QueryBuilder\\:\\:setParameter\\(\\) expects string\\|null, int given\\.$#"
-			count: 1
-			path: Helper/QueryFilterHelper.php
-
-		-
-			message: "#^Constant MAUTIC_TABLE_PREFIX not found\\.$#"
-			count: 1
-			path: Segment/Query/Filter/CustomObjectMergedFilterQueryBuilder.php
-