diff --git a/buildtools/cli.go b/buildtools/cli.go
index fab86d358..b94753199 100644
--- a/buildtools/cli.go
+++ b/buildtools/cli.go
@@ -468,6 +468,7 @@ func GradleCmd(c *cli.Context) (err error) {
 	if !xrayScan && format != "" {
 		return cliutils.PrintHelpAndReturnError("The --format option can be sent only with the --scan option", c)
 	}
+	filteredGradleArgs = gradle.SplitGradleTasks(filteredGradleArgs...)
 	scanOutputFormat, err := commandsUtils.GetXrayOutputFormat(format)
 	if err != nil {
 		return err
diff --git a/go.mod b/go.mod
index 8a2395a7d..357b7017a 100644
--- a/go.mod
+++ b/go.mod
@@ -130,7 +130,7 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace github.com/jfrog/jfrog-cli-core/v2 => github.com/omerzi/jfrog-cli-core/v2 v2.15.3-0.20231213072049-08ac47024f29
+replace github.com/jfrog/jfrog-cli-core/v2 => github.com/omerzi/jfrog-cli-core/v2 v2.15.3-0.20231213081206-16606520b917
 
 replace github.com/jfrog/jfrog-client-go => github.com/omerzi/jfrog-client-go v1.13.2-0.20231213071843-930f7b85e2c1
 
diff --git a/go.sum b/go.sum
index 01057b882..4cb0f34a5 100644
--- a/go.sum
+++ b/go.sum
@@ -307,8 +307,8 @@ github.com/nwaples/rardecode v1.1.0 h1:vSxaY8vQhOcVr4mm5e8XllHWTiM4JF507A0Katqw7
 github.com/nwaples/rardecode v1.1.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
 github.com/omerzi/build-info-go v1.3.1-0.20231212142444-f419eddc6264 h1:uTCllOAa372/x0OC64Z6+9w1lwcSM3Ofp4Fb2fRN6GY=
 github.com/omerzi/build-info-go v1.3.1-0.20231212142444-f419eddc6264/go.mod h1:/5VZXH2Ud0IK3cOFwPykjwPOaEcHhzzbjnRiou+YKpM=
-github.com/omerzi/jfrog-cli-core/v2 v2.15.3-0.20231213072049-08ac47024f29 h1:Km/2y3n4I0U9VIYemvAw1d9eyWUYlIT2oVaYYlcAzwI=
-github.com/omerzi/jfrog-cli-core/v2 v2.15.3-0.20231213072049-08ac47024f29/go.mod h1:MWTjFA4PTVlxNmBwYL4rlAIVKqmIVDH25tOJrpO/RcI=
+github.com/omerzi/jfrog-cli-core/v2 v2.15.3-0.20231213081206-16606520b917 h1:eFP1roVpLSuzhHl6yocPb8AH+VoAcvyKHr2zYbs9mKA=
+github.com/omerzi/jfrog-cli-core/v2 v2.15.3-0.20231213081206-16606520b917/go.mod h1:MWTjFA4PTVlxNmBwYL4rlAIVKqmIVDH25tOJrpO/RcI=
 github.com/omerzi/jfrog-client-go v1.13.2-0.20231213071843-930f7b85e2c1 h1:x4/WbooHuSnsspKOFrRG5t5kCbv/Zz/HimuXtLt4Em0=
 github.com/omerzi/jfrog-client-go v1.13.2-0.20231213071843-930f7b85e2c1/go.mod h1:yYQxq+iuOo1yA74lDT7RPH5dZhkbQirQt2onM9g5h5k=
 github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=