diff --git a/artifactory/utils/utils.go b/artifactory/utils/utils.go
index 8cef7b4ff..485cac992 100644
--- a/artifactory/utils/utils.go
+++ b/artifactory/utils/utils.go
@@ -29,6 +29,7 @@ import (
 	"github.com/jfrog/jfrog-client-go/jfconnect"
 	"github.com/jfrog/jfrog-client-go/lifecycle"
 	"github.com/jfrog/jfrog-client-go/metadata"
+	"github.com/jfrog/jfrog-client-go/onemodel"
 	clientUtils "github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
 	ioUtils "github.com/jfrog/jfrog-client-go/utils/io"
@@ -263,6 +264,27 @@ func CreateMetadataServiceManager(serviceDetails *config.ServerDetails, isDryRun
 	return metadata.NewManager(serviceConfig)
 }
 
+func CreateOnemodelServiceManager(serviceDetails *config.ServerDetails, isDryRun bool) (onemodel.Manager, error) {
+	certsPath, err := coreutils.GetJfrogCertsDir()
+	if err != nil {
+		return nil, err
+	}
+	mdAuth, err := serviceDetails.CreateOnemodelAuthConfig()
+	if err != nil {
+		return nil, err
+	}
+	serviceConfig, err := clientConfig.NewConfigBuilder().
+		SetServiceDetails(mdAuth).
+		SetCertificatesPath(certsPath).
+		SetInsecureTls(serviceDetails.InsecureTls).
+		SetDryRun(isDryRun).
+		Build()
+	if err != nil {
+		return nil, err
+	}
+	return onemodel.NewManager(serviceConfig)
+}
+
 func CreateJfConnectServiceManager(serverDetails *config.ServerDetails, httpRetries, httpRetryWaitMilliSecs int) (jfconnect.Manager, error) {
 	certsPath, err := coreutils.GetJfrogCertsDir()
 	if err != nil {
diff --git a/go.mod b/go.mod
index e2d0e1c36..c247200c1 100644
--- a/go.mod
+++ b/go.mod
@@ -114,7 +114,7 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-replace github.com/jfrog/jfrog-client-go => github.com/eyaldelarea/jfrog-client-go v1.28.4-0.20250609120801-376c534a4738
+replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250610103426-72c57a759595
 
 // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20250226091544-c803cbbc5495
 
diff --git a/go.sum b/go.sum
index ed052c88d..194b32ef2 100644
--- a/go.sum
+++ b/go.sum
@@ -115,6 +115,8 @@ github.com/jfrog/build-info-go v1.10.12 h1:KO/YUeKYtDrnpcmsXmwqr6akjzrwA0hSTUB+O
 github.com/jfrog/build-info-go v1.10.12/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE=
 github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s=
 github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4=
+github.com/jfrog/jfrog-client-go v1.28.1-0.20250610103426-72c57a759595 h1:GnQd2YOsQJPf/H653/YKgb+L51iPD/zKnXm6XMJwLBo=
+github.com/jfrog/jfrog-client-go v1.28.1-0.20250610103426-72c57a759595/go.mod h1:XxYs2QtlTm92yqJ5O4j4vzWI8d4sDtKQUT1miNHMgnw=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
diff --git a/utils/config/config.go b/utils/config/config.go
index c3a15cdfd..292b7d51e 100644
--- a/utils/config/config.go
+++ b/utils/config/config.go
@@ -21,6 +21,7 @@ import (
 	evidenceAuth "github.com/jfrog/jfrog-client-go/evidence/auth"
 	lifecycleAuth "github.com/jfrog/jfrog-client-go/lifecycle/auth"
 	metadataAuth "github.com/jfrog/jfrog-client-go/metadata/auth"
+	onemodelAuth "github.com/jfrog/jfrog-client-go/onemodel/auth"
 	pipelinesAuth "github.com/jfrog/jfrog-client-go/pipelines/auth"
 	"github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/errorutils"
@@ -583,6 +584,7 @@ type ServerDetails struct {
 	LifecycleUrl                    string `json:"-"`
 	EvidenceUrl                     string `json:"-"`
 	MetadataUrl                     string `json:"-"`
+	OnemodelUrl                     string `json:"-"`
 	User                            string `json:"user,omitempty"`
 	Password                        string `json:"password,omitempty"`
 	SshKeyPath                      string `json:"sshKeyPath,omitempty"`
@@ -681,6 +683,10 @@ func (serverDetails *ServerDetails) GetMetadataUrl() string {
 	return serverDetails.MetadataUrl
 }
 
+func (serverDetails *ServerDetails) GetOnemodelUrl() string {
+	return serverDetails.OnemodelUrl
+}
+
 func (serverDetails *ServerDetails) GetUser() string {
 	return serverDetails.User
 }
@@ -772,6 +778,12 @@ func (serverDetails *ServerDetails) CreateMetadataAuthConfig() (auth.ServiceDeta
 	return serverDetails.createAuthConfig(mdAuth)
 }
 
+func (serverDetails *ServerDetails) CreateOnemodelAuthConfig() (auth.ServiceDetails, error) {
+	omAuth := onemodelAuth.NewOnemodelDetails()
+	omAuth.SetUrl(serverDetails.OnemodelUrl)
+	return serverDetails.createAuthConfig(omAuth)
+}
+
 func (serverDetails *ServerDetails) createAuthConfig(details auth.ServiceDetails) (auth.ServiceDetails, error) {
 	details.SetSshUrl(serverDetails.SshUrl)
 	details.SetAccessToken(serverDetails.AccessToken)