diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a76d413..f141509 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,10 +12,10 @@ jobs:
       - name: Fetch sources
         uses: actions/checkout@v2
 
-      - name: Setup JDK 11
+      - name: Setup JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
 
       - name: Cache local Maven repository
         uses: actions/cache@v2
diff --git a/.github/workflows/smoke_tests.yaml b/.github/workflows/smoke_tests.yaml
index 2b8a4c0..b1a81ee 100644
--- a/.github/workflows/smoke_tests.yaml
+++ b/.github/workflows/smoke_tests.yaml
@@ -15,10 +15,10 @@ jobs:
       - name: Fetch sources
         uses: actions/checkout@v2
 
-      - name: Setup JDK 11
+      - name: Setup JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
 
       - name: Cache local Maven repository
         uses: actions/cache@v2
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index 4db432d..643f814 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [11]
+        java: [17, 20]
     steps:
       - name: Fetch sources
         uses: actions/checkout@v2
diff --git a/pom.xml b/pom.xml
index 04348ce..576b8c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
      | dependency and plugin versions, please keep alphabetical.
      | each version property should be of the form "version.<identifier>".
     -->
-    <version.artifactory.api>7.12.5</version.artifactory.api>
+    <version.artifactory.api>7.63.15</version.artifactory.api>
     <version.jsr305.annotations>3.0.2</version.jsr305.annotations>
     <version.junit5>5.4.2</version.junit5>
     <version.maven.assembly.plugin>3.1.1</version.maven.assembly.plugin>
@@ -108,17 +108,6 @@
 
   <dependencyManagement>
     <dependencies>
-      <!--
-        Overrides of transitive deps that have not been fixed in the top level dependency yet.
-        Maybe circle back to these from time to time to see if the top level dependency was eventually fixed.
-      -->
-      <!-- Transitive of artifactory-papi -->
-      <dependency>
-        <groupId>com.thoughtworks.xstream</groupId>
-        <artifactId>xstream</artifactId>
-        <version>1.4.20</version>
-      </dependency>
-      <!-- End of overrides -->
       <dependency>
         <groupId>org.artifactory</groupId>
         <artifactId>artifactory-papi</artifactId>
@@ -160,8 +149,8 @@
 
   <repositories>
     <repository>
-      <id>jcenter</id>
-      <url>https://jcenter.bintray.com/</url>
+      <id>jfrog</id>
+      <url>https://releases.jfrog.io/artifactory/jcenter/</url>
     </repository>
   </repositories>
 </project>