diff --git a/go.mod b/go.mod
index b161e02fe..2baa8b06b 100644
--- a/go.mod
+++ b/go.mod
@@ -126,8 +126,8 @@ require (
 
 // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20230803131422-8230595ceb86
 
-replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20230820175937-54e9636a2429
+replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20230821132112-7f2932112ea3
 
-replace github.com/jfrog/jfrog-client-go => github.com/eyaldelarea/jfrog-client-go v1.28.4-0.20230820174719-94e1af28594e
+replace github.com/jfrog/jfrog-client-go => github.com/eyaldelarea/jfrog-client-go v1.28.4-0.20230821131943-b6162daf2375
 
 // replace github.com/jfrog/gofrog => github.com/jfrog/gofrog v1.2.6-0.20230418122323-2bf299dd6d27
diff --git a/go.sum b/go.sum
index b46957c79..957428fdc 100644
--- a/go.sum
+++ b/go.sum
@@ -133,10 +133,10 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20230820175937-54e9636a2429 h1:B5mamorfJE4YJNT8qYVMWqVbtHzbaRNo+wddud726Io=
-github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20230820175937-54e9636a2429/go.mod h1:eA8rxc4TZKwYAZEgM7ZzL+wTyQrdxv9uXLeWO0IG95s=
-github.com/eyaldelarea/jfrog-client-go v1.28.4-0.20230820174719-94e1af28594e h1:zj2O3bFMukOejV/eIcYwD1pxnnHz5NomBbhPzjxru7o=
-github.com/eyaldelarea/jfrog-client-go v1.28.4-0.20230820174719-94e1af28594e/go.mod h1:cstHMVqu11rn4TadtCBHrcuL+KcJ94kjSmMQSWMB61I=
+github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20230821132112-7f2932112ea3 h1:GehqyanGWu5YXaf48UUNGAyihED7X7/IgzdzdPDdfKc=
+github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20230821132112-7f2932112ea3/go.mod h1:lUsY0E24KdH4sZEZqszKNi0VEuS1SMEU9kJYO7WQ7t4=
+github.com/eyaldelarea/jfrog-client-go v1.28.4-0.20230821131943-b6162daf2375 h1:CRYTjbBZO1JH4KHJ1ISIOlL0lFuEMoKblVlACcjrK5s=
+github.com/eyaldelarea/jfrog-client-go v1.28.4-0.20230821131943-b6162daf2375/go.mod h1:cstHMVqu11rn4TadtCBHrcuL+KcJ94kjSmMQSWMB61I=
 github.com/forPelevin/gomoji v1.1.8 h1:JElzDdt0TyiUlecy6PfITDL6eGvIaxqYH1V52zrd0qQ=
 github.com/forPelevin/gomoji v1.1.8/go.mod h1:8+Z3KNGkdslmeGZBC3tCrwMrcPy5GRzAD+gL9NAwMXg=
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=