diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 05e8dc8..4fc1e2a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,9 +31,10 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_PROJECT: Ouest-France_${{ github.event.repository.name }}
-        run: mvn -ntp -B sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=${{ vars.SONAR_ORGANIZATION }} -Dsonar.projectKey=$SONAR_PROJECT -Dsonar.branch.name=${GITHUB_REF##*/}
+        run: mvn -ntp -B sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=${{ vars.SONAR_ORGANIZATION }} -Dsonar.projectKey=$SONAR_PROJECT
+      - name: Prepare Settings
+        uses: whelk-io/maven-settings-xml-action@v22
+        with:
+          servers: '[{ "id": "central", "username": "${{ secrets.OSSRH_USERNAME }}", "password": "${{ secrets.OSSRH_TOKEN }}" }]'
       - name: Deploy Snapshot
-        env:
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
         run: mvn -ntp -B deploy -DskipTests=true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6d1836e..42237cd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,10 +23,12 @@ jobs:
           server-id: ossrh
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
+      - name: Prepare Settings
+        uses: whelk-io/maven-settings-xml-action@v22
+        with:
+          servers: '[{ "id": "central", "username": "${{ secrets.OSSRH_USERNAME }}", "password": "${{ secrets.OSSRH_TOKEN }}" }]'
       - name: Release
         env:
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           git config --global user.name 'github-actions'
diff --git a/pom.xml b/pom.xml
index c885f44..4768e17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,17 +36,6 @@
         <tag>HEAD</tag>
     </scm>
          
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-        <repository>
-            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-    </distributionManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -124,7 +113,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>1.5</version>
+                <version>3.2.8</version>
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>
@@ -150,10 +139,21 @@
                     <arguments>-Dmaven.test.skipTests=true -Dmaven.test.skip=true</arguments>
                 </configuration>
             </plugin>
+            <plugin>
+              <groupId>org.sonatype.central</groupId>
+              <artifactId>central-publishing-maven-plugin</artifactId>
+              <version>0.9.0</version>
+              <extensions>true</extensions>
+              <configuration>
+                 <publishingServerId>central</publishingServerId>
+                 <autoPublish>true</autoPublish>
+                 <waitUntil>published</waitUntil>
+              </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.sonarsource.scanner.maven</groupId>
                 <artifactId>sonar-maven-plugin</artifactId>
-                <version>3.9.1.2184</version>
+                <version>5.3.0.6276</version>
             </plugin>
         </plugins>
     </build>
diff --git a/src/main/java/fr/ouestfrance/querydsl/service/validators/FilterFieldValidatorService.java b/src/main/java/fr/ouestfrance/querydsl/service/validators/FilterFieldValidatorService.java
index 45a2942..6e4f5f0 100644
--- a/src/main/java/fr/ouestfrance/querydsl/service/validators/FilterFieldValidatorService.java
+++ b/src/main/java/fr/ouestfrance/querydsl/service/validators/FilterFieldValidatorService.java
@@ -4,9 +4,9 @@
 import fr.ouestfrance.querydsl.model.SimpleFilter;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * FilterFieldValidator service allow to check the validity of annotated clazz
@@ -37,7 +37,7 @@ public class FilterFieldValidatorService {
     /**
      * Map of validators
      */
-    private static final Map<Class<? extends FilterFieldValidator>, FilterFieldValidator> VALIDATOR_MAP = new HashMap<>();
+    private static final Map<Class<? extends FilterFieldValidator>, FilterFieldValidator> VALIDATOR_MAP = new ConcurrentHashMap<>();
 
     /**
      * Check each filter and build a filter of violations