diff --git a/core/cautils/fileutils.go b/core/cautils/fileutils.go
index 71681e89..422a64fd 100644
--- a/core/cautils/fileutils.go
+++ b/core/cautils/fileutils.go
@@ -9,8 +9,10 @@ import (
 	"strings"
 
 	"github.com/armosec/k8s-interface/workloadinterface"
+
 	"github.com/armosec/kubescape/v2/core/cautils/logger"
 	"github.com/armosec/opa-utils/objectsenvelopes"
+	"github.com/armosec/opa-utils/objectsenvelopes/localworkload"
 	"gopkg.in/yaml.v2"
 )
 
@@ -60,7 +62,11 @@ func loadFiles(filePaths []string) (map[string][]workloadinterface.IMetadata, []
 				workloads[path] = []workloadinterface.IMetadata{}
 			}
 			wSlice := workloads[path]
-			wSlice = append(wSlice, w...)
+			for j := range w {
+				lw := localworkload.NewLocalWorkload(w[j].GetObject())
+				lw.SetPath(path)
+				wSlice = append(wSlice, lw)
+			}
 			workloads[path] = wSlice
 		}
 	}
diff --git a/core/pkg/resourcehandler/filesloader.go b/core/pkg/resourcehandler/filesloader.go
index 3c07fac9..f55e8d85 100644
--- a/core/pkg/resourcehandler/filesloader.go
+++ b/core/pkg/resourcehandler/filesloader.go
@@ -50,12 +50,12 @@ func (fileHandler *FileResourceHandler) GetResources(sessionObj *cautils.OPASess
 	// Clone git repository if needed
 	gitURL, err := giturl.NewGitURL(path)
 	if err == nil {
-		logger.L().Info("cloning git repository")
+		logger.L().Info("cloning", helpers.String("repository url", gitURL.GetURL().String()))
 		cautils.StartSpinner()
 		cloneDir, err := cloneRepo(gitURL)
 		cautils.StopSpinner()
 		if err != nil {
-			return nil, allResources, nil, fmt.Errorf("could not clone repository. %w", err)
+			return nil, allResources, nil, fmt.Errorf("failed to clone git repo '%s',  %w", gitURL.GetURL().String(), err)
 		}
 		defer os.RemoveAll(cloneDir)
 		path = filepath.Join(cloneDir, gitURL.GetPath())
@@ -98,7 +98,7 @@ func (fileHandler *FileResourceHandler) GetResources(sessionObj *cautils.OPASess
 
 	sessionObj.ResourceSource = workloadIDToSource
 
-	// map all resources: map["/group/version/kind"][]<k8s workloads>
+	// map all resources: map["/apiVersion/version/kind"][]<k8s workloads>
 	mappedResources := mapResources(workloads)
 
 	// save only relevant resources
diff --git a/go.mod b/go.mod
index 240749e3..898ea336 100644
--- a/go.mod
+++ b/go.mod
@@ -5,8 +5,8 @@ go 1.17
 require (
 	github.com/armosec/armoapi-go v0.0.73
 	github.com/armosec/go-git-url v0.0.13
-	github.com/armosec/k8s-interface v0.0.76
-	github.com/armosec/opa-utils v0.0.144
+	github.com/armosec/k8s-interface v0.0.78
+	github.com/armosec/opa-utils v0.0.148
 	github.com/armosec/rbac-utils v0.0.14
 	github.com/armosec/utils-go v0.0.5
 	github.com/armosec/utils-k8s-go v0.0.6
diff --git a/go.sum b/go.sum
index 20abf5a9..6d42c62d 100644
--- a/go.sum
+++ b/go.sum
@@ -129,11 +129,11 @@ github.com/armosec/go-git-url v0.0.13 h1:kwzHBL7oFqf2UsR0h4Sx+HMYqO9xHHuBFXGIyuM
 github.com/armosec/go-git-url v0.0.13/go.mod h1:GzfssG3IW9KiURSpK7c/bySBRTlghpObQ7NQ1O4hcMI=
 github.com/armosec/k8s-interface v0.0.8/go.mod h1:xxS+V5QT3gVQTwZyAMMDrYLWGrfKOpiJ7Jfhfa0w9sM=
 github.com/armosec/k8s-interface v0.0.37/go.mod h1:vHxGWqD/uh6+GQb9Sqv7OGMs+Rvc2dsFVc0XtgRh1ZU=
-github.com/armosec/k8s-interface v0.0.76 h1:pQaF+8BcNMm6GTYTjdG7vCM1l4BIk7oALXoT6v5gCAk=
-github.com/armosec/k8s-interface v0.0.76/go.mod h1:8NX4xWXh8mwW7QyZdZea1czNdM2azCK9BbUNmiZYXW0=
+github.com/armosec/k8s-interface v0.0.78 h1:zqIzbFQqSxVMjcDsB4+lgGNgkHVqDZ369/WTGGdLKCE=
+github.com/armosec/k8s-interface v0.0.78/go.mod h1:8NX4xWXh8mwW7QyZdZea1czNdM2azCK9BbUNmiZYXW0=
 github.com/armosec/opa-utils v0.0.64/go.mod h1:6tQP8UDq2EvEfSqh8vrUdr/9QVSCG4sJfju1SXQOn4c=
-github.com/armosec/opa-utils v0.0.144 h1:acGbcIyl/kCZ6CBCnMQgjXftJWWeatr3zGDTDx/K+7w=
-github.com/armosec/opa-utils v0.0.144/go.mod h1:Hwm9ZkcW87mB2567WT6mBuSBEzaKowBNfrl3Q0IVsV8=
+github.com/armosec/opa-utils v0.0.148 h1:Dyal6/SFJvWYUgFsAgk6aGzOfZbQ+cffyFAsCeKJc2I=
+github.com/armosec/opa-utils v0.0.148/go.mod h1:wvMiobwix9aeyDXh3hRt/pOjlgEr9cu4pGNCLljZQp0=
 github.com/armosec/rbac-utils v0.0.1/go.mod h1:pQ8CBiij8kSKV7aeZm9FMvtZN28VgA7LZcYyTWimq40=
 github.com/armosec/rbac-utils v0.0.14 h1:CKYKcgqJEXWF2Hen/B1pVGtS3nDAG1wp9dDv6oNtq90=
 github.com/armosec/rbac-utils v0.0.14/go.mod h1:Ex/IdGWhGv9HZq6Hs8N/ApzCKSIvpNe/ETqDfnuyah0=
diff --git a/httphandler/go.mod b/httphandler/go.mod
index c4b245e7..f37a311c 100644
--- a/httphandler/go.mod
+++ b/httphandler/go.mod
@@ -6,7 +6,7 @@ replace github.com/armosec/kubescape/v2 => ../
 
 require (
 	github.com/armosec/kubescape/v2 v2.0.0-00010101000000-000000000000
-	github.com/armosec/opa-utils v0.0.144
+	github.com/armosec/opa-utils v0.0.148
 	github.com/armosec/utils-go v0.0.5
 	github.com/google/uuid v1.3.0
 	github.com/gorilla/mux v1.8.0
@@ -35,7 +35,7 @@ require (
 	github.com/acomagu/bufpipe v1.0.3 // indirect
 	github.com/armosec/armoapi-go v0.0.73 // indirect
 	github.com/armosec/go-git-url v0.0.13 // indirect
-	github.com/armosec/k8s-interface v0.0.76 // indirect
+	github.com/armosec/k8s-interface v0.0.78 // indirect
 	github.com/armosec/rbac-utils v0.0.14 // indirect
 	github.com/armosec/utils-k8s-go v0.0.6 // indirect
 	github.com/aws/aws-sdk-go v1.41.11 // indirect
diff --git a/httphandler/go.sum b/httphandler/go.sum
index 73e4316f..b2b4484f 100644
--- a/httphandler/go.sum
+++ b/httphandler/go.sum
@@ -129,11 +129,11 @@ github.com/armosec/go-git-url v0.0.13 h1:kwzHBL7oFqf2UsR0h4Sx+HMYqO9xHHuBFXGIyuM
 github.com/armosec/go-git-url v0.0.13/go.mod h1:GzfssG3IW9KiURSpK7c/bySBRTlghpObQ7NQ1O4hcMI=
 github.com/armosec/k8s-interface v0.0.8/go.mod h1:xxS+V5QT3gVQTwZyAMMDrYLWGrfKOpiJ7Jfhfa0w9sM=
 github.com/armosec/k8s-interface v0.0.37/go.mod h1:vHxGWqD/uh6+GQb9Sqv7OGMs+Rvc2dsFVc0XtgRh1ZU=
-github.com/armosec/k8s-interface v0.0.76 h1:pQaF+8BcNMm6GTYTjdG7vCM1l4BIk7oALXoT6v5gCAk=
-github.com/armosec/k8s-interface v0.0.76/go.mod h1:8NX4xWXh8mwW7QyZdZea1czNdM2azCK9BbUNmiZYXW0=
+github.com/armosec/k8s-interface v0.0.78 h1:zqIzbFQqSxVMjcDsB4+lgGNgkHVqDZ369/WTGGdLKCE=
+github.com/armosec/k8s-interface v0.0.78/go.mod h1:8NX4xWXh8mwW7QyZdZea1czNdM2azCK9BbUNmiZYXW0=
 github.com/armosec/opa-utils v0.0.64/go.mod h1:6tQP8UDq2EvEfSqh8vrUdr/9QVSCG4sJfju1SXQOn4c=
-github.com/armosec/opa-utils v0.0.144 h1:acGbcIyl/kCZ6CBCnMQgjXftJWWeatr3zGDTDx/K+7w=
-github.com/armosec/opa-utils v0.0.144/go.mod h1:Hwm9ZkcW87mB2567WT6mBuSBEzaKowBNfrl3Q0IVsV8=
+github.com/armosec/opa-utils v0.0.148 h1:Dyal6/SFJvWYUgFsAgk6aGzOfZbQ+cffyFAsCeKJc2I=
+github.com/armosec/opa-utils v0.0.148/go.mod h1:wvMiobwix9aeyDXh3hRt/pOjlgEr9cu4pGNCLljZQp0=
 github.com/armosec/rbac-utils v0.0.1/go.mod h1:pQ8CBiij8kSKV7aeZm9FMvtZN28VgA7LZcYyTWimq40=
 github.com/armosec/rbac-utils v0.0.14 h1:CKYKcgqJEXWF2Hen/B1pVGtS3nDAG1wp9dDv6oNtq90=
 github.com/armosec/rbac-utils v0.0.14/go.mod h1:Ex/IdGWhGv9HZq6Hs8N/ApzCKSIvpNe/ETqDfnuyah0=