diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 49e33da0..c0a6dded 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -41,7 +41,7 @@ jobs:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}
         cache: 'maven'
-        server-id: sonatype-nexus-snapshots
+        server-id: sonatype-nexus-snapshots-new
         server-username: CI_DEPLOY_USERNAME
         server-password: CI_DEPLOY_PASSWORD
         # See https://github.com/actions/setup-java/blob/v2/docs/advanced-usage.md#Publishing-using-Apache-Maven
@@ -53,7 +53,7 @@ jobs:
       run: ./mvnw -B -ff -ntp -Dversion.guava=${{ matrix.guava_version }} clean package surefire:test
     - name: Extract project Maven version
       id: projectVersion
-      run: echo "version=$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.4.1:evaluate -DforceStdout -Dexpression=project.version -q)" >> $GITHUB_OUTPUT
+      run: echo "version=$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.5.1:evaluate -DforceStdout -Dexpression=project.version -q)" >> $GITHUB_OUTPUT
     - name: Deploy snapshot
       if: ${{ github.event_name != 'pull_request' && matrix.snapshot && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT') }}
       env:
diff --git a/pom.xml b/pom.xml
index b4d38dbb..298372c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,14 +64,14 @@
     -->
   <repositories>
     <repository>
-      <id>sonatype-nexus-snapshots</id>
-      <name>Sonatype Nexus Snapshots</name>
+      <id>sonatype-nexus-snapshots-new</id>
+      <name>Sonatype Nexus Snapshots (new)</name>
       <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
       <releases><enabled>false</enabled></releases>
       <snapshots><enabled>true</enabled></snapshots>
     </repository>
     <repository>
-      <id>sonatype-old-nexus-snapshots</id>
+      <id>sonatype-nexus-snapshots-old</id>
       <name>Sonatype Nexus Snapshots (old)</name>
       <url>https://oss.sonatype.org/content/repositories/snapshots</url>
       <releases><enabled>false</enabled></releases>