diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7f270e65..687e0b55 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -80,7 +80,7 @@ jobs:
           classpath-build-command: "mvn -ntp package -DskipTests"
 
   build_and_test:
-    name: "Core & Base Snapshot deployment"
+    name: "Core & Base"
     runs-on: ubuntu-latest
     needs:
       - pre_commit
@@ -116,19 +116,20 @@ jobs:
           QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
           DOCKERHUB_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-        run: mvn -B -U -q clean install -DadditionalOption=-Xdoclint:none -DskipTests -Dmaven.javadoc.skip=true -Dmaven.wagon.http.pool=false -Pbase
+        run: mvn -B -U -q clean install -DadditionalOption=-Xdoclint:none -DskipTests -Dmaven.javadoc.skip=true -Pbase
       - name: "Cache LibreOffice"
         run: bash _ci/cache_artifacts.sh
-      - name: "Run tests"
+      - name: "Run tests and deploy snapshots (master only)"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         env:
+          MAVEN_PHASE: ${{ github.event_name == 'push' && github.ref_name == 'master' && 'deploy' || 'verify' }}
           NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
           NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
           QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
           QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
           DOCKERHUB_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-        run: mvn -B -U clean deploy -DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true -Dmaven.wagon.http.pool=false -Pbase
+        run: mvn -B -U clean "$MAVEN_PHASE" -DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true -Pbase
 
   all_tests_matrix:
     name: ${{ matrix.testName }}
@@ -328,4 +329,4 @@ jobs:
           token: ${{ steps.app-token.outputs.token }}
           release-version: ${{ env.RELEASE_VERSION }}
           development-version: ${{ env.DEVELOPMENT_VERSION }}
-          maven-args: "-DskipTests -Dmaven.javadoc.skip=true -DadditionalOption=-Xdoclint:none -Dmaven.wagon.http.pool=false"
+          maven-args: "-DskipTests -Dmaven.javadoc.skip=true -DadditionalOption=-Xdoclint:none"
diff --git a/_ci/build.sh b/_ci/build.sh
index f7b477fc..d79c0269 100755
--- a/_ci/build.sh
+++ b/_ci/build.sh
@@ -5,7 +5,7 @@ PS4="\[\e[35m\]+ \[\e[m\]"
 set -vex
 pushd "$(dirname "${BASH_SOURCE[0]}")/../"
 
-mvn -B -U -Dmaven.wagon.http.pool=false \
+mvn -B -U \
     clean install \
     -DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true \
     -DskipTests \
diff --git a/_ci/buildAndTestAll.sh b/_ci/buildAndTestAll.sh
index 7e521120..652ca955 100755
--- a/_ci/buildAndTestAll.sh
+++ b/_ci/buildAndTestAll.sh
@@ -2,4 +2,4 @@
 
 set -x
 
-mvn -U -Dmaven.wagon.http.pool=false clean install -DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true -Dparent.core.deploy.skip=true -Dtransformer.base.deploy.skip=true -Plocal,docker-it-setup
+mvn -U clean install -DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true -Dparent.core.deploy.skip=true -Dtransformer.base.deploy.skip=true -Plocal,docker-it-setup
diff --git a/_ci/test.sh b/_ci/test.sh
index 7ef15929..8040606f 100755
--- a/_ci/test.sh
+++ b/_ci/test.sh
@@ -24,7 +24,7 @@ fi
 source "$(dirname "${BASH_SOURCE[0]}")/java_base_image_map.sh"
 
 # Do not deploy snapshots for alfresco-transform-core, alfresco-transformer-base and alfresco-base-t-engine
-mvn -B -U -Dmaven.wagon.http.pool=false \
+mvn -B -U \
     clean ${MAVEN_PHASE} \
     -DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true \
     -Dparent.core.deploy.skip=true -Dtransformer.base.deploy.skip=true \