diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5fd4e1ae00..70dfbdfdab 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,9 +25,10 @@ env:
   SETTINGS_FILE: .github/settings.xml
   # Workaround for occasional unreliable downloads.
   # See https://stackoverflow.com/q/55899091/301832 for details
+  # Except Maven doesn't use Wagon any more, but Aether.
+  # https://maven.apache.org/resolver/configuration.html
   MAVEN_OPTS: >
-    -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
-    -Dmaven.wagon.http.retryHandler.count=3
+    -Daether.connector.http.connectionMaxTtl=25
 
 jobs:
   compile:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 4d7068b158..9abbd7a7c0 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -34,6 +34,14 @@ on:
   schedule:
     - cron: '31 6 * * 0'
 
+env:
+  # Workaround for occasional unreliable downloads.
+  # See https://stackoverflow.com/q/55899091/301832 for details
+  # Except Maven doesn't use Wagon any more, but Aether.
+  # https://maven.apache.org/resolver/configuration.html
+  MAVEN_OPTS: >
+    -Daether.connector.http.connectionMaxTtl=25
+
 jobs:
   analyze:
     name: Analyze
@@ -73,12 +81,6 @@ jobs:
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
       uses: github/codeql-action/autobuild@v2
-      env:
-        # Workaround for occasional unreliable downloads.
-        # See https://stackoverflow.com/q/55899091/301832 for details
-        MAVEN_OPTS: >
-          -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
-          -Dmaven.wagon.http.retryHandler.count=3
 
     # ℹī¸ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
diff --git a/.github/workflows/publish-pkgs.yml b/.github/workflows/publish-pkgs.yml
index df6772d07b..d8e1e47069 100644
--- a/.github/workflows/publish-pkgs.yml
+++ b/.github/workflows/publish-pkgs.yml
@@ -21,9 +21,10 @@ env:
   SETTINGS_FILE: .github/settings.xml
   # Workaround for occasional unreliable downloads.
   # See https://stackoverflow.com/q/55899091/301832 for details
+  # Except Maven doesn't use Wagon any more, but Aether.
+  # https://maven.apache.org/resolver/configuration.html
   MAVEN_OPTS: >
-    -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
-    -Dmaven.wagon.http.retryHandler.count=3
+    -Daether.connector.http.connectionMaxTtl=25
 
 jobs:
   publish:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 0b38fa94e3..9f4b7a0e4d 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -22,9 +22,10 @@ env:
   SETTINGS_FILE: .github/settings.xml
   # Workaround for occasional unreliable downloads.
   # See https://stackoverflow.com/q/55899091/301832 for details
+  # Except Maven doesn't use Wagon any more, but Aether.
+  # https://maven.apache.org/resolver/configuration.html
   MAVEN_OPTS: >
-    -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
-    -Dmaven.wagon.http.retryHandler.count=3
+    -Daether.connector.http.connectionMaxTtl=25
 
 jobs:
   build: