diff --git a/build.gradle b/build.gradle
index 35ebaaaf..ead8af55 100644
--- a/build.gradle
+++ b/build.gradle
@@ -109,6 +109,7 @@ subprojects {
         implementation 'com.fasterxml.jackson.core:jackson-core:2.19.1'
         implementation 'com.fasterxml.jackson.core:jackson-databind:2.19.1'
         implementation 'com.fasterxml.jackson.core:jackson-annotations:2.19.1'
+        implementation 'tools.jackson.core:jackson-databind:3.0.4'
         api 'org.jfrog.filespecs:file-specs-java:1.1.2'
     }
 
diff --git a/services/src/main/java/org/jfrog/artifactory/client/model/impl/AllBuildsImpl.java b/services/src/main/java/org/jfrog/artifactory/client/model/impl/AllBuildsImpl.java
index 62c72ecd..3fa93175 100644
--- a/services/src/main/java/org/jfrog/artifactory/client/model/impl/AllBuildsImpl.java
+++ b/services/src/main/java/org/jfrog/artifactory/client/model/impl/AllBuildsImpl.java
@@ -1,8 +1,8 @@
 package org.jfrog.artifactory.client.model.impl;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.jfrog.artifactory.client.model.AllBuilds;
 import org.jfrog.artifactory.client.model.Build;
+import tools.jackson.databind.annotation.JsonDeserialize;
 
 import java.util.List;
 
@@ -27,6 +27,7 @@ public List<Build> getBuilds() {
         return builds;
     }
 
+    @com.fasterxml.jackson.databind.annotation.JsonDeserialize(contentAs = BuildImpl.class)
     @JsonDeserialize(contentAs = BuildImpl.class)
     public void setBuilds(List<Build> builds) {
         this.builds = builds;
diff --git a/services/src/main/java/org/jfrog/artifactory/client/model/impl/BuildRunsImpl.java b/services/src/main/java/org/jfrog/artifactory/client/model/impl/BuildRunsImpl.java
index 38db4d49..14fb12b4 100644
--- a/services/src/main/java/org/jfrog/artifactory/client/model/impl/BuildRunsImpl.java
+++ b/services/src/main/java/org/jfrog/artifactory/client/model/impl/BuildRunsImpl.java
@@ -1,8 +1,8 @@
 package org.jfrog.artifactory.client.model.impl;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.jfrog.artifactory.client.model.BuildNumber;
 import org.jfrog.artifactory.client.model.BuildRuns;
+import tools.jackson.databind.annotation.JsonDeserialize;
 
 import java.util.List;
 
@@ -27,6 +27,7 @@ public List<BuildNumber> getBuildsNumbers() {
         return buildsNumbers;
     }
 
+    @com.fasterxml.jackson.databind.annotation.JsonDeserialize(contentAs = BuildNumberImpl.class)
     @JsonDeserialize(contentAs = BuildNumberImpl.class)
     public void setBuildsNumbers(List<BuildNumber> buildsNumbers) {
         this.buildsNumbers = buildsNumbers;
diff --git a/services/src/main/java/org/jfrog/artifactory/client/model/impl/ContentSyncImpl.java b/services/src/main/java/org/jfrog/artifactory/client/model/impl/ContentSyncImpl.java
index 9761c9db..1c44ad2d 100644
--- a/services/src/main/java/org/jfrog/artifactory/client/model/impl/ContentSyncImpl.java
+++ b/services/src/main/java/org/jfrog/artifactory/client/model/impl/ContentSyncImpl.java
@@ -1,19 +1,22 @@
 package org.jfrog.artifactory.client.model.impl;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
 import org.jfrog.artifactory.client.model.ContentSync;
+import tools.jackson.databind.annotation.JsonDeserialize;
 
 public class ContentSyncImpl implements ContentSync {
 
     private boolean enabled;
 
+    @com.fasterxml.jackson.databind.annotation.JsonDeserialize(as = EnabledHolderImpl.class)
     @JsonDeserialize(as = EnabledHolderImpl.class)
     private EnabledHolder statistics;
 
+    @com.fasterxml.jackson.databind.annotation.JsonDeserialize(as = EnabledHolderImpl.class)
     @JsonDeserialize(as = EnabledHolderImpl.class)
     private EnabledHolder properties;
 
+    @com.fasterxml.jackson.databind.annotation.JsonDeserialize(as = OriginAbsenceDetectionHolderImpl.class)
     @JsonDeserialize(as = OriginAbsenceDetectionHolderImpl.class)
     private OriginAbsenceDetectionHolder source;
 
diff --git a/services/src/main/java/org/jfrog/artifactory/client/model/impl/FolderImpl.java b/services/src/main/java/org/jfrog/artifactory/client/model/impl/FolderImpl.java
index be9316f8..9a31bf19 100644
--- a/services/src/main/java/org/jfrog/artifactory/client/model/impl/FolderImpl.java
+++ b/services/src/main/java/org/jfrog/artifactory/client/model/impl/FolderImpl.java
@@ -1,9 +1,9 @@
 package org.jfrog.artifactory.client.model.impl;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.jfrog.artifactory.client.model.Folder;
 import org.jfrog.artifactory.client.model.Item;
+import tools.jackson.databind.annotation.JsonDeserialize;
 
 import java.util.Date;
 import java.util.List;
@@ -38,6 +38,7 @@ public List<Item> getChildren() {
         return children;
     }
 
+    @com.fasterxml.jackson.databind.annotation.JsonDeserialize(contentAs = ItemImpl.class)
     @JsonDeserialize(contentAs = ItemImpl.class)
     private void setChildren(List<Item> children) {
         this.children = children;
diff --git a/services/src/main/java/org/jfrog/artifactory/client/model/impl/LightweightRepositoryImpl.java b/services/src/main/java/org/jfrog/artifactory/client/model/impl/LightweightRepositoryImpl.java
index 58b005d8..ed32c8e0 100644
--- a/services/src/main/java/org/jfrog/artifactory/client/model/impl/LightweightRepositoryImpl.java
+++ b/services/src/main/java/org/jfrog/artifactory/client/model/impl/LightweightRepositoryImpl.java
@@ -1,8 +1,8 @@
 package org.jfrog.artifactory.client.model.impl;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.jfrog.artifactory.client.model.LightweightRepository;
 import org.jfrog.artifactory.client.model.RepositoryType;
+import tools.jackson.databind.annotation.JsonDeserialize;
 
 /**
  * @author jbaruch
@@ -52,6 +52,7 @@ public RepositoryType getType() {
         return type;
     }
 
+    @com.fasterxml.jackson.databind.annotation.JsonDeserialize(as = RepositoryTypeImpl.class)
     @JsonDeserialize(as = RepositoryTypeImpl.class)
     private void setType(RepositoryType type) {
         this.type = type;
diff --git a/services/src/main/java/org/jfrog/artifactory/client/model/impl/PermissionTargetImpl.java b/services/src/main/java/org/jfrog/artifactory/client/model/impl/PermissionTargetImpl.java
index 740df7a0..fdc8582b 100644
--- a/services/src/main/java/org/jfrog/artifactory/client/model/impl/PermissionTargetImpl.java
+++ b/services/src/main/java/org/jfrog/artifactory/client/model/impl/PermissionTargetImpl.java
@@ -1,9 +1,9 @@
 package org.jfrog.artifactory.client.model.impl;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.jfrog.artifactory.client.model.PermissionTarget;
 import org.jfrog.artifactory.client.model.Principals;
+import tools.jackson.databind.annotation.JsonDeserialize;
 
 import java.util.List;
 
@@ -18,6 +18,7 @@ public class PermissionTargetImpl implements PermissionTarget {
     private String excludesPattern;
     private List<String> repositories;
     @JsonProperty("principals")
+    @com.fasterxml.jackson.databind.annotation.JsonDeserialize(as = PrincipalsImpl.class)
     @JsonDeserialize(as = PrincipalsImpl.class)
     private Principals principals;
 
diff --git a/services/src/main/java/org/jfrog/artifactory/client/model/impl/RemoteRepositoryImpl.java b/services/src/main/java/org/jfrog/artifactory/client/model/impl/RemoteRepositoryImpl.java
index 7c44e182..37e93442 100644
--- a/services/src/main/java/org/jfrog/artifactory/client/model/impl/RemoteRepositoryImpl.java
+++ b/services/src/main/java/org/jfrog/artifactory/client/model/impl/RemoteRepositoryImpl.java
@@ -4,12 +4,12 @@
 import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.jfrog.artifactory.client.model.ContentSync;
 import org.jfrog.artifactory.client.model.RemoteRepository;
 import org.jfrog.artifactory.client.model.RepositoryType;
 import org.jfrog.artifactory.client.model.repository.settings.RepositorySettings;
 import org.jfrog.artifactory.client.model.repository.settings.XraySettings;
+import tools.jackson.databind.annotation.JsonDeserialize;
 
 /**
  * @author jbaruch
@@ -38,6 +38,7 @@ public class RemoteRepositoryImpl extends NonVirtualRepositoryBase implements Re
     private boolean synchronizeProperties;
     private long assumedOfflinePeriodSecs;
     private boolean listRemoteFolderItems;
+    @com.fasterxml.jackson.databind.annotation.JsonDeserialize(as=ContentSyncImpl.class)
     @JsonDeserialize(as=ContentSyncImpl.class)
     @JsonProperty("contentSynchronisation")
     private ContentSync contentSync;
diff --git a/services/src/main/java/org/jfrog/artifactory/client/model/impl/StorageInfoImpl.java b/services/src/main/java/org/jfrog/artifactory/client/model/impl/StorageInfoImpl.java
index a20da45d..2dc32118 100644
--- a/services/src/main/java/org/jfrog/artifactory/client/model/impl/StorageInfoImpl.java
+++ b/services/src/main/java/org/jfrog/artifactory/client/model/impl/StorageInfoImpl.java
@@ -1,12 +1,12 @@
 package org.jfrog.artifactory.client.model.impl;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.jfrog.artifactory.client.model.BinariesSummary;
 import org.jfrog.artifactory.client.model.FileStorageSummary;
 import org.jfrog.artifactory.client.model.RepositorySummary;
 import org.jfrog.artifactory.client.model.StorageInfo;
 import org.jfrog.artifactory.client.model.impl.storageinfo.BinariesSummaryImpl;
 import org.jfrog.artifactory.client.model.impl.storageinfo.FileStorageSummaryImpl;
+import tools.jackson.databind.annotation.JsonDeserialize;
 
 import java.util.List;
 
@@ -23,6 +23,7 @@ public BinariesSummary getBinariesSummary() {
         return binariesSummary;
     }
 
+    @com.fasterxml.jackson.databind.annotation.JsonDeserialize(as = BinariesSummaryImpl.class)
     @JsonDeserialize(as = BinariesSummaryImpl.class)
     public void setBinariesSummary(BinariesSummary binariesSummary) {
         this.binariesSummary = binariesSummary;
@@ -32,6 +33,7 @@ public FileStorageSummary getFileStoreSummary() {
         return fileStoreSummary;
     }
 
+    @com.fasterxml.jackson.databind.annotation.JsonDeserialize(as = FileStorageSummaryImpl.class)
     @JsonDeserialize(as = FileStorageSummaryImpl.class)
     public void setFileStoreSummary(FileStorageSummary fileStoreSummary) {
         this.fileStoreSummary = fileStoreSummary;