diff --git a/go.mod b/go.mod
index 86fde0bb9..27c50c828 100644
--- a/go.mod
+++ b/go.mod
@@ -121,7 +121,7 @@ require (
 
 replace github.com/jfrog/jfrog-cli-security => github.com/eranturgeman/jfrog-cli-security v0.0.0-20240930115444-6caa0bf25ae7
 
-// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 dev
+replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eranturgeman/jfrog-cli-core/v2 v2.0.0-20240930121225-808a1fa452f2
 
 replace github.com/jfrog/build-info-go => github.com/eranturgeman/build-info-go v0.0.0-20240930115102-002856a2c70e
 
diff --git a/go.sum b/go.sum
index cbfc1763f..3214146bd 100644
--- a/go.sum
+++ b/go.sum
@@ -709,6 +709,8 @@ github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0+
 github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
 github.com/eranturgeman/build-info-go v0.0.0-20240930115102-002856a2c70e h1:vMjXv6zR+GuSeSWzlAVI+iLYvs27aFELe4Un/NIjYrI=
 github.com/eranturgeman/build-info-go v0.0.0-20240930115102-002856a2c70e/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE=
+github.com/eranturgeman/jfrog-cli-core/v2 v2.0.0-20240930121225-808a1fa452f2 h1:muy/ryK2tGgc3jMieUNSOltcH23+VQv0F1W1rI3ObBM=
+github.com/eranturgeman/jfrog-cli-core/v2 v2.0.0-20240930121225-808a1fa452f2/go.mod h1:Gfrs0vMQM1Ds09sHQt/cWdqwgzupeUjtMKeyzJSghNg=
 github.com/eranturgeman/jfrog-cli-security v0.0.0-20240930115444-6caa0bf25ae7 h1:92uMHUPB3JDmxpjuu5rrEDNtOU8QAQi8g3qDbgHEkIY=
 github.com/eranturgeman/jfrog-cli-security v0.0.0-20240930115444-6caa0bf25ae7/go.mod h1:/nV5xsDjUpDQ9/MAtMWlzwsOfcjVZDsh0pjkKTMaEMg=
 github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
@@ -901,8 +903,6 @@ 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-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY=
 github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
-github.com/jfrog/jfrog-cli-core/v2 v2.56.1 h1:+Me+RQx8BYKib+RZLFtGWFftLjEd3NrjVVxJbSYElKU=
-github.com/jfrog/jfrog-cli-core/v2 v2.56.1/go.mod h1:+a9VRDizwc+SK2Io6e4Yp8j7hkTeQstQTmNVwrxdh6Q=
 github.com/jfrog/jfrog-client-go v1.47.1 h1:VT2v28/usTSP56+i3MC3fgRvZoh6vjRgQgs8xTk+sYU=
 github.com/jfrog/jfrog-client-go v1.47.1/go.mod h1:7M/vgei7VGcLjUxwQ/3r9pH3lvDHlt6Q+Gw+YMis/mc=
 github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible h1:jdpOPRN1zP63Td1hDQbZW73xKmzDvZHzVdNYxhnTMDA=