Update MAINTAINERS.md

Signed-off-by: Amir Malka <amirm@armosec.io>
2026-02-14 18:09:55 +00:00 · 2024-11-26 10:46:45 +02:00
123 changed files with 1727 additions and 3114 deletions
--- a/.github/workflows/00-pr-scanner.yaml
+++ b/.github/workflows/00-pr-scanner.yaml
@@ -65,7 +65,7 @@ jobs:
      COMPONENT_NAME: kubescape
      CGO_ENABLED: 0
      GO111MODULE: ""
-      GO_VERSION: "1.23"
+      GO_VERSION: "1.21"
      RELEASE: "latest"
      CLIENT: test
    secrets: inherit
--- a/.github/workflows/02-release.yaml
+++ b/.github/workflows/02-release.yaml
@@ -37,7 +37,7 @@ jobs:
      COMPONENT_NAME: kubescape
      CGO_ENABLED: 0
      GO111MODULE: ""
-      GO_VERSION: "1.23"
+      GO_VERSION: "1.21"
      RELEASE: ${{ needs.retag.outputs.NEW_TAG }}
      CLIENT: release
    secrets: inherit
--- a/.github/workflows/a-pr-scanner.yaml
+++ b/.github/workflows/a-pr-scanner.yaml
@@ -39,6 +39,7 @@ jobs:
        name: Installing go
        with:
          go-version: ${{ inputs.GO_VERSION }}
+          cache: true

      - name: Test core pkg
        run: ${{ env.DOCKER_CMD }} go test -v ./...
@@ -51,7 +52,7 @@ jobs:
      - uses: anchore/sbom-action/download-syft@v0.15.2
        name: Setup Syft

-      - uses: goreleaser/goreleaser-action@v6
+      - uses: goreleaser/goreleaser-action@v5
        name: Build
        with:
          distribution: goreleaser
@@ -92,7 +93,8 @@ jobs:
      - uses: actions/setup-go@v4
        name: Installing go
        with:
-          go-version: "1.23"
+          go-version: '1.21'
+          cache: true
      - name: Scanning - Forbidden Licenses (go-licenses)
        id: licenses-scan
        continue-on-error: true
@@ -105,7 +107,7 @@ jobs:
        if: ${{ env.GITGUARDIAN_API_KEY }}
        continue-on-error: true
        id: credentials-scan
-        uses: GitGuardian/ggshield-action@master
+        uses: GitGuardian/ggshield-action@4ab2994172fadab959240525e6b833d9ae3aca61 # ratchet:GitGuardian/ggshield-action@master
        with:
          args: -v --all-policies
        env:
@@ -118,7 +120,7 @@ jobs:
        if: ${{ env.SNYK_TOKEN }}
        id: vulnerabilities-scan
        continue-on-error: true
-        uses: snyk/actions/golang@master
+        uses: snyk/actions/golang@806182742461562b67788a64410098c9d9b96adb # ratchet:snyk/actions/golang@master
        with:
          command: test --all-projects
        env:
@@ -140,7 +142,7 @@ jobs:

      - name: Comment results to PR
        continue-on-error: true # Warning: This might break opening PRs from forks
-        uses: peter-evans/create-or-update-comment@v4
+        uses: peter-evans/create-or-update-comment@5adcb0bb0f9fb3f95ef05400558bdb3f329ee808 # ratchet:peter-evans/create-or-update-comment@v2.1.0
        with:
          issue-number: ${{ github.event.pull_request.number }}
          body: |
--- a/.github/workflows/b-binary-build-and-e2e-tests.yaml
+++ b/.github/workflows/b-binary-build-and-e2e-tests.yaml
@@ -163,6 +163,7 @@ jobs:
        name: Installing go
        with:
          go-version: ${{ inputs.GO_VERSION }}
+          cache: true

      - name: (debug) Step 3 - Check disk space before build
        run: df -h
@@ -181,13 +182,13 @@ jobs:
      - name: (debug) Step 5 - Check disk space before setting up Syft
        run: df -h

-      - uses: anchore/sbom-action/download-syft@v0
+      - uses: anchore/sbom-action/download-syft@v0.15.2
        name: Setup Syft

      - name: (debug) Step 6 - Check disk space before goreleaser
        run: df -h

-      - uses: goreleaser/goreleaser-action@v6
+      - uses: goreleaser/goreleaser-action@v5
        name: Build
        with:
          distribution: goreleaser
@@ -223,11 +224,11 @@ jobs:
      - name: (debug) Step 9 - Check disk space before uploading artifacts
        run: df -h

-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # ratchet:actions/upload-artifact@v3.1.1
        name: Upload artifacts
        with:
          name: kubescape
-          path: dist/*
+          path: dist/kubescape*
          if-no-files-found: error

      - name: (debug) Step 10 - Check disk space after uploading artifacts
@@ -289,7 +290,7 @@ jobs:
    if: ${{ (needs.wf-preparation.outputs.is-secret-set == 'true') && (always() && (contains(needs.*.result, 'success') || contains(needs.*.result, 'skipped')) && !(contains(needs.*.result, 'failure')) && !(contains(needs.*.result, 'cancelled'))) }}
    runs-on: ubuntu-latest # This cannot change
    steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # ratchet:actions/download-artifact@v3.0.2
        id: download-artifact
        with:
          name: kubescape
@@ -306,7 +307,7 @@ jobs:
          repository: armosec/system-tests
          path: .

-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # ratchet:actions/setup-python@v4
        with:
          python-version: '3.8.13'
          cache: 'pip'
@@ -321,7 +322,7 @@ jobs:

      - name: Create k8s Kind Cluster
        id: kind-cluster-install
-        uses: helm/kind-action@v1.10.0
+        uses: helm/kind-action@d08cf6ff1575077dee99962540d77ce91c62387d # ratchet:helm/kind-action@v1.3.0
        with:
          cluster_name: ${{ steps.uuid.outputs.RANDOM_UUID }}

@@ -351,7 +352,7 @@ jobs:
          deactivate

      - name: Test Report
-        uses: mikepenz/action-junit-report@v5
+        uses: mikepenz/action-junit-report@6e9933f4a97f4d2b99acef4d7b97924466037882 # ratchet:mikepenz/action-junit-report@v3.6.1
        if: always() # always run even if the previous step fails
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/build-image.yaml
+++ b/.github/workflows/build-image.yaml
@@ -33,7 +33,7 @@ jobs:
      CGO_ENABLED: 0
      GO111MODULE: "on"
      BUILD_PLATFORM: ${{ inputs.PLATFORMS && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
-      GO_VERSION: "1.23"
+      GO_VERSION: "1.21"
      REQUIRED_TESTS: '[]'
      COSIGN: ${{ inputs.CO_SIGN }}
      HELM_E2E_TEST: false
--- a/.github/workflows/c-create-release.yaml
+++ b/.github/workflows/c-create-release.yaml
@@ -27,15 +27,14 @@ jobs:
    permissions:
      contents: write
    steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # ratchet:actions/download-artifact@v3.0.2
        id: download-artifact
        with:
-          name: kubescape
          path: .

      # TODO: kubescape-windows-latest is deprecated and should be removed
      - name: Get kubescape.exe from kubescape-windows-latest.exe
-        run: cp ${{steps.download-artifact.outputs.download-path}}/kubescape-${{ env.WINDOWS_OS }}.exe ${{steps.download-artifact.outputs.download-path}}/kubescape.exe
+        run: cp ${{steps.download-artifact.outputs.download-path}}/kubescape/kubescape-${{ env.WINDOWS_OS }}.exe ${{steps.download-artifact.outputs.download-path}}/kubescape/kubescape.exe

      - name: Set release token
        id: set-token
@@ -51,7 +50,7 @@ jobs:
          find . -type f -print

      - name: Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@975c1b265e11dd76618af1c374e7981f9a6ff44a
        with:
          token: ${{ steps.set-token.outputs.token }}
          name: ${{ inputs.RELEASE_NAME }}
@@ -61,26 +60,32 @@ jobs:
          prerelease: false
          fail_on_unmatched_files: true
          files: |
-            ./checksums.sha256
-            ./kubescape-${{ env.MAC_OS }}
-            ./kubescape-${{ env.MAC_OS }}.sbom
-            ./kubescape-${{ env.MAC_OS }}.tar.gz
-            ./kubescape-${{ env.UBUNTU_OS }}
-            ./kubescape-${{ env.UBUNTU_OS }}.sbom
-            ./kubescape-${{ env.UBUNTU_OS }}.tar.gz
-            ./kubescape-${{ env.WINDOWS_OS }}.exe
-            ./kubescape-${{ env.WINDOWS_OS }}.exe.sbom
-            ./kubescape-${{ env.WINDOWS_OS }}.tar.gz
-            ./kubescape-arm64-${{ env.MAC_OS }}
-            ./kubescape-arm64-${{ env.MAC_OS }}.sbom
-            ./kubescape-arm64-${{ env.MAC_OS }}.tar.gz
-            ./kubescape-arm64-${{ env.UBUNTU_OS }}
-            ./kubescape-arm64-${{ env.UBUNTU_OS }}.sbom
-            ./kubescape-arm64-${{ env.UBUNTU_OS }}.tar.gz
-            ./kubescape-arm64-${{ env.WINDOWS_OS }}.exe
-            ./kubescape-arm64-${{ env.WINDOWS_OS }}.exe.sbom
-            ./kubescape-arm64-${{ env.WINDOWS_OS }}.tar.gz
-            ./kubescape-riscv64-${{ env.UBUNTU_OS }}
-            ./kubescape-riscv64-${{ env.UBUNTU_OS }}.sbom
-            ./kubescape-riscv64-${{ env.UBUNTU_OS }}.tar.gz
-            ./kubescape.exe
+            ./kubescape/kubescape-${{ env.MAC_OS }}
+            ./kubescape/kubescape-${{ env.MAC_OS }}.sbom
+            ./kubescape/kubescape-${{ env.MAC_OS }}.sha256
+            ./kubescape/kubescape-${{ env.MAC_OS }}.tar.gz
+            ./kubescape/kubescape-${{ env.UBUNTU_OS }}
+            ./kubescape/kubescape-${{ env.UBUNTU_OS }}.sbom
+            ./kubescape/kubescape-${{ env.UBUNTU_OS }}.sha256
+            ./kubescape/kubescape-${{ env.UBUNTU_OS }}.tar.gz
+            ./kubescape/kubescape-${{ env.WINDOWS_OS }}.exe
+            ./kubescape/kubescape-${{ env.WINDOWS_OS }}.exe.sbom
+            ./kubescape/kubescape-${{ env.WINDOWS_OS }}.exe.sha256
+            ./kubescape/kubescape-${{ env.WINDOWS_OS }}.tar.gz
+            ./kubescape/kubescape-arm64-${{ env.MAC_OS }}
+            ./kubescape/kubescape-arm64-${{ env.MAC_OS }}.sbom
+            ./kubescape/kubescape-arm64-${{ env.MAC_OS }}.sha256
+            ./kubescape/kubescape-arm64-${{ env.MAC_OS }}.tar.gz
+            ./kubescape/kubescape-arm64-${{ env.UBUNTU_OS }}
+            ./kubescape/kubescape-arm64-${{ env.UBUNTU_OS }}.sbom
+            ./kubescape/kubescape-arm64-${{ env.UBUNTU_OS }}.sha256
+            ./kubescape/kubescape-arm64-${{ env.UBUNTU_OS }}.tar.gz
+            ./kubescape/kubescape-arm64-${{ env.WINDOWS_OS }}.exe
+            ./kubescape/kubescape-arm64-${{ env.WINDOWS_OS }}.exe.sbom
+            ./kubescape/kubescape-arm64-${{ env.WINDOWS_OS }}.exe.sha256
+            ./kubescape/kubescape-arm64-${{ env.WINDOWS_OS }}.tar.gz
+            ./kubescape/kubescape-riscv64-${{ env.UBUNTU_OS }}
+            ./kubescape/kubescape-riscv64-${{ env.UBUNTU_OS }}.sbom
+            ./kubescape/kubescape-riscv64-${{ env.UBUNTU_OS }}.sha256
+            ./kubescape/kubescape-riscv64-${{ env.UBUNTU_OS }}.tar.gz
+            ./kubescape/kubescape.exe
--- a/.github/workflows/d-publish-image.yaml
+++ b/.github/workflows/d-publish-image.yaml
@@ -63,21 +63,22 @@ jobs:
        with:
          submodules: recursive
      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # ratchet:docker/setup-qemu-action@v2
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@f03ac48505955848960e80bbb68046aa35c7b9e7 # ratchet:docker/setup-buildx-action@v2
      - name: Login to Quay.io
        env:
          QUAY_PASSWORD: ${{ secrets.QUAYIO_REGISTRY_PASSWORD }}
          QUAY_USERNAME: ${{ secrets.QUAYIO_REGISTRY_USERNAME }}
        run: docker login -u="${QUAY_USERNAME}" -p="${QUAY_PASSWORD}" quay.io
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # ratchet:actions/download-artifact@v3.0.2
        id: download-artifact
        with:
-          name: kubescape
          path: .
      - name: mv kubescape amd64 binary
-        run: mv kubescape-ubuntu-latest kubescape-amd64-ubuntu-latest
+        run: mv ${{steps.download-artifact.outputs.download-path}}/kubescape/kubescape-ubuntu-latest kubescape-amd64-ubuntu-latest
+      - name: mv kubescape arm64 binary
+        run: mv ${{steps.download-artifact.outputs.download-path}}/kubescape/kubescape-arm64-ubuntu-latest kubescape-arm64-ubuntu-latest
      - name: chmod +x
        run: chmod +x -v kubescape-a*
      - name: Build and push images
@@ -105,3 +106,4 @@ jobs:
            # Verify the image
            echo "$COSIGN_PUBLIC_KEY" > cosign.pub
            cosign verify -key cosign.pub ${{ inputs.image_name }}:${{ inputs.image_tag }}
+
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -32,12 +32,12 @@ jobs:

    steps:
      - name: "Checkout code"
-        uses: actions/checkout@v4
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
        with:
          persist-credentials: false

      - name: "Run analysis"
-        uses: ossf/scorecard-action@v2.4.0
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
        with:
          results_file: results.sarif
          results_format: sarif
@@ -59,7 +59,7 @@ jobs:
      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
      # format to the repository Actions tab.
      - name: "Upload artifact"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
        with:
          name: SARIF file
          path: results.sarif
@@ -67,6 +67,6 @@ jobs:

      # Upload the results to GitHub's code scanning dashboard.
      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@v3
+        uses: github/codeql-action/upload-sarif@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
        with:
          sarif_file: results.sarif
--- a/.github/workflows/z-close-typos-issues.yaml
+++ b/.github/workflows/z-close-typos-issues.yaml
@@ -7,14 +7,14 @@ jobs:
    if: github.event.label.name == 'typo'
    runs-on: ubuntu-latest
    steps:
-      - uses: ben-z/actions-comment-on-issue@1.0.2
+      - uses: ben-z/actions-comment-on-issue@10be23f9c43ac792663043420fda29dde07e2f0f # ratchet:ben-z/actions-comment-on-issue@1.0.2
        with:
          message: "Hello! :wave:\n\nThis issue is being automatically closed, Please open a PR with a relevant fix."
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  auto_close_issues:
    runs-on: ubuntu-latest
    steps:
-      - uses: lee-dohm/close-matching-issues@v2
+      - uses: lee-dohm/close-matching-issues@e9e43aad2fa6f06a058cedfd8fb975fd93b56d8f # ratchet:lee-dohm/close-matching-issues@v2
        with:
          query: 'label:typo'
          token: ${{ secrets.GITHUB_TOKEN }}
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -1,29 +1,16 @@
+# This is an example .goreleaser.yml file with some sensible defaults.
 # Make sure to check the documentation at https://goreleaser.com

-# The lines below are called `modelines`. See `:help modeline`
+# The lines bellow are called `modelines`. See `:help modeline`
 # Feel free to remove those if you don't want/need to use them.
 # yaml-language-server: $schema=https://goreleaser.com/static/schema.json
 # vim: set ts=2 sw=2 tw=0 fo=cnqoj

-version: 2
-
 before:
  hooks:
    # You may remove this if you don't use go modules.
    - go mod tidy

-archives:
-  - id: binaries
-    formats:
-      - binary
-    name_template: >-
-      {{ .Binary }}
-  - id: default
-    formats:
-      - tar.gz
-    name_template: >-
-      {{ .Binary }}
-
 builds:
  - goos:
      - linux
@@ -46,6 +33,15 @@ builds:
      {{- else }}{{ .Os }}{{ end }}-latest
    no_unique_dist_dir: true

+archives:
+  - format: binary
+    id: binaries
+    name_template: >-
+      {{ .Binary }}
+  - format: tar.gz
+    name_template: >-
+      {{ .Binary }}
+
 changelog:
  sort: asc
  filters:
@@ -54,7 +50,9 @@ changelog:
      - "^test:"

 checksum:
-  name_template: "checksums.sha256"
+  ids:
+    - binaries
+  split: true

 sboms:
  - artifacts: binary
--- a/ADOPTERS.md
+++ b/ADOPTERS.md
@@ -1,5 +1,24 @@
 # Adopters

-The Kubescape project manages this document in the central project repository.
+# Well-known companies

-Go to the [centralized ADOPTERS.md](https://github.com/kubescape/project-governance/blob/main/ADOPTERS.md)
+List of well-known companies who are publicly acknowledge using and/or contributing to Kubescape are (in alphabetical order):
+* AWS uses Kubescape in the security training material [link](https://catalog.workshops.aws/containersecurity/en-US/module2)
+* Energi Danmark: Publicly talking about how they use Kubescape in their CI/CD pipeline [link](https://www.armosec.io/energi-danmark-business-support/)
+* Gitpod: Used Kubescape in their SOC2 compliance process [link](https://www.armosec.io/gitpod/)
+* Intel: using Kubescape for security prioritization [video](https://youtu.be/1iCW1KboypY?si=OjmnshWbpFNVPGJT)
+* Orange Business: talking about Kubescape/ARMO service they are doing [video](https://www.youtube.com/watch?v=cbJYCUM8578)
+* Rabobank: talked at KCD Amsterdam about having Kubescape in their technology stack [video](https://youtu.be/oa_YJmjwepI?si=vSrFW6seMKHj2Lze) [image](/docs/img/kcd-amsterdam-rabo.jpg)
+* VMWare/Bitnami: listing Kubescape in their public image/helm repository [link](https://github.com/bitnami/containers/tree/main/bitnami/kubescape)
+
+
+# Users
+
+If you want to be listed here and share with others your experience, open a PR and add the bellow table:
+
+
+| Name | Company | Use case | Contact for questions (optional) |
+| ---- | ------- | -------- | -------------------------------- |
+| Yonathan Amzallag | ARMO | Vulnerability monitoring | yonatana@armosec.io |
+| Engin Diri | Schwarz IT (SIT) | Ensure continuous compliance for edge k8s cluster | engin.diri@mail.schwarz |
+| Idan Bidani | Cox Communications | Security analysis for k8s best practices in CI pipelines of 3,000 applications 🔒☸ | idan.bidani@cox.com |
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,5 +1,3 @@
-# Code of Conduct
+## Code of Conduct

-The Kubescape project manages this document in the central project repository.
-
-Go to the [centralized CODE_OF_CONDUCT.md](https://github.com/kubescape/project-governance/blob/main/CODE_OF_CONDUCT.md)
+The Kubescape project follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
--- a/COMMUNITY.md
+++ b/COMMUNITY.md
@@ -1,5 +0,0 @@
-# Community
-
-The Kubescape project manages this document in the central project repository.
-
-Go to the [centralized COMMUNITY.md](https://github.com/kubescape/project-governance/blob/main/COMMUNITY.md)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,100 @@
 # Contributing

-The Kubescape project manages this document in the central project repository.
+First, it is awesome that you are considering contributing to Kubescape! Contributing is important and fun and we welcome your efforts.

-Go to the [centralized CONTRIBUTING.md](https://github.com/kubescape/project-governance/blob/main/CONTRIBUTING.md)
+When contributing, we categorize contributions into two:
+* Small code changes or fixes, whose scope is limited to one or two files
+* Complex features and improvements, with potentially unlimited scope
+
+If you have a small change, feel free to fire up a Pull Request.
+
+When planning a bigger change, please first discuss the change you wish to make via an [issue](https://github.com/kubescape/kubescape/issues),
+so the maintainers are able to help guide you and let you know if you are going in the right direction.
+
+[You can also find the maintainers on the CNCF Slack](https://kubescape.io/project/community/#slack) or [join our bi-weekly project meeting](https://kubescape.io/project/community/#community-meetings).
+
+## Code of Conduct
+
+Please follow our [code of conduct](CODE_OF_CONDUCT.md) in all of your interactions within the project.
+
+## Build and test locally
+
+Please follow the [instructions here](https://github.com/kubescape/kubescape/wiki/Building).
+
+## Pull Request Process
+
+1. Ensure any install or build dependencies are removed before the end of the layer when doing a 
+   build.
+2. Update the README.md with details of changes to the interface, this includes new environment 
+   variables, exposed ports, useful file locations and container parameters.
+3. Open Pull Request to the `master` branch.
+4. We will merge the Pull Request once you have the sign-off.
+
+## Developer Certificate of Origin
+
+All commits to the project must be "signed off", which states that you agree to the terms of the [Developer Certificate of Origin](https://developercertificate.org/).  This is done by adding a "Signed-off-by:" line in the commit message, with your name and email address.
+
+Commits made through the GitHub web application are automatically signed off.
+
+### Configuring Git to sign off commits
+
+First, configure your name and email address in Git global settings:
+
+```
+$ git config --global user.name "John Doe" 
+$ git config --global user.email johndoe@example.com
+```
+
+You can now sign off per-commit, or configure Git to always sign off commits per repository.
+
+### Sign off per-commit
+
+Add [`-s`](https://git-scm.com/docs/git-commit#Documentation/git-commit.txt--s) to your Git command line. For example:
+
+```git commit -s -m "Fix issue 64738"```
+
+This is tedious, and if you forget, you'll have to [amend your commit](#fixing-a-commit-where-the-dco-failed).
+
+### Configure a repository to always include sign off
+
+There are many ways to achieve this with Git hooks, but the simplest is to do the following:
+
+```
+cd your-repo
+curl -Ls https://gist.githubusercontent.com/dixudx/7d7edea35b4d91e1a2a8fbf41d0954fa/raw/prepare-commit-msg -o .git/hooks/prepare-commit-msg
+chmod +x .git/hooks/prepare-commit-msg
+```
+
+### Use semantic commit messages (optional)
+
+When contributing, you could consider using [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/), in order to improve logs readability and help us to automatically generate `CHANGELOG`s.
+
+Format: `<type>(<scope>): <subject>`
+
+`<scope>` is optional
+
+#### Example
+
+```
+feat(cmd): add kubectl plugin
+^--^ ^-^   ^----------------^
+|    |     |
+|    |     +-> subject: summary in present tense.
+|    |
+|    +-------> scope: point of interest
+|
+-------> type: chore, docs, feat, fix, refactor, style, or test.
+```
+
+More Examples:
+* `feat`: new feature for the user, not a new feature for build script
+* `fix`: bug fix for the user, not a fix to a build script
+* `docs`: changes to the documentation
+* `style`: formatting, missing semi colons, etc; no production code change
+* `refactor`: refactoring production code, eg. renaming a variable
+* `test`: adding missing tests, refactoring tests; no production code change
+* `chore`: updating grunt tasks etc; no production code change
+
+## Fixing a commit where the DCO failed
+
+Check out [this guide](https://github.com/src-d/guide/blob/master/developer-community/fix-DCO.md).
--- a/GOVERNANCE.md
+++ b/GOVERNANCE.md
@@ -1,5 +1,60 @@
-# Governance
+# Governance of Kubescape

-The Kubescape project manages this document in the central project repository.
+## Overview

-Go to the [centralized GOVERNANCE.md](https://github.com/kubescape/project-governance/blob/main/GOVERNANCE.md)
+The Kubescape project is an open-source initiative dedicated to improve security and best practices in Kubernetes environments. This document outlines the governance structure of the Kubescape project and provides guidance for its community contributors.
+
+## Code of Conduct
+
+The CNCF has defined its core values and norms in a [code of conduct](CODE_OF_CONDUCT.md). As a CNCF project, we require all participants in the Kubescape community to behave in line with the standards set out in that document.
+
+## Contributor roles
+
+### Community Members
+
+- Contribute to the project in any form.
+- Participate in discussions and provide feedback.
+
+Anyone can become a community member by contributing to the project. This can be in the form of code contributions, documentation, or any other form of project support.
+
+### Committers
+
+Committers are community members who have made significant and consistent contributions to the project. They have the ability to merge minor pull requests if assigned by maintainers.
+
+- Review and merge minor pull requests.
+- Assist maintainers in project tasks.
+- Promote best practices within the community.
+
+A contributor can be proposed as a committer by any existing maintainer. The proposal will be reviewed and voted on by the existing maintainers.
+
+### Maintainers
+
+Maintainers are responsible for the smooth operation of the project. They review and merge pull requests, manage releases, and ensure the quality and stability of the codebase.
+
+- Ensure the quality and stability of the project.
+- Resolve conflicts.
+- Provide direction and set priorities for the project.
+
+Maintainers are chosen based on their ongoing contributions and their demonstrated commitment to the project.
+
+- Any committer who had at least 5 code contribution in the past 12 month can submit themselves to join the maintainer team. The maintainers will appoint members by a majority vote.
+- Maintainers who have not taken part in project work (code, reviews, discussions) in the past 12 months will be considered inactive, and may be removed from the maintainer team.
+
+## Processes
+
+### Proposing Changes
+
+1. Open an issue on the project repository to discuss the proposed change.
+2. Once there is consensus around the proposed change, create a pull request.
+3. Pull requests will be reviewed by committers and/or maintainers.
+4. Once the pull request has received approval, it can be merged into the main codebase.
+
+### Conflict Resolution
+
+1. In case of any conflicts, it is primarily the responsibility of the parties involved to resolve it.
+2. If the conflict cannot be resolved, it will be escalated to the maintainers for resolution.
+3. Maintainers' decision will be final in case of unresolved conflicts.
+
+## Changes to the Governance Document
+
+Proposed changes to this governance document should follow the same process as any other code change to the Kubescape project (see "Proposing Changes").
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -1,5 +1,12 @@
 # Maintainers

-The Kubescape project manages this document in the central project repository.
+The following table lists the Kubescape project core maintainers:

-Go to the [centralized MAINTAINERS.md](https://github.com/kubescape/project-governance/blob/main/MAINTAINERS.md)
+| Name | GitHub | Organization
+| --- | --- | --- 
+| [Matthias Bertschy](https://www.linkedin.com/in/matthias-bertschy-b427b815/) | [@matthyx](https://github.com/matthyx) | [ARMO](https://www.armosec.io/)
+| [Craig Box](https://www.linkedin.com/in/crbnz/) | [@craigbox](https://github.com/craigbox) | [Solo.io](https://www.solo.io/)
+| [Ben Hirschberg](https://www.linkedin.com/in/benyamin-ben-hirschberg-66141890) | [@slashben](https://github.com/slashben) | [ARMO](https://www.armosec.io/)
+| [Rotem Refael](https://www.linkedin.com/in/rotem-refael) | [@rotemamsa](https://github.com/rotemamsa) | [ARMO](https://www.armosec.io/)
+| [David Wertenteil](https://www.linkedin.com/in/david-wertenteil-0ba277b9) | [@dwertent](https://github.com/dwertent) | [Kaleido](https://kaleido.io/)
+| [Amir Malka](https://www.linkedin.com/in/amirmalka) | [@amirmalka](https://github.com/amirmalka) | [ARMO](https://www.armosec.io/)
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![Go Report Card](https://goreportcard.com/badge/github.com/kubescape/kubescape)](https://goreportcard.com/report/github.com/kubescape/kubescape)
 [![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/kubescape/kubescape)
 [![GitHub](https://img.shields.io/github/license/kubescape/kubescape)](https://github.com/kubescape/kubescape/blob/master/LICENSE)
-[![CNCF](https://shields.io/badge/CNCF-Incubating%20project-blue?logo=linux-foundation&style=flat)](https://landscape.cncf.io/?item=provisioning--security-compliance--kubescape)
+[![CNCF](https://shields.io/badge/CNCF-Sandbox%20project-blue?logo=linux-foundation&style=flat)](https://landscape.cncf.io/card-mode?project=sandbox&selected=kubescape)
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/kubescape)](https://artifacthub.io/packages/search?repo=kubescape)
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fkubescape%2Fkubescape.svg?type=shield&issueType=license)](https://app.fossa.com/projects/git%2Bgithub.com%2Fkubescape%2Fkubescape?ref=badge_shield&issueType=license)
 [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/6944/badge)](https://www.bestpractices.dev/projects/6944)
@@ -22,11 +22,23 @@

 _Comprehensive Kubernetes Security from Development to Runtime_

-Kubescape is an open-source Kubernetes security platform that provides comprehensive security coverage, from left to right across the entire development and deployment lifecycle. It offers hardening, posture management, and runtime security capabilities to ensure robust protection for Kubernetes environments. It saves Kubernetes users and admins precious time, effort, and resources.
+Kubescape is an open-source Kubernetes security platform that provides comprehensive security coverage from left to right across the entire development and deployment lifecycle. It offers hardening, posture management, and runtime security capabilities to ensure robust protection for Kubernetes environments.

-Kubescape scans clusters, YAML files, and Helm charts. It detects misconfigurations according to multiple frameworks (including [NSA-CISA](https://www.armosec.io/blog/kubernetes-hardening-guidance-summary-by-armo/?utm_source=github&utm_medium=repository), [MITRE ATT&CK®](https://www.armosec.io/glossary/mitre-attck-framework/?utm_source=github&utm_medium=repository) and the [CIS Benchmark](https://www.armosec.io/blog/cis-kubernetes-benchmark-framework-scanning-tools-comparison/?utm_source=github&utm_medium=repository)).
+**Key features of Kubescape include**

-Kubescape was created by [ARMO](https://www.armosec.io/?utm_source=github&utm_medium=repository) and is a [Cloud Native Computing Foundation (CNCF) incubating project](https://www.cncf.io/projects/).
+* **Shift-left security**: Kubescape enables developers to scan for misconfigurations as early as the manifest file submission stage, promoting a proactive approach to security.  
+* **IDE and CI/CD integration**: The tool integrates seamlessly with popular IDEs like VSCode and Lens, as well as CI/CD platforms such as GitHub and GitLab, allowing for security checks throughout the development process.
+* **Cluster scanning**: Kubescape can scan active Kubernetes clusters for vulnerabilities, misconfigurations, and security issues
+* **Multiple framework support**: Kubescape can test against various security frameworks, including NSA, MITRE, SOC2, and more.
+* **YAML and Helm chart validation**: The tool checks YAML files and Helm charts for correct configuration according to the frameworks above, without requiring an active cluster.
+* **Kubernetes hardening**: Kubescape ensures proactive identification and rapid remediation of misconfigurations and vulnerabilities through manual, recurring, or event-triggered scans.
+* **Runtime security**: Kubescape extends its protection to the runtime environment, providing continuous monitoring and threat detection for deployed applications.
+* **Compliance management**: The tool aids in maintaining compliance with recognized frameworks and standards, simplifying the process of meeting regulatory requirements.
+* **Multi-cloud support**: Kubescape offers frictionless security across various cloud providers and Kubernetes distributions.
+
+By providing this comprehensive security coverage from development to production, Kubescape enables organizations to implement a robust security posture throughout their Kubernetes deployment, addressing potential vulnerabilities and threats at every stage of the application lifecycle.
+
+Kubescape was created by [ARMO](https://www.armosec.io/?utm_source=github&utm_medium=repository) and is a [Cloud Native Computing Foundation (CNCF) sandbox project](https://www.cncf.io/sandbox-projects/).

 _Please [star ⭐](https://github.com/kubescape/kubescape/stargazers) the repo if you want us to continue developing and improving Kubescape! 😀_

@@ -68,10 +80,9 @@ Kubescape can be used as a GitHub Action. This is a great way to integrate Kubes

 ## Under the hood

-Kubescape uses [Open Policy Agent](https://github.com/open-policy-agent/opa) to verify Kubernetes objects against [a library of posture controls](https://github.com/kubescape/regolibrary).
-For image scanning, it uses [Grype](https://github.com/anchore/grype).  
-For image patching, it uses [Copacetic](https://github.com/project-copacetic/copacetic).
-For eBPF, it uses [Inspektor Gadget](https://github.com/inspektor-gadget)
+Kubescape uses [Open Policy Agent](https://github.com/open-policy-agent/opa) to verify Kubernetes objects against [a library of posture controls](https://github.com/kubescape/regolibrary). Kubescape retrieves Kubernetes resources from the API server and runs a set of [Rego snippets](https://www.openpolicyagent.org/docs/latest/policy-language/) developed by [ARMO](https://www.armosec.io?utm_source=github&utm_medium=repository).
+
+Container image scanning is powered by [Grype](https://github.com/anchore/grype) and image patching uses [Copacetic](https://github.com/project-copacetic/copacetic).

 By default, CLI scan results are printed in a console-friendly manner, but they can be:

@@ -85,20 +96,28 @@ By default, CLI scan results are printed in a console-friendly manner, but they

 ## Community

-Kubescape is an open source project. We welcome your feedback and ideas for improvement. We are part of the CNCF community and are evolving Kubescape in sync with the security needs of Kubernetes users. To learn more about where Kubescape is heading, please check out our [ROADMAP](https://github.com/kubescape/project-governance/blob/main/ROADMAP.md).
+We welcome user feedback and ideas for improvement.

-If you feel inspired to contribute to Kubescape, check out our [CONTRIBUTING](https://github.com/kubescape/project-governance/blob/main/CONTRIBUTING.md) file to learn how. You can find the issues we are working on (triage to development) on the [Kubescaping board](https://github.com/orgs/kubescape/projects/4/views/1)
+Kubescape users and developers meet on the CNCF Slack. [Join it](https://slack.cncf.io/) and find us in [#kubescape](https://cloud-native.slack.com/archives/C04EY3ZF9GE) or [#kubescape-dev](https://cloud-native.slack.com/archives/C04GY6H082K).

-* Feel free to pick a task from the [board](https://github.com/orgs/kubescape/projects/4) or suggest a feature of your own.
-* Open an issue on the board. We aim to respond to all issues within 48 hours.
-* [Join the CNCF Slack](https://slack.cncf.io/) and then our [users](https://cloud-native.slack.com/archives/C04EY3ZF9GE) or [developers](https://cloud-native.slack.com/archives/C04GY6H082K) channel.
+We hold [community meetings](https://zoom.us/j/95174063585) on Zoom, every second Tuesday, at 15:00 CET. ([See that in your local time zone](https://time.is/compare/1500_in_CET). 
+
+* Meetings are announced in [#kubescape-dev](https://cloud-native.slack.com/archives/C04GY6H082K) on Slack (including any cancellations).
+* [The agenda and notes are in a public Google doc](https://docs.google.com/document/d/1X_eyhPzJvb4ascVQ2e0jN87LAvq7lTuXT5d4gQxi8us/edit?tab=t.0).
+* [Recordings are posted to YouTube](https://www.youtube.com/@kubescape).

 The Kubescape project follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).

-For more information about the Kubescape community, please visit [COMMUNITY](https://github.com/kubescape/project-governance/blob/main/COMMUNITY.md).
+### Adopters

+See [here](ADOPTERS.md) for a list of reference adopters.

-We would like to take this opportunity to thank all our contibutors to date.
+### Contributions
+
+Thanks to all our contributors!  Check out our [CONTRIBUTING](CONTRIBUTING.md) file to learn how to join them.
+
+* Feel free to pick a task from the [issues](https://github.com/kubescape/kubescape/issues?q=is%3Aissue+is%3Aopen+label%3A%22open+for+contribution%22), [roadmap](docs/roadmap.md) or suggest a feature of your own.
+* [Open an issue](https://github.com/kubescape/kubescape/issues/new/choose): we aim to respond to all issues within 48 hours.

 <br>

@@ -112,10 +131,10 @@ Kubescape changes are tracked on the [release](https://github.com/kubescape/kube

 ## License

-Copyright 2021-2025, the Kubescape Authors. All rights reserved. Kubescape is released under the Apache 2.0 license. See the [LICENSE](LICENSE) file for details.
+Copyright 2021-2024, the Kubescape Authors. All rights reserved. Kubescape is released under the Apache 2.0 license. See the [LICENSE](LICENSE) file for details.

-Kubescape is a [Cloud Native Computing Foundation (CNCF) incubating project](https://www.cncf.io/projects/kubescape/) and was contributed by [ARMO](https://www.armosec.io/?utm_source=github&utm_medium=repository).
+Kubescape is a [Cloud Native Computing Foundation (CNCF) sandbox project](https://www.cncf.io/sandbox-projects/) and was contributed by [ARMO](https://www.armosec.io/?utm_source=github&utm_medium=repository).

 <div align="center">
-    <img src="https://raw.githubusercontent.com/cncf/artwork/refs/heads/main/other/cncf-member/incubating/color/cncf-incubating-color.svg" width="300" alt="CNCF Incubating Project">
+    <img src="https://raw.githubusercontent.com/cncf/artwork/master/other/cncf-sandbox/horizontal/color/cncf-sandbox-horizontal-color.svg" width="300" alt="CNCF Sandbox Project">
 </div>
--- a/SECURITY-INSIGHTS.yml
+++ b/SECURITY-INSIGHTS.yml
@@ -4,19 +4,15 @@ header:
  last-reviewed: '2023-10-12'
  expiration-date: '2024-10-12T01:00:00.000Z'
  project-url: https://github.com/kubescape/kubescape/
-  project-release: 1.0.0
+  project-release: '1.0.0'
 project-lifecycle:
  status: active
  bug-fixes-only: false
  core-maintainers:
-  - github:amirmalka
-  - github:amitschendel
-  - github:bezbran
-  - github:craigbox
-  - github:dwertent
-  - github:matthyx
-  - github:rotemamsa
  - github:slashben
+  - github:craigbox
+  - github:matthyx
+  - github:dwertent
 contribution-policy:
  accepts-pull-requests: true
  accepts-automated-pull-requests: false
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,5 +1,7 @@
-# Security
+# Reporting Security Issues

-The Kubescape project manages this document in the central project repository.
+To report a security issue or vulnerability, submit a [private vulnerability report via GitHub](https://github.com/kubescape/kubescape/security/advisories/new) to the repository maintainers with a description of the issue, the steps you took to create the issue, affected versions, and, if known, mitigations for the issue.

-Go to the [centralized SECURITY.md](https://github.com/kubescape/project-governance/blob/main/SECURITY.md)
+The maintainers will respond within 7 working days of your report. If the issue is confirmed as a vulnerability, we will open a Security Advisory and acknowledge your contributions as part of it. This project follows a 90 day disclosure timeline.
+
+Other contacts: cncf-kubescape-maintainers@lists.cncf.io
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -8,10 +8,6 @@ RUN --mount=target=. \
    --mount=type=cache,target=/root/.cache/go-build \
    --mount=type=cache,target=/go/pkg \
    cd httphandler && GOOS=$TARGETOS GOARCH=$TARGETARCH go build -o /out/ksserver .
-RUN --mount=target=. \
-    --mount=type=cache,target=/root/.cache/go-build \
-    --mount=type=cache,target=/go/pkg \
-    go run downloader/main.go

 FROM gcr.io/distroless/static-debian12:nonroot

@@ -19,7 +15,6 @@ USER nonroot
 WORKDIR /home/nonroot/

 COPY --from=builder /out/ksserver /usr/bin/ksserver
-COPY --from=builder /root/.kubescape /home/nonroot/.kubescape

 ARG image_version client
 ENV RELEASE=$image_version CLIENT=$client
--- a/build/kubescape-cli.Dockerfile
+++ b/build/kubescape-cli.Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/distroless/static-debian12:debug-nonroot
+FROM gcr.io/distroless/base-debian12:debug-nonroot

 USER nonroot
 WORKDIR /home/nonroot/
--- a/cmd/config/delete.go
+++ b/cmd/config/delete.go
@@ -1,6 +1,8 @@
 package config

 import (
+	"context"
+
 	"github.com/kubescape/go-logger"
 	"github.com/kubescape/kubescape/v3/core/meta"
 	v1 "github.com/kubescape/kubescape/v3/core/meta/datastructures/v1"
@@ -13,7 +15,7 @@ func getDeleteCmd(ks meta.IKubescape) *cobra.Command {
 		Short: "Delete cached configurations",
 		Long:  ``,
 		Run: func(cmd *cobra.Command, args []string) {
-			if err := ks.DeleteCachedConfig(&v1.DeleteConfig{}); err != nil {
+			if err := ks.DeleteCachedConfig(context.TODO(), &v1.DeleteConfig{}); err != nil {
 				logger.L().Fatal(err.Error())
 			}
 		},
--- a/cmd/download/download.go
+++ b/cmd/download/download.go
@@ -1,9 +1,9 @@
 package download

 import (
+	"context"
 	"fmt"
 	"path/filepath"
-	"slices"
 	"strings"

 	"github.com/kubescape/go-logger"
@@ -12,6 +12,7 @@ import (
 	"github.com/kubescape/kubescape/v3/core/meta"
 	v1 "github.com/kubescape/kubescape/v3/core/meta/datastructures/v1"
 	"github.com/spf13/cobra"
+	"golang.org/x/exp/slices"
 )

 var (
@@ -73,9 +74,11 @@ func GetDownloadCmd(ks meta.IKubescape) *cobra.Command {

 			downloadInfo.Target = args[0]
 			if len(args) >= 2 {
+
 				downloadInfo.Identifier = args[1]
+
 			}
-			if err := ks.Download(&downloadInfo); err != nil {
+			if err := ks.Download(context.TODO(), &downloadInfo); err != nil {
 				logger.L().Fatal(err.Error())
 			}
 			return nil
--- a/cmd/fix/fix.go
+++ b/cmd/fix/fix.go
@@ -1,12 +1,14 @@
 package fix

 import (
+	"context"
 	"errors"
 	"fmt"

 	"github.com/kubescape/kubescape/v3/core/cautils"
 	"github.com/kubescape/kubescape/v3/core/meta"
 	metav1 "github.com/kubescape/kubescape/v3/core/meta/datastructures/v1"
+
 	"github.com/spf13/cobra"
 )

@@ -34,7 +36,7 @@ func GetFixCmd(ks meta.IKubescape) *cobra.Command {
 			}
 			fixInfo.ReportFile = args[0]

-			return ks.Fix(&fixInfo)
+			return ks.Fix(context.TODO(), &fixInfo)
 		},
 	}

--- a/cmd/list/list.go
+++ b/cmd/list/list.go
@@ -1,9 +1,9 @@
 package list

 import (
+	"context"
 	"errors"
 	"fmt"
-	"slices"
 	"strings"

 	"github.com/kubescape/go-logger"
@@ -12,6 +12,7 @@ import (
 	"github.com/kubescape/kubescape/v3/core/meta"
 	v1 "github.com/kubescape/kubescape/v3/core/meta/datastructures/v1"
 	"github.com/spf13/cobra"
+	"golang.org/x/exp/slices"
 )

 var (
@@ -61,7 +62,7 @@ func GetListCmd(ks meta.IKubescape) *cobra.Command {

 			listPolicies.Target = args[0]

-			if err := ks.List(&listPolicies); err != nil {
+			if err := ks.List(context.TODO(), &listPolicies); err != nil {
 				logger.L().Fatal(err.Error())
 			}
 			return nil
--- a/cmd/operator/operator.go
+++ b/cmd/operator/operator.go
@@ -6,6 +6,7 @@ import (

 	"github.com/kubescape/kubescape/v3/core/cautils"
 	"github.com/kubescape/kubescape/v3/core/meta"
+
 	"github.com/spf13/cobra"
 )

--- a/cmd/patch/patch.go
+++ b/cmd/patch/patch.go
@@ -1,18 +1,21 @@
 package patch

 import (
+	"context"
 	"errors"
 	"fmt"
 	"strings"
 	"time"

 	"github.com/docker/distribution/reference"
+
 	"github.com/kubescape/go-logger"
 	"github.com/kubescape/kubescape/v3/cmd/shared"
 	"github.com/kubescape/kubescape/v3/core/cautils"
 	"github.com/kubescape/kubescape/v3/core/meta"
 	metav1 "github.com/kubescape/kubescape/v3/core/meta/datastructures/v1"
 	"github.com/kubescape/kubescape/v3/pkg/imagescan"
+
 	"github.com/spf13/cobra"
 )

@@ -49,7 +52,7 @@ func GetPatchCmd(ks meta.IKubescape) *cobra.Command {
 				return err
 			}

-			results, err := ks.Patch(&patchInfo, &scanInfo)
+			results, err := ks.Patch(context.Background(), &patchInfo, &scanInfo)
 			if err != nil {
 				return err
 			}
--- a/cmd/prerequisites/prerequisites.go
+++ b/cmd/prerequisites/prerequisites.go
@@ -1,51 +0,0 @@
-package prerequisites
-
-import (
-	"github.com/kubescape/go-logger"
-	"github.com/kubescape/go-logger/helpers"
-	"github.com/kubescape/kubescape/v3/core/meta"
-	"github.com/kubescape/sizing-checker/pkg/checks/connectivitycheck"
-	"github.com/kubescape/sizing-checker/pkg/checks/ebpfcheck"
-	"github.com/kubescape/sizing-checker/pkg/checks/pvcheck"
-	"github.com/kubescape/sizing-checker/pkg/checks/sizing"
-	"github.com/kubescape/sizing-checker/pkg/common"
-	"github.com/spf13/cobra"
-)
-
-func GetPreReqCmd(ks meta.IKubescape) *cobra.Command {
-	var kubeconfigPath *string
-
-	// preReqCmd represents the prerequisites command
-	preReqCmd := &cobra.Command{
-		Use:   "prerequisites",
-		Short: "Check prerequisites for installing Kubescape Operator",
-		Run: func(cmd *cobra.Command, args []string) {
-			clientSet, inCluster := common.BuildKubeClient(*kubeconfigPath)
-			if clientSet == nil {
-				logger.L().Fatal("Could not create kube client. Exiting.")
-			}
-
-			// 1) Collect cluster data
-			clusterData, err := common.CollectClusterData(ks.Context(), clientSet)
-			if err != nil {
-				logger.L().Error("Failed to collect cluster data", helpers.Error(err))
-			}
-
-			// 2) Run checks
-			sizingResult := sizing.RunSizingChecker(clusterData)
-			pvResult := pvcheck.RunPVProvisioningCheck(ks.Context(), clientSet, clusterData, inCluster)
-			connectivityResult := connectivitycheck.RunConnectivityChecks(ks.Context(), clientSet, clusterData, inCluster)
-			ebpfResult := ebpfcheck.RunEbpfCheck(ks.Context(), clientSet, clusterData, inCluster)
-
-			// 3) Build and export the final ReportData
-			finalReport := common.BuildReportData(clusterData, sizingResult, pvResult, connectivityResult, ebpfResult)
-			finalReport.InCluster = inCluster
-
-			common.GenerateOutput(finalReport, inCluster)
-		},
-	}
-
-	kubeconfigPath = preReqCmd.PersistentFlags().String("kubeconfig", "", "Path to the kubeconfig file. If not set, in-cluster config is used or $HOME/.kube/config if outside a cluster.")
-
-	return preReqCmd
-}
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -1,7 +1,6 @@
 package cmd

 import (
-	"context"
 	"fmt"
 	"strings"

@@ -15,7 +14,6 @@ import (
 	"github.com/kubescape/kubescape/v3/cmd/list"
 	"github.com/kubescape/kubescape/v3/cmd/operator"
 	"github.com/kubescape/kubescape/v3/cmd/patch"
-	"github.com/kubescape/kubescape/v3/cmd/prerequisites"
 	"github.com/kubescape/kubescape/v3/cmd/scan"
 	"github.com/kubescape/kubescape/v3/cmd/update"
 	"github.com/kubescape/kubescape/v3/cmd/vap"
@@ -24,6 +22,7 @@ import (
 	"github.com/kubescape/kubescape/v3/core/cautils/getter"
 	"github.com/kubescape/kubescape/v3/core/core"
 	"github.com/kubescape/kubescape/v3/core/meta"
+
 	"github.com/spf13/cobra"
 )

@@ -43,8 +42,8 @@ var ksExamples = fmt.Sprintf(`
  %[1]s config view
 `, cautils.ExecName())

-func NewDefaultKubescapeCommand(ctx context.Context) *cobra.Command {
-	ks := core.NewKubescape(ctx)
+func NewDefaultKubescapeCommand() *cobra.Command {
+	ks := core.NewKubescape()
 	return getRootCmd(ks)
 }

@@ -85,6 +84,8 @@ func getRootCmd(ks meta.IKubescape) *cobra.Command {

 	rootCmd.PersistentFlags().StringVarP(&rootInfo.Logger, "logger", "l", helpers.InfoLevel.String(), fmt.Sprintf("Logger level. Supported: %s [$KS_LOGGER]", strings.Join(helpers.SupportedLevels(), "/")))
 	rootCmd.PersistentFlags().StringVar(&rootInfo.CacheDir, "cache-dir", getter.DefaultLocalStore, "Cache directory [$KS_CACHE_DIR]")
+	rootCmd.PersistentFlags().BoolVarP(&rootInfo.DisableColor, "disable-color", "", false, "Disable color output for logging")
+	rootCmd.PersistentFlags().BoolVarP(&rootInfo.EnableColor, "enable-color", "", false, "Force enable color output for logging")

 	rootCmd.PersistentFlags().StringVarP(&rootInfo.KubeContext, "kube-context", "", "", "Kube context. Default will use the current-context")
 	// Supported commands
@@ -92,14 +93,13 @@ func getRootCmd(ks meta.IKubescape) *cobra.Command {
 	rootCmd.AddCommand(download.GetDownloadCmd(ks))
 	rootCmd.AddCommand(list.GetListCmd(ks))
 	rootCmd.AddCommand(completion.GetCompletionCmd())
-	rootCmd.AddCommand(version.GetVersionCmd(ks))
+	rootCmd.AddCommand(version.GetVersionCmd())
 	rootCmd.AddCommand(config.GetConfigCmd(ks))
-	rootCmd.AddCommand(update.GetUpdateCmd(ks))
+	rootCmd.AddCommand(update.GetUpdateCmd())
 	rootCmd.AddCommand(fix.GetFixCmd(ks))
 	rootCmd.AddCommand(patch.GetPatchCmd(ks))
 	rootCmd.AddCommand(vap.GetVapHelperCmd())
 	rootCmd.AddCommand(operator.GetOperatorCmd(ks))
-	rootCmd.AddCommand(prerequisites.GetPreReqCmd(ks))

 	// deprecated commands
 	rootCmd.AddCommand(&cobra.Command{
@@ -114,7 +114,7 @@ func getRootCmd(ks meta.IKubescape) *cobra.Command {
 	return rootCmd
 }

-func Execute(ctx context.Context) error {
-	ks := NewDefaultKubescapeCommand(ctx)
+func Execute() error {
+	ks := NewDefaultKubescapeCommand()
 	return ks.Execute()
 }
--- a/cmd/rootutils.go
+++ b/cmd/rootutils.go
@@ -14,10 +14,14 @@ import (
 	"github.com/kubescape/go-logger/zaplogger"
 	"github.com/kubescape/kubescape/v3/core/cautils"
 	"github.com/kubescape/kubescape/v3/core/cautils/getter"
+
 	"github.com/mattn/go-isatty"
 )

 func initLogger() {
+	logger.DisableColor(rootInfo.DisableColor)
+	logger.EnableColor(rootInfo.EnableColor)
+
 	if rootInfo.LoggerName == "" {
 		if l := os.Getenv("KS_LOGGER_NAME"); l != "" {
 			rootInfo.LoggerName = l
@@ -31,8 +35,8 @@ func initLogger() {
 	}

 	logger.InitLogger(rootInfo.LoggerName)
-}

+}
 func initLoggerLevel() {
 	if rootInfo.Logger == helpers.InfoLevel.String() {
 	} else if l := os.Getenv("KS_LOGGER"); l != "" {
--- a/cmd/scan/control.go
+++ b/cmd/scan/control.go
@@ -1,17 +1,20 @@
 package scan

 import (
+	"context"
 	"fmt"
 	"io"
 	"os"
 	"strings"

+	apisv1 "github.com/kubescape/opa-utils/httpserver/apis/v1"
+
 	"github.com/kubescape/go-logger"
 	"github.com/kubescape/go-logger/helpers"
 	"github.com/kubescape/kubescape/v3/cmd/shared"
 	"github.com/kubescape/kubescape/v3/core/cautils"
 	"github.com/kubescape/kubescape/v3/core/meta"
-	apisv1 "github.com/kubescape/opa-utils/httpserver/apis/v1"
+
 	"github.com/spf13/cobra"
 )

@@ -95,11 +98,12 @@ func getControlCmd(ks meta.IKubescape, scanInfo *cautils.ScanInfo) *cobra.Comman
 				return err
 			}

-			results, err := ks.Scan(scanInfo)
+			ctx := context.TODO()
+			results, err := ks.Scan(ctx, scanInfo)
 			if err != nil {
 				logger.L().Fatal(err.Error())
 			}
-			if err := results.HandleResults(ks.Context()); err != nil {
+			if err := results.HandleResults(ctx); err != nil {
 				logger.L().Fatal(err.Error())
 			}
 			if !scanInfo.VerboseMode {
--- a/cmd/scan/framework.go
+++ b/cmd/scan/framework.go
@@ -1,22 +1,25 @@
 package scan

 import (
+	"context"
 	"errors"
 	"fmt"
 	"io"
 	"os"
-	"slices"
 	"strings"

+	apisv1 "github.com/kubescape/opa-utils/httpserver/apis/v1"
+	reporthandlingapis "github.com/kubescape/opa-utils/reporthandling/apis"
+	"github.com/kubescape/opa-utils/reporthandling/results/v1/reportsummary"
+	"golang.org/x/exp/slices"
+
 	"github.com/kubescape/go-logger"
 	"github.com/kubescape/go-logger/helpers"
 	"github.com/kubescape/kubescape/v3/cmd/shared"
 	"github.com/kubescape/kubescape/v3/core/cautils"
 	"github.com/kubescape/kubescape/v3/core/cautils/getter"
 	"github.com/kubescape/kubescape/v3/core/meta"
-	apisv1 "github.com/kubescape/opa-utils/httpserver/apis/v1"
-	reporthandlingapis "github.com/kubescape/opa-utils/reporthandling/apis"
-	"github.com/kubescape/opa-utils/reporthandling/results/v1/reportsummary"
+
 	"github.com/spf13/cobra"
 )

@@ -112,12 +115,13 @@ func getFrameworkCmd(ks meta.IKubescape, scanInfo *cautils.ScanInfo) *cobra.Comm

 			scanInfo.SetPolicyIdentifiers(frameworks, apisv1.KindFramework)

-			results, err := ks.Scan(scanInfo)
+			ctx := context.TODO()
+			results, err := ks.Scan(ctx, scanInfo)
 			if err != nil {
 				logger.L().Fatal(err.Error())
 			}

-			if err = results.HandleResults(ks.Context()); err != nil {
+			if err = results.HandleResults(ctx); err != nil {
 				logger.L().Fatal(err.Error())
 			}

--- a/cmd/scan/image.go
+++ b/cmd/scan/image.go
@@ -1,6 +1,7 @@
 package scan

 import (
+	"context"
 	"fmt"

 	"github.com/kubescape/go-logger"
@@ -9,6 +10,7 @@ import (
 	"github.com/kubescape/kubescape/v3/core/meta"
 	metav1 "github.com/kubescape/kubescape/v3/core/meta/datastructures/v1"
 	"github.com/kubescape/kubescape/v3/pkg/imagescan"
+
 	"github.com/spf13/cobra"
 )

@@ -23,17 +25,12 @@ var (
  # Scan the 'nginx' image and see the full report 
  %[1]s scan image "nginx" -v

-  # Scan the 'nginx' image and use exceptions
-  %[1]s scan image "nginx" --exceptions exceptions.json
-
 `, cautils.ExecName())
 )

 // getImageCmd returns the scan image command
 func getImageCmd(ks meta.IKubescape, scanInfo *cautils.ScanInfo) *cobra.Command {
 	var imgCredentials shared.ImageCredentials
-	var exceptions string
-
 	cmd := &cobra.Command{
 		Use:     "image <image>:<tag> [flags]",
 		Short:   "Scan an image for vulnerabilities",
@@ -54,13 +51,12 @@ func getImageCmd(ks meta.IKubescape, scanInfo *cautils.ScanInfo) *cobra.Command
 			}

 			imgScanInfo := &metav1.ImageScanInfo{
-				Image:      args[0],
-				Username:   imgCredentials.Username,
-				Password:   imgCredentials.Password,
-				Exceptions: exceptions,
+				Image:    args[0],
+				Username: imgCredentials.Username,
+				Password: imgCredentials.Password,
 			}

-			results, err := ks.ScanImage(imgScanInfo, scanInfo)
+			results, err := ks.ScanImage(context.Background(), imgScanInfo, scanInfo)
 			if err != nil {
 				return err
 			}
@@ -73,8 +69,6 @@ func getImageCmd(ks meta.IKubescape, scanInfo *cautils.ScanInfo) *cobra.Command
 		},
 	}

-	// The exceptions flag
-	cmd.PersistentFlags().StringVarP(&exceptions, "exceptions", "", "", "Path to the exceptions file")
 	cmd.PersistentFlags().StringVarP(&imgCredentials.Username, "username", "u", "", "Username for registry login")
 	cmd.PersistentFlags().StringVarP(&imgCredentials.Password, "password", "p", "", "Password for registry login")

--- a/cmd/scan/scan.go
+++ b/cmd/scan/scan.go
@@ -1,6 +1,7 @@
 package scan

 import (
+	"context"
 	"flag"
 	"fmt"
 	"strings"
@@ -63,8 +64,6 @@ func GetScanCommand(ks meta.IKubescape) *cobra.Command {
 		},
 	}

-	scanInfo.TriggeredByCLI = true
-
 	scanCmd.PersistentFlags().StringVarP(&scanInfo.AccountID, "account", "", "", "Kubescape SaaS account ID. Default will load account ID from cache")
 	scanCmd.PersistentFlags().StringVarP(&scanInfo.AccessKey, "access-key", "", "", "Kubescape SaaS access key. Default will load access key from cache")
 	scanCmd.PersistentFlags().StringVar(&scanInfo.ControlsInputs, "controls-config", "", "Path to an controls-config obj. If not set will download controls-config from ARMO management portal")
@@ -134,12 +133,15 @@ func setSecurityViewScanInfo(args []string, scanInfo *cautils.ScanInfo) {
 }

 func securityScan(scanInfo cautils.ScanInfo, ks meta.IKubescape) error {
-	results, err := ks.Scan(&scanInfo)
+
+	ctx := context.TODO()
+
+	results, err := ks.Scan(ctx, &scanInfo)
 	if err != nil {
 		return err
 	}

-	if err = results.HandleResults(ks.Context()); err != nil {
+	if err = results.HandleResults(ctx); err != nil {
 		return err
 	}

--- a/cmd/scan/scan_test.go
+++ b/cmd/scan/scan_test.go
@@ -2,18 +2,20 @@ package scan

 import (
 	"context"
-	"os"
-	"reflect"
-	"testing"

 	"github.com/kubescape/go-logger/helpers"
+	"github.com/stretchr/testify/assert"
+
 	"github.com/kubescape/kubescape/v3/cmd/shared"
 	"github.com/kubescape/kubescape/v3/core/cautils"
 	"github.com/kubescape/kubescape/v3/core/mocks"
 	v1 "github.com/kubescape/opa-utils/httpserver/apis/v1"
 	"github.com/kubescape/opa-utils/reporthandling/apis"
 	"github.com/kubescape/opa-utils/reporthandling/results/v1/reportsummary"
-	"github.com/stretchr/testify/assert"
+
+	"os"
+	"reflect"
+	"testing"
 )

 func TestExceedsSeverity(t *testing.T) {
--- a/cmd/scan/workload.go
+++ b/cmd/scan/workload.go
@@ -1,6 +1,7 @@
 package scan

 import (
+	"context"
 	"errors"
 	"fmt"
 	"strings"
@@ -10,6 +11,7 @@ import (
 	"github.com/kubescape/kubescape/v3/core/meta"
 	v1 "github.com/kubescape/opa-utils/httpserver/apis/v1"
 	"github.com/kubescape/opa-utils/objectsenvelopes"
+
 	"github.com/spf13/cobra"
 )

@@ -65,12 +67,13 @@ func getWorkloadCmd(ks meta.IKubescape, scanInfo *cautils.ScanInfo) *cobra.Comma
 			setWorkloadScanInfo(scanInfo, kind, name)

 			// todo: add api version if provided
-			results, err := ks.Scan(scanInfo)
+			ctx := context.TODO()
+			results, err := ks.Scan(ctx, scanInfo)
 			if err != nil {
 				logger.L().Fatal(err.Error())
 			}

-			if err = results.HandleResults(ks.Context()); err != nil {
+			if err = results.HandleResults(ctx); err != nil {
 				logger.L().Fatal(err.Error())
 			}

--- a/cmd/update/update.go
+++ b/cmd/update/update.go
@@ -5,11 +5,10 @@ package update
 //          kubescape update

 import (
+	"context"
 	"fmt"
 	"strings"

-	"github.com/kubescape/kubescape/v3/core/meta"
-
 	"github.com/kubescape/backend/pkg/versioncheck"
 	"github.com/kubescape/go-logger"
 	"github.com/kubescape/go-logger/helpers"
@@ -26,18 +25,17 @@ var updateCmdExamples = fmt.Sprintf(`
  %[1]s update
 `, cautils.ExecName())

-func GetUpdateCmd(ks meta.IKubescape) *cobra.Command {
+func GetUpdateCmd() *cobra.Command {
 	updateCmd := &cobra.Command{
 		Use:     "update",
 		Short:   "Update to latest release version",
 		Long:    ``,
 		Example: updateCmdExamples,
 		RunE: func(_ *cobra.Command, args []string) error {
+			ctx := context.TODO()
 			v := versioncheck.NewVersionCheckHandler()
 			versionCheckRequest := versioncheck.NewVersionCheckRequest("", versioncheck.BuildNumber, "", "", "update", nil)
-			if err := v.CheckLatestVersion(ks.Context(), versionCheckRequest); err != nil {
-				return err
-			}
+			v.CheckLatestVersion(ctx, versionCheckRequest)

 			//Checking the user's version of kubescape to the latest release
 			if versioncheck.BuildNumber == "" || strings.Contains(versioncheck.BuildNumber, "rc") {
--- a/cmd/vap/vap.go
+++ b/cmd/vap/vap.go
@@ -9,10 +9,11 @@ import (

 	"github.com/kubescape/go-logger"
 	"github.com/kubescape/kubescape/v3/core/cautils"
+	"sigs.k8s.io/yaml"
+
 	"github.com/spf13/cobra"
 	admissionv1 "k8s.io/api/admissionregistration/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/yaml"
 )

 var vapHelperCmdExamples = fmt.Sprintf(`
--- a/cmd/version/version.go
+++ b/cmd/version/version.go
@@ -1,26 +1,23 @@
 package version

 import (
+	"context"
 	"fmt"

-	"github.com/kubescape/kubescape/v3/core/meta"
-
 	"github.com/kubescape/backend/pkg/versioncheck"
 	"github.com/spf13/cobra"
 )

-func GetVersionCmd(ks meta.IKubescape) *cobra.Command {
+func GetVersionCmd() *cobra.Command {
 	versionCmd := &cobra.Command{
 		Use:   "version",
 		Short: "Get current version",
 		Long:  ``,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			v := versioncheck.NewIVersionCheckHandler(ks.Context())
+			ctx := context.TODO()
+			v := versioncheck.NewIVersionCheckHandler(ctx)
 			versionCheckRequest := versioncheck.NewVersionCheckRequest("", versioncheck.BuildNumber, "", "", "version", nil)
-			if err := v.CheckLatestVersion(ks.Context(), versionCheckRequest); err != nil {
-				return err
-			}
-
+			v.CheckLatestVersion(ctx, versionCheckRequest)
 			fmt.Fprintf(cmd.OutOrStdout(),
 				"Your current version is: %s\n",
 				versionCheckRequest.ClientVersion,
--- a/cmd/version/version_test.go
+++ b/cmd/version/version_test.go
@@ -2,12 +2,9 @@ package version

 import (
 	"bytes"
-	"context"
 	"io"
 	"testing"

-	"github.com/kubescape/kubescape/v3/core/core"
-
 	"github.com/kubescape/backend/pkg/versioncheck"
 	"github.com/stretchr/testify/assert"
 )
@@ -33,8 +30,7 @@ func TestGetVersionCmd(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			versioncheck.BuildNumber = tt.buildNumber

-			ks := core.NewKubescape(context.TODO())
-			if cmd := GetVersionCmd(ks); cmd != nil {
+			if cmd := GetVersionCmd(); cmd != nil {
 				buf := bytes.NewBufferString("")
 				cmd.SetOut(buf)
 				cmd.Execute()
--- a/core/cautils/customerloader.go
+++ b/core/cautils/customerloader.go
@@ -7,6 +7,8 @@ import (
 	"path/filepath"
 	"regexp"

+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"github.com/google/uuid"
 	v1 "github.com/kubescape/backend/pkg/client/v1"
 	"github.com/kubescape/backend/pkg/servicediscovery"
@@ -17,7 +19,6 @@ import (
 	"github.com/kubescape/k8s-interface/k8sinterface"
 	"github.com/kubescape/kubescape/v3/core/cautils/getter"
 	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

 const (
--- a/core/cautils/datastructures.go
+++ b/core/cautils/datastructures.go
@@ -59,7 +59,6 @@ type OPASessionObj struct {
 	SingleResourceScan    workloadinterface.IWorkload        // single resource scan
 	TopWorkloadsByScore   []reporthandling.IResource
 	TemplateMapping       map[string]MappingNodes // Map chart obj to template (only for rendering from path)
-	TriggeredByCLI        bool
 }

 func NewOPASessionObj(ctx context.Context, frameworks []reporthandling.Framework, k8sResources K8SResources, scanInfo *ScanInfo) *OPASessionObj {
@@ -76,7 +75,6 @@ func NewOPASessionObj(ctx context.Context, frameworks []reporthandling.Framework
 		SessionID:             scanInfo.ScanID,
 		Metadata:              scanInfoToScanMetadata(ctx, scanInfo),
 		OmitRawResources:      scanInfo.OmitRawResources,
-		TriggeredByCLI:        scanInfo.TriggeredByCLI,
 		TemplateMapping:       make(map[string]MappingNodes),
 	}
 }
--- a/core/cautils/datastructuresmethods.go
+++ b/core/cautils/datastructuresmethods.go
@@ -1,11 +1,12 @@
 package cautils

 import (
+	"golang.org/x/mod/semver"
+
 	"github.com/kubescape/backend/pkg/versioncheck"
 	"github.com/kubescape/opa-utils/reporthandling"
 	"github.com/kubescape/opa-utils/reporthandling/apis"
 	reporthandlingv2 "github.com/kubescape/opa-utils/reporthandling/v2"
-	"golang.org/x/mod/semver"
 )

 func NewPolicies() *Policies {
--- a/core/cautils/fileutils.go
+++ b/core/cautils/fileutils.go
@@ -7,14 +7,16 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"slices"
 	"strings"

-	"github.com/kubescape/go-logger"
 	"github.com/kubescape/go-logger/helpers"
 	"github.com/kubescape/k8s-interface/workloadinterface"
+	"golang.org/x/exp/slices"
+
+	"github.com/kubescape/go-logger"
 	"github.com/kubescape/opa-utils/objectsenvelopes"
 	"github.com/kubescape/opa-utils/objectsenvelopes/localworkload"
+
 	"gopkg.in/yaml.v3"
 )

--- a/core/cautils/getter/downloadreleasedpolicy.go
+++ b/core/cautils/getter/downloadreleasedpolicy.go
@@ -5,8 +5,10 @@ import (
 	"strings"

 	"github.com/armosec/armoapi-go/armotypes"
+
 	"github.com/kubescape/opa-utils/reporthandling"
 	"github.com/kubescape/opa-utils/reporthandling/attacktrack/v1alpha1"
+
 	"github.com/kubescape/regolibrary/v2/gitregostore"
 )

--- a/core/cautils/helmchart.go
+++ b/core/cautils/helmchart.go
@@ -9,6 +9,7 @@ import (
 	"github.com/kubescape/go-logger/helpers"
 	"github.com/kubescape/k8s-interface/workloadinterface"
 	"github.com/kubescape/opa-utils/objectsenvelopes/localworkload"
+
 	helmchart "helm.sh/helm/v3/pkg/chart"
 	helmloader "helm.sh/helm/v3/pkg/chart/loader"
 	helmchartutil "helm.sh/helm/v3/pkg/chartutil"
--- a/core/cautils/kustomizedirectory.go
+++ b/core/cautils/kustomizedirectory.go
@@ -8,6 +8,7 @@ import (
 	"github.com/kubescape/go-logger/helpers"
 	"github.com/kubescape/k8s-interface/workloadinterface"
 	"github.com/kubescape/opa-utils/objectsenvelopes/localworkload"
+
 	"sigs.k8s.io/kustomize/api/krusty"
 	"sigs.k8s.io/kustomize/kyaml/filesys"
 )
--- a/core/cautils/rbac.go
+++ b/core/cautils/rbac.go
@@ -4,9 +4,10 @@ import (
 	"encoding/json"
 	"time"

+	reporthandlingv2 "github.com/kubescape/opa-utils/reporthandling/v2"
+
 	"github.com/google/uuid"
 	"github.com/kubescape/k8s-interface/workloadinterface"
-	reporthandlingv2 "github.com/kubescape/opa-utils/reporthandling/v2"
 	"github.com/kubescape/rbac-utils/rbacscanner"
 	"github.com/kubescape/rbac-utils/rbacutils"
 )
--- a/core/cautils/rootinfo.go
+++ b/core/cautils/rootinfo.go
@@ -10,6 +10,8 @@ type RootInfo struct {
 	Logger             string // logger level
 	LoggerName         string // logger name ("pretty"/"zap"/"none")
 	CacheDir           string // cached dir
+	DisableColor       bool   // Disable Color
+	EnableColor        bool   // Force enable Color
 	DiscoveryServerURL string // Discovery Server URL  (See https://github.com/kubescape/backend/tree/main/pkg/servicediscovery)
 	KubeContext        string //  context name
 }
--- a/core/cautils/scaninfo.go
+++ b/core/cautils/scaninfo.go
@@ -8,7 +8,6 @@ import (
 	"path/filepath"
 	"strings"

-	"github.com/google/uuid"
 	"github.com/kubescape/backend/pkg/versioncheck"
 	giturl "github.com/kubescape/go-git-url"
 	"github.com/kubescape/go-logger"
@@ -19,6 +18,8 @@ import (
 	"github.com/kubescape/opa-utils/objectsenvelopes"
 	"github.com/kubescape/opa-utils/reporthandling"
 	reporthandlingv2 "github.com/kubescape/opa-utils/reporthandling/v2"
+
+	"github.com/google/uuid"
 )

 type ScanningContext string
@@ -134,7 +135,6 @@ type ScanInfo struct {
 	EnableRegoPrint       bool                         // true if print rego
 	ScanObject            *objectsenvelopes.ScanObject // identifies a single resource (k8s object) to be scanned
 	IsDeletedScanObject   bool                         // indicates whether the ScanObject is a deleted K8S resource
-	TriggeredByCLI        bool                         // indicates whether the scan was triggered by the CLI
 	ScanType              ScanTypes
 	ScanImages            bool
 	ChartPath             string
--- a/core/core/cachedconfig.go
+++ b/core/core/cachedconfig.go
@@ -1,6 +1,7 @@
 package core

 import (
+	"context"
 	"fmt"

 	"github.com/kubescape/kubescape/v3/core/cautils"
@@ -34,8 +35,8 @@ func (ks *Kubescape) ViewCachedConfig(viewConfig *metav1.ViewConfig) error {
 	return nil
 }

-func (ks *Kubescape) DeleteCachedConfig(deleteConfig *metav1.DeleteConfig) error {
+func (ks *Kubescape) DeleteCachedConfig(ctx context.Context, deleteConfig *metav1.DeleteConfig) error {

 	tenant := cautils.GetTenantConfig("", "", "", "", nil) // change k8sinterface
-	return tenant.DeleteCachedConfig(ks.Context())
+	return tenant.DeleteCachedConfig(ctx)
 }
--- a/core/core/download.go
+++ b/core/core/download.go
@@ -44,12 +44,12 @@ func DownloadSupportCommands() []string {
 	return commands
 }

-func (ks *Kubescape) Download(downloadInfo *metav1.DownloadInfo) error {
+func (ks *Kubescape) Download(ctx context.Context, downloadInfo *metav1.DownloadInfo) error {
 	setPathAndFilename(downloadInfo)
 	if err := os.MkdirAll(downloadInfo.Path, os.ModePerm); err != nil {
 		return err
 	}
-	if err := downloadArtifact(ks.Context(), downloadInfo, downloadFunc); err != nil {
+	if err := downloadArtifact(ctx, downloadInfo, downloadFunc); err != nil {
 		return err
 	}
 	return nil
--- a/core/core/fix.go
+++ b/core/core/fix.go
@@ -1,11 +1,13 @@
 package core

 import (
+	"context"
 	"fmt"
 	"strings"

 	"github.com/kubescape/go-logger"
 	metav1 "github.com/kubescape/kubescape/v3/core/meta/datastructures/v1"
+
 	"github.com/kubescape/kubescape/v3/core/pkg/fixhandler"
 )

@@ -15,14 +17,14 @@ const (
 	confirmationQuestion = "Would you like to apply the changes to the files above? [y|n]: "
 )

-func (ks *Kubescape) Fix(fixInfo *metav1.FixInfo) error {
+func (ks *Kubescape) Fix(ctx context.Context, fixInfo *metav1.FixInfo) error {
 	logger.L().Info("Reading report file...")
 	handler, err := fixhandler.NewFixHandler(fixInfo)
 	if err != nil {
 		return err
 	}

-	resourcesToFix := handler.PrepareResourcesToFix(ks.Context())
+	resourcesToFix := handler.PrepareResourcesToFix(ctx)

 	if len(resourcesToFix) == 0 {
 		logger.L().Info(noResourcesToFix)
@@ -41,12 +43,12 @@ func (ks *Kubescape) Fix(fixInfo *metav1.FixInfo) error {
 		return nil
 	}

-	updatedFilesCount, errors := handler.ApplyChanges(ks.Context(), resourcesToFix)
+	updatedFilesCount, errors := handler.ApplyChanges(ctx, resourcesToFix)
 	logger.L().Info(fmt.Sprintf("Fixed resources in %d files.", updatedFilesCount))

 	if len(errors) > 0 {
 		for _, err := range errors {
-			logger.L().Ctx(ks.Context()).Warning(err.Error())
+			logger.L().Ctx(ctx).Warning(err.Error())
 		}
 		return fmt.Errorf("Failed to fix some resources, check the logs for more details")
 	}
--- a/core/core/image_scan.go
+++ b/core/core/image_scan.go
@@ -1,11 +1,8 @@
 package core

 import (
-	"encoding/json"
+	"context"
 	"fmt"
-	"os"
-	"regexp"
-	"strings"

 	"github.com/anchore/grype/grype/presenter/models"
 	"github.com/kubescape/go-logger"
@@ -15,153 +12,7 @@ import (
 	"github.com/kubescape/kubescape/v3/pkg/imagescan"
 )

-// Data structure to represent attributes
-type Attributes struct {
-	Registry     string `json:"registry"`
-	Organization string `json:"organization,omitempty"`
-	ImageName    string `json:"imageName"`
-	ImageTag     string `json:"imageTag,omitempty"`
-}
-
-// Data structure for a target
-type Target struct {
-	DesignatorType string     `json:"designatorType"`
-	Attributes     Attributes `json:"attributes"`
-}
-
-// Data structure for metadata
-type Metadata struct {
-	Name string `json:"name"`
-}
-
-// Data structure for vulnerabilities and severities
-type VulnerabilitiesIgnorePolicy struct {
-	Metadata        Metadata `json:"metadata"`
-	Kind            string   `json:"kind"`
-	Targets         []Target `json:"targets"`
-	Vulnerabilities []string `json:"vulnerabilities"`
-	Severities      []string `json:"severities"`
-}
-
-// Loads excpetion policies from exceptions json object.
-func GetImageExceptionsFromFile(filePath string) ([]VulnerabilitiesIgnorePolicy, error) {
-	// Read the JSON file
-	jsonFile, err := os.ReadFile(filePath)
-	if err != nil {
-		return nil, fmt.Errorf("error reading exceptions file: %w", err)
-	}
-
-	// Unmarshal the JSON data into an array of VulnerabilitiesIgnorePolicy
-	var policies []VulnerabilitiesIgnorePolicy
-	err = json.Unmarshal(jsonFile, &policies)
-	if err != nil {
-		return nil, fmt.Errorf("error unmarshaling exceptions file: %w", err)
-	}
-
-	return policies, nil
-}
-
-// This function will identify the registry, organization and image tag from the image name
-func getAttributesFromImage(imgName string) (Attributes, error) {
-	canonicalImageName, err := cautils.NormalizeImageName(imgName)
-	if err != nil {
-		return Attributes{}, err
-	}
-
-	tokens := strings.Split(canonicalImageName, "/")
-	registry := tokens[0]
-	organization := tokens[1]
-
-	imageNameAndTag := strings.Split(tokens[2], ":")
-	imageName := imageNameAndTag[0]
-
-	// Intialize the image tag with default value
-	imageTag := "latest"
-	if len(imageNameAndTag) > 1 {
-		imageTag = imageNameAndTag[1]
-	}
-
-	attributes := Attributes{
-		Registry:     registry,
-		Organization: organization,
-		ImageName:    imageName,
-		ImageTag:     imageTag,
-	}
-
-	return attributes, nil
-}
-
-// Checks if the target string matches the regex pattern
-func regexStringMatch(pattern, target string) bool {
-	re, err := regexp.Compile(pattern)
-	if err != nil {
-		logger.L().StopError(fmt.Sprintf("Failed to generate regular expression: %s", err))
-		return false
-	}
-
-	if re.MatchString(target) {
-		return true
-	}
-
-	return false
-}
-
-// Compares the registry, organization, image name, image tag against the targets specified
-// in the exception policy object to check if the image being scanned qualifies for an
-// exception policy.
-func isTargetImage(targets []Target, attributes Attributes) bool {
-	for _, target := range targets {
-		return regexStringMatch(target.Attributes.Registry, attributes.Registry) && regexStringMatch(target.Attributes.Organization, attributes.Organization) && regexStringMatch(target.Attributes.ImageName, attributes.ImageName) && regexStringMatch(target.Attributes.ImageTag, attributes.ImageTag)
-	}
-
-	return false
-}
-
-// Generates a list of unique CVE-IDs and the severities which are to be excluded for
-// the image being scanned.
-func getUniqueVulnerabilitiesAndSeverities(policies []VulnerabilitiesIgnorePolicy, image string) ([]string, []string) {
-	// Create maps with slices as values to store unique vulnerabilities and severities (case-insensitive)
-	uniqueVulns := make(map[string][]string)
-	uniqueSevers := make(map[string][]string)
-
-	imageAttributes, err := getAttributesFromImage(image)
-	if err != nil {
-		logger.L().StopError(fmt.Sprintf("Failed to generate image attributes: %s", err))
-	}
-
-	// Iterate over each policy and its vulnerabilities/severities
-	for _, policy := range policies {
-		// Include the exceptions only if the image is one of the targets
-		if isTargetImage(policy.Targets, imageAttributes) {
-			for _, vulnerability := range policy.Vulnerabilities {
-				// Add to slice directly
-				vulnerabilityUppercase := strings.ToUpper(vulnerability)
-				uniqueVulns[vulnerabilityUppercase] = append(uniqueVulns[vulnerabilityUppercase], vulnerability)
-			}
-
-			for _, severity := range policy.Severities {
-				// Add to slice directly
-				severityUppercase := strings.ToUpper(severity)
-				uniqueSevers[severityUppercase] = append(uniqueSevers[severityUppercase], severity)
-			}
-		}
-	}
-
-	// Extract unique keys (which are unique vulnerabilities/severities) and their slices
-	uniqueVulnsList := make([]string, 0, len(uniqueVulns))
-	for vuln := range uniqueVulns {
-		uniqueVulnsList = append(uniqueVulnsList, vuln)
-	}
-
-	uniqueSeversList := make([]string, 0, len(uniqueSevers))
-	for sever := range uniqueSevers {
-		uniqueSeversList = append(uniqueSeversList, sever)
-	}
-
-	return uniqueVulnsList, uniqueSeversList
-}
-
-func (ks *Kubescape) ScanImage(imgScanInfo *ksmetav1.ImageScanInfo, scanInfo *cautils.ScanInfo) (*models.PresenterConfig, error) {
+func (ks *Kubescape) ScanImage(ctx context.Context, imgScanInfo *ksmetav1.ImageScanInfo, scanInfo *cautils.ScanInfo) (*models.PresenterConfig, error) {
 	logger.L().Start(fmt.Sprintf("Scanning image %s...", imgScanInfo.Image))

 	dbCfg, _ := imagescan.NewDefaultDBConfig()
@@ -172,19 +23,7 @@ func (ks *Kubescape) ScanImage(imgScanInfo *ksmetav1.ImageScanInfo, scanInfo *ca
 		Password: imgScanInfo.Password,
 	}

-	var vulnerabilityExceptions []string
-	var severityExceptions []string
-	if imgScanInfo.Exceptions != "" {
-		exceptionPolicies, err := GetImageExceptionsFromFile(imgScanInfo.Exceptions)
-		if err != nil {
-			logger.L().StopError(fmt.Sprintf("Failed to load exceptions from file: %s", imgScanInfo.Exceptions))
-			return nil, err
-		}
-
-		vulnerabilityExceptions, severityExceptions = getUniqueVulnerabilitiesAndSeverities(exceptionPolicies, imgScanInfo.Image)
-	}
-
-	scanResults, err := svc.Scan(ks.Context(), imgScanInfo.Image, creds, vulnerabilityExceptions, severityExceptions)
+	scanResults, err := svc.Scan(ctx, imgScanInfo.Image, creds)
 	if err != nil {
 		logger.L().StopError(fmt.Sprintf("Failed to scan image: %s", imgScanInfo.Image))
 		return nil, err
@@ -194,9 +33,9 @@ func (ks *Kubescape) ScanImage(imgScanInfo *ksmetav1.ImageScanInfo, scanInfo *ca

 	scanInfo.SetScanType(cautils.ScanTypeImage)

-	outputPrinters := GetOutputPrinters(scanInfo, ks.Context(), "")
+	outputPrinters := GetOutputPrinters(scanInfo, ctx, "")

-	uiPrinter := GetUIPrinter(ks.Context(), scanInfo, "")
+	uiPrinter := GetUIPrinter(ctx, scanInfo, "")

 	resultsHandler := resultshandling.NewResultsHandler(nil, outputPrinters, uiPrinter)

@@ -207,5 +46,5 @@ func (ks *Kubescape) ScanImage(imgScanInfo *ksmetav1.ImageScanInfo, scanInfo *ca
 		},
 	}

-	return scanResults, resultsHandler.HandleResults(ks.Context())
+	return scanResults, resultsHandler.HandleResults(ctx)
 }
--- a/core/core/image_scan_test.go
+++ b/core/core/image_scan_test.go
@@ -1,420 +0,0 @@
-package core
-
-import (
-	"sort"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestGetImageExceptionsFromFile(t *testing.T) {
-	tests := []struct {
-		filePath         string
-		expectedPolicies []VulnerabilitiesIgnorePolicy
-		expectedErr      error
-	}{
-		{
-			filePath: "./testdata/exceptions.json",
-			expectedPolicies: []VulnerabilitiesIgnorePolicy{
-				{
-					Metadata: Metadata{
-						Name: "medium-severity-vulnerabilites-exceptions",
-					},
-					Kind: "VulnerabilitiesIgnorePolicy",
-					Targets: []Target{
-						{
-							DesignatorType: "Attributes",
-							Attributes: Attributes{
-								Registry:     "docker.io",
-								Organization: "",
-								ImageName:    "",
-								ImageTag:     "",
-							},
-						},
-					},
-					Vulnerabilities: []string{},
-					Severities:      []string{"medium"},
-				},
-				{
-					Metadata: Metadata{
-						Name: "exclude-allowed-hostPath-control",
-					},
-					Kind: "VulnerabilitiesIgnorePolicy",
-					Targets: []Target{
-						{
-							DesignatorType: "Attributes",
-							Attributes: Attributes{
-								Registry:     "",
-								Organization: "",
-								ImageName:    "",
-								ImageTag:     "",
-							},
-						},
-					},
-					Vulnerabilities: []string{"CVE-2023-42366", "CVE-2023-42365"},
-					Severities:      []string{"critical", "low"},
-				},
-				{
-					Metadata: Metadata{
-						Name: "regex-example",
-					},
-					Kind: "VulnerabilitiesIgnorePolicy",
-					Targets: []Target{
-						{
-							DesignatorType: "Attributes",
-							Attributes: Attributes{
-								Registry:     "quay.*",
-								Organization: "kube*",
-								ImageName:    "kubescape*",
-								ImageTag:     "v2*",
-							},
-						},
-						{
-							DesignatorType: "Attributes",
-							Attributes: Attributes{
-								Registry:     "docker.io",
-								Organization: ".*",
-								ImageName:    "kube*",
-								ImageTag:     "v3*",
-							},
-						},
-					},
-					Vulnerabilities: []string{"CVE-2023-6879", "CVE-2023-44487"},
-					Severities:      []string{"critical", "low"},
-				},
-			},
-			expectedErr: nil,
-		},
-		{
-			filePath:         "./testdata/empty_exceptions.json",
-			expectedPolicies: []VulnerabilitiesIgnorePolicy{},
-			expectedErr:      nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.filePath, func(t *testing.T) {
-			policies, err := GetImageExceptionsFromFile(tt.filePath)
-			assert.Equal(t, tt.expectedPolicies, policies)
-			assert.Equal(t, tt.expectedErr, err)
-		})
-	}
-}
-
-func TestGetAttributesFromImage(t *testing.T) {
-	tests := []struct {
-		imageName          string
-		expectedAttributes Attributes
-		expectedErr        error
-	}{
-		{
-			imageName: "quay.io/kubescape/kubescape-cli:v3.0.0",
-			expectedAttributes: Attributes{
-				Registry:     "quay.io",
-				Organization: "kubescape",
-				ImageName:    "kubescape-cli",
-				ImageTag:     "v3.0.0",
-			},
-			expectedErr: nil,
-		},
-		{
-			imageName: "alpine",
-			expectedAttributes: Attributes{
-				Registry:     "docker.io",
-				Organization: "library",
-				ImageName:    "alpine",
-				ImageTag:     "latest",
-			},
-			expectedErr: nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.imageName, func(t *testing.T) {
-			attributes, err := getAttributesFromImage(tt.imageName)
-			assert.Equal(t, tt.expectedErr, err)
-			assert.Equal(t, tt.expectedAttributes, attributes)
-		})
-	}
-}
-
-func TestRegexStringMatch(t *testing.T) {
-	tests := []struct {
-		pattern  string
-		target   string
-		expected bool
-	}{
-		{
-			pattern:  ".*",
-			target:   "quay.io",
-			expected: true,
-		},
-		{
-			pattern:  "kubescape",
-			target:   "kubescape",
-			expected: true,
-		},
-		{
-			pattern:  "kubescape*",
-			target:   "kubescape-cli",
-			expected: true,
-		},
-		{
-			pattern:  "",
-			target:   "v3.0.0",
-			expected: true,
-		},
-		{
-			pattern:  "docker.io",
-			target:   "quay.io",
-			expected: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.target+"/"+tt.pattern, func(t *testing.T) {
-			assert.Equal(t, tt.expected, regexStringMatch(tt.pattern, tt.target))
-		})
-	}
-}
-
-func TestIsTargetImage(t *testing.T) {
-	tests := []struct {
-		targets    []Target
-		attributes Attributes
-		expected   bool
-	}{
-		{
-			targets: []Target{
-				{
-					Attributes: Attributes{
-						Registry:     "docker.io",
-						Organization: ".*",
-						ImageName:    ".*",
-						ImageTag:     "",
-					},
-				},
-			},
-			attributes: Attributes{
-				Registry:     "quay.io",
-				Organization: "kubescape",
-				ImageName:    "kubescape-cli",
-				ImageTag:     "v3.0.0",
-			},
-			expected: false,
-		},
-		{
-			targets: []Target{
-				{
-					Attributes: Attributes{
-						Registry:     "quay.io",
-						Organization: "kubescape",
-						ImageName:    "kubescape*",
-						ImageTag:     "",
-					},
-				},
-			},
-			attributes: Attributes{
-				Registry:     "quay.io",
-				Organization: "kubescape",
-				ImageName:    "kubescape-cli",
-				ImageTag:     "v3.0.0",
-			},
-			expected: true,
-		},
-		{
-			targets: []Target{
-				{
-					Attributes: Attributes{
-						Registry:     "docker.io",
-						Organization: "library",
-						ImageName:    "alpine",
-						ImageTag:     "",
-					},
-				},
-			},
-			attributes: Attributes{
-				Registry:     "docker.io",
-				Organization: "library",
-				ImageName:    "alpine",
-				ImageTag:     "latest",
-			},
-			expected: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.attributes.Registry+"/"+tt.attributes.ImageName, func(t *testing.T) {
-			assert.Equal(t, tt.expected, isTargetImage(tt.targets, tt.attributes))
-		})
-	}
-}
-
-func TestGetVulnerabilitiesAndSeverities(t *testing.T) {
-	tests := []struct {
-		policies                []VulnerabilitiesIgnorePolicy
-		image                   string
-		expectedVulnerabilities []string
-		expectedSeverities      []string
-	}{
-		{
-			policies: []VulnerabilitiesIgnorePolicy{
-				{
-					Metadata: Metadata{
-						Name: "vulnerabilites-exceptions",
-					},
-					Kind: "VulnerabilitiesIgnorePolicy",
-					Targets: []Target{
-						{
-							DesignatorType: "Attributes",
-							Attributes: Attributes{
-								Registry:     "",
-								Organization: "kubescape*",
-								ImageName:    "",
-								ImageTag:     "",
-							},
-						},
-					},
-					Vulnerabilities: []string{"CVE-2023-42365"},
-					Severities:      []string{},
-				},
-				{
-					Metadata: Metadata{
-						Name: "exclude-allowed-hostPath-control",
-					},
-					Kind: "VulnerabilitiesIgnorePolicy",
-					Targets: []Target{
-						{
-							DesignatorType: "Attributes",
-							Attributes: Attributes{
-								Registry:     "docker.io",
-								Organization: "",
-								ImageName:    "",
-								ImageTag:     "",
-							},
-						},
-					},
-					Vulnerabilities: []string{"CVE-2023-42366", "CVE-2023-42365"},
-					Severities:      []string{"critical", "low"},
-				},
-			},
-			image:                   "quay.io/kubescape/kubescape-cli:v3.0.0",
-			expectedVulnerabilities: []string{"CVE-2023-42365"},
-			expectedSeverities:      []string{},
-		},
-		{
-			policies: []VulnerabilitiesIgnorePolicy{
-				{
-					Metadata: Metadata{
-						Name: "medium-severity-vulnerabilites-exceptions",
-					},
-					Kind: "VulnerabilitiesIgnorePolicy",
-					Targets: []Target{
-						{
-							DesignatorType: "Attributes",
-							Attributes: Attributes{
-								Registry:     "",
-								Organization: "",
-								ImageName:    "",
-								ImageTag:     "",
-							},
-						},
-					},
-					Vulnerabilities: []string{},
-					Severities:      []string{"medium"},
-				},
-				{
-					Metadata: Metadata{
-						Name: "exclude-allowed-hostPath-control",
-					},
-					Kind: "VulnerabilitiesIgnorePolicy",
-					Targets: []Target{
-						{
-							DesignatorType: "Attributes",
-							Attributes: Attributes{
-								Registry:     "quay.io",
-								Organization: "",
-								ImageName:    "",
-								ImageTag:     "",
-							},
-						},
-					},
-					Vulnerabilities: []string{"CVE-2023-42366", "CVE-2023-42365"},
-					Severities:      []string{},
-				},
-			},
-			image:                   "alpine",
-			expectedVulnerabilities: []string{},
-			expectedSeverities:      []string{"MEDIUM"},
-		},
-		{
-			policies: []VulnerabilitiesIgnorePolicy{
-				{
-					Metadata: Metadata{
-						Name: "regex-example",
-					},
-					Kind: "VulnerabilitiesIgnorePolicy",
-					Targets: []Target{
-						{
-							DesignatorType: "Attributes",
-							Attributes: Attributes{
-								Registry:     "quay.io",
-								Organization: "kube*",
-								ImageName:    "kubescape*",
-								ImageTag:     ".*",
-							},
-						},
-					},
-					Vulnerabilities: []string{},
-					Severities:      []string{"critical"},
-				},
-				{
-					Metadata: Metadata{
-						Name: "only-for-docker-registry",
-					},
-					Kind: "VulnerabilitiesIgnorePolicy",
-					Targets: []Target{
-						{
-							DesignatorType: "Attributes",
-							Attributes: Attributes{
-								Registry: "docker.io",
-								ImageTag: "v3*",
-							},
-						},
-					},
-					Vulnerabilities: []string{"CVE-2023-42366", "CVE-2022-28391"},
-					Severities:      []string{"high"},
-				},
-				{
-					Metadata: Metadata{
-						Name: "exclude-allowed-hostPath-control",
-					},
-					Kind: "VulnerabilitiesIgnorePolicy",
-					Targets: []Target{
-						{
-							DesignatorType: "Attributes",
-							Attributes: Attributes{
-								ImageTag: "v3*",
-							},
-						},
-					},
-					Vulnerabilities: []string{"CVE-2022-30065", "CVE-2022-28391"},
-					Severities:      []string{},
-				},
-			},
-			image:                   "quay.io/kubescape/kubescape-cli:v3.0.0",
-			expectedVulnerabilities: []string{"CVE-2022-30065", "CVE-2022-28391"},
-			expectedSeverities:      []string{"CRITICAL"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.image, func(t *testing.T) {
-			vulnerabilities, severities := getUniqueVulnerabilitiesAndSeverities(tt.policies, tt.image)
-			sort.Strings(tt.expectedVulnerabilities)
-			sort.Strings(vulnerabilities)
-			assert.Equal(t, tt.expectedVulnerabilities, vulnerabilities)
-			assert.Equal(t, tt.expectedSeverities, severities)
-		})
-	}
-}
--- a/core/core/initutils.go
+++ b/core/core/initutils.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"os"

-	"github.com/google/uuid"
 	"github.com/kubescape/go-logger"
 	"github.com/kubescape/go-logger/helpers"
 	"github.com/kubescape/k8s-interface/k8sinterface"
@@ -17,8 +16,11 @@ import (
 	printerv2 "github.com/kubescape/kubescape/v3/core/pkg/resultshandling/printer/v2"
 	"github.com/kubescape/kubescape/v3/core/pkg/resultshandling/reporter"
 	reporterv2 "github.com/kubescape/kubescape/v3/core/pkg/resultshandling/reporter/v2"
-	"github.com/kubescape/rbac-utils/rbacscanner"
 	"go.opentelemetry.io/otel"
+
+	"github.com/google/uuid"
+
+	"github.com/kubescape/rbac-utils/rbacscanner"
 )

 // getKubernetesApi
@@ -275,7 +277,7 @@ func getAttackTracksGetter(ctx context.Context, attackTracks, accountID string,
 	return downloadReleasedPolicy
 }

-// GetUIPrinter returns a printer that will be used to print to the program’s UI (terminal)
+// getUIPrinter returns a printer that will be used to print to the program’s UI (terminal)
 func GetUIPrinter(ctx context.Context, scanInfo *cautils.ScanInfo, clusterName string) printer.IPrinter {
 	var p printer.IPrinter
 	if helpers.ToLevel(logger.L().GetLevel()) >= helpers.WarningLevel {
--- a/core/core/kscore.go
+++ b/core/core/kscore.go
@@ -1,17 +1,7 @@
 package core

-import (
-	"context"
-)
+type Kubescape struct{}

-type Kubescape struct {
-	Ctx context.Context
-}
-
-func (ks *Kubescape) Context() context.Context {
-	return ks.Ctx
-}
-
-func NewKubescape(ctx context.Context) *Kubescape {
-	return &Kubescape{Ctx: ctx}
+func NewKubescape() *Kubescape {
+	return &Kubescape{}
 }
--- a/core/core/kscore_test.go
+++ b/core/core/kscore_test.go
@@ -1,7 +1,6 @@
 package core

 import (
-	"context"
 	"testing"

 	"github.com/stretchr/testify/assert"
@@ -9,8 +8,7 @@ import (

 // The function should return a non-nil pointer.
 func TestNewKubescape_ReturnsNonNilPointer(t *testing.T) {
-	ctx := context.TODO()
-	k := NewKubescape(ctx)
+	k := NewKubescape()
 	assert.NotNil(t, k)
 }

@@ -21,6 +19,5 @@ func TestNewKubescape_DoesNotPanic(t *testing.T) {
 			t.Errorf("Function panicked: %v", r)
 		}
 	}()
-	ctx := context.TODO()
-	NewKubescape(ctx)
+	NewKubescape()
 }
--- a/core/core/list.go
+++ b/core/core/list.go
@@ -38,16 +38,16 @@ func ListSupportActions() []string {
 	sort.Strings(commands)
 	return commands
 }
-func (ks *Kubescape) List(listPolicies *metav1.ListPolicies) error {
+func (ks *Kubescape) List(ctx context.Context, listPolicies *metav1.ListPolicies) error {
 	if policyListerFunc, ok := listFunc[listPolicies.Target]; ok {
-		policies, err := policyListerFunc(ks.Context(), listPolicies)
+		policies, err := policyListerFunc(ctx, listPolicies)
 		if err != nil {
 			return err
 		}
 		policies = naturalSortPolicies(policies)

 		if listFormatFunction, ok := listFormatFunc[listPolicies.Format]; ok {
-			listFormatFunction(ks.Context(), listPolicies.Target, policies)
+			listFormatFunction(ctx, listPolicies.Target, policies)
 		} else {
 			return fmt.Errorf("Invalid format \"%s\", Supported formats: 'pretty-print'/'json' ", listPolicies.Format)
 		}
--- a/core/core/patch.go
+++ b/core/core/patch.go
@@ -9,22 +9,25 @@ import (

 	"github.com/anchore/grype/grype/presenter"
 	"github.com/anchore/grype/grype/presenter/models"
-	copaGrype "github.com/anubhav06/copa-grype/grype"
 	"github.com/kubescape/go-logger"
 	"github.com/kubescape/go-logger/helpers"
+
 	"github.com/kubescape/kubescape/v3/core/cautils"
 	ksmetav1 "github.com/kubescape/kubescape/v3/core/meta/datastructures/v1"
-	"github.com/kubescape/kubescape/v3/core/pkg/resultshandling"
 	"github.com/kubescape/kubescape/v3/core/pkg/resultshandling/printer"
 	"github.com/kubescape/kubescape/v3/pkg/imagescan"
+
+	"github.com/kubescape/kubescape/v3/core/pkg/resultshandling"
+	log "github.com/sirupsen/logrus"
+
+	copaGrype "github.com/anubhav06/copa-grype/grype"
 	"github.com/project-copacetic/copacetic/pkg/buildkit"
 	"github.com/project-copacetic/copacetic/pkg/pkgmgr"
 	"github.com/project-copacetic/copacetic/pkg/types/unversioned"
 	"github.com/project-copacetic/copacetic/pkg/utils"
-	log "github.com/sirupsen/logrus"
 )

-func (ks *Kubescape) Patch(patchInfo *ksmetav1.PatchInfo, scanInfo *cautils.ScanInfo) (*models.PresenterConfig, error) {
+func (ks *Kubescape) Patch(ctx context.Context, patchInfo *ksmetav1.PatchInfo, scanInfo *cautils.ScanInfo) (*models.PresenterConfig, error) {

 	// ===================== Scan the image =====================
 	logger.L().Start(fmt.Sprintf("Scanning image: %s", patchInfo.Image))
@@ -37,7 +40,7 @@ func (ks *Kubescape) Patch(patchInfo *ksmetav1.PatchInfo, scanInfo *cautils.Scan
 		Password: patchInfo.Password,
 	}
 	// Scan the image
-	scanResults, err := svc.Scan(ks.Context(), patchInfo.Image, creds, nil, nil)
+	scanResults, err := svc.Scan(ctx, patchInfo.Image, creds)
 	if err != nil {
 		return nil, err
 	}
@@ -52,7 +55,7 @@ func (ks *Kubescape) Patch(patchInfo *ksmetav1.PatchInfo, scanInfo *cautils.Scan
 	fileName := fmt.Sprintf("%s:%s.json", patchInfo.ImageName, patchInfo.ImageTag)
 	fileName = strings.ReplaceAll(fileName, "/", "-")

-	writer := printer.GetWriter(ks.Context(), fileName)
+	writer := printer.GetWriter(ctx, fileName)

 	if err = pres.Present(writer); err != nil {
 		return nil, err
@@ -68,7 +71,7 @@ func (ks *Kubescape) Patch(patchInfo *ksmetav1.PatchInfo, scanInfo *cautils.Scan
 		disableCopaLogger()
 	}

-	if err = copaPatch(ks.Context(), patchInfo.Timeout, patchInfo.BuildkitAddress, patchInfo.Image, fileName, patchedImageName, "", patchInfo.IgnoreError, patchInfo.BuildKitOpts); err != nil {
+	if err = copaPatch(ctx, patchInfo.Timeout, patchInfo.BuildkitAddress, patchInfo.Image, fileName, patchedImageName, "", patchInfo.IgnoreError, patchInfo.BuildKitOpts); err != nil {
 		return nil, err
 	}

@@ -81,7 +84,7 @@ func (ks *Kubescape) Patch(patchInfo *ksmetav1.PatchInfo, scanInfo *cautils.Scan

 	logger.L().Start(fmt.Sprintf("Re-scanning image: %s", patchedImageName))

-	scanResultsPatched, err := svc.Scan(ks.Context(), patchedImageName, creds, nil, nil)
+	scanResultsPatched, err := svc.Scan(ctx, patchedImageName, creds)
 	if err != nil {
 		return nil, err
 	}
@@ -96,8 +99,8 @@ func (ks *Kubescape) Patch(patchInfo *ksmetav1.PatchInfo, scanInfo *cautils.Scan
 	// ===================== Results Handling =====================

 	scanInfo.SetScanType(cautils.ScanTypeImage)
-	outputPrinters := GetOutputPrinters(scanInfo, ks.Context(), "")
-	uiPrinter := GetUIPrinter(ks.Context(), scanInfo, "")
+	outputPrinters := GetOutputPrinters(scanInfo, ctx, "")
+	uiPrinter := GetUIPrinter(ctx, scanInfo, "")
 	resultsHandler := resultshandling.NewResultsHandler(nil, outputPrinters, uiPrinter)
 	resultsHandler.ImageScanData = []cautils.ImageScanData{
 		{
@@ -106,7 +109,7 @@ func (ks *Kubescape) Patch(patchInfo *ksmetav1.PatchInfo, scanInfo *cautils.Scan
 		},
 	}

-	return scanResultsPatched, resultsHandler.HandleResults(ks.Context())
+	return scanResultsPatched, resultsHandler.HandleResults(ctx)
 }

 func disableCopaLogger() {
--- a/core/core/scan.go
+++ b/core/core/scan.go
@@ -3,7 +3,6 @@ package core
 import (
 	"context"
 	"fmt"
-	"slices"

 	"github.com/kubescape/backend/pkg/versioncheck"
 	"github.com/kubescape/go-logger"
@@ -22,9 +21,11 @@ import (
 	"github.com/kubescape/kubescape/v3/core/pkg/resultshandling/reporter"
 	"github.com/kubescape/kubescape/v3/pkg/imagescan"
 	apisv1 "github.com/kubescape/opa-utils/httpserver/apis/v1"
-	"github.com/kubescape/opa-utils/resources"
 	"go.opentelemetry.io/otel"
+	"golang.org/x/exp/slices"
 	"k8s.io/client-go/kubernetes"
+
+	"github.com/kubescape/opa-utils/resources"
 )

 type componentInterfaces struct {
@@ -121,8 +122,8 @@ func GetOutputPrinters(scanInfo *cautils.ScanInfo, ctx context.Context, clusterN
 	return outputPrinters
 }

-func (ks *Kubescape) Scan(scanInfo *cautils.ScanInfo) (*resultshandling.ResultsHandler, error) {
-	ctxInit, spanInit := otel.Tracer("").Start(ks.Context(), "initialization")
+func (ks *Kubescape) Scan(ctx context.Context, scanInfo *cautils.ScanInfo) (*resultshandling.ResultsHandler, error) {
+	ctxInit, spanInit := otel.Tracer("").Start(ctx, "initialization")
 	logger.L().Start("Kubescape scanner initializing...")

 	// ===================== Initialization =====================
@@ -148,7 +149,7 @@ func (ks *Kubescape) Scan(scanInfo *cautils.ScanInfo) (*resultshandling.ResultsH
 	// remove host scanner components
 	defer func() {
 		if err := interfaces.hostSensorHandler.TearDown(); err != nil {
-			logger.L().Ctx(ks.Context()).StopError("Failed to tear down host scanner", helpers.Error(err))
+			logger.L().Ctx(ctx).StopError("Failed to tear down host scanner", helpers.Error(err))
 		}
 	}()

@@ -177,7 +178,7 @@ func (ks *Kubescape) Scan(scanInfo *cautils.ScanInfo) (*resultshandling.ResultsH
 	spanInit.End()

 	// ========================= opa testing =====================
-	ctxOpa, spanOpa := otel.Tracer("").Start(ks.Context(), "opa testing")
+	ctxOpa, spanOpa := otel.Tracer("").Start(ctx, "opa testing")
 	defer spanOpa.End()

 	deps := resources.NewRegoDependenciesData(k8sinterface.GetK8sConfig(), interfaces.tenantConfig.GetContextName())
@@ -191,7 +192,7 @@ func (ks *Kubescape) Scan(scanInfo *cautils.ScanInfo) (*resultshandling.ResultsH
 	if scanInfo.PrintAttackTree || isPrioritizationScanType(scanInfo.ScanType) {
 		_, spanPrioritization := otel.Tracer("").Start(ctxOpa, "prioritization")
 		if priotizationHandler, err := resourcesprioritization.NewResourcesPrioritizationHandler(ctxOpa, scanInfo.Getters.AttackTracksGetter, scanInfo.PrintAttackTree); err != nil {
-			logger.L().Ctx(ks.Context()).Warning("failed to get attack tracks, this may affect the scanning results", helpers.Error(err))
+			logger.L().Ctx(ctx).Warning("failed to get attack tracks, this may affect the scanning results", helpers.Error(err))
 		} else if err := priotizationHandler.PrioritizeResources(scanData); err != nil {
 			return resultsHandling, fmt.Errorf("%w", err)
 		}
@@ -202,7 +203,7 @@ func (ks *Kubescape) Scan(scanInfo *cautils.ScanInfo) (*resultshandling.ResultsH
 	}

 	if scanInfo.ScanImages {
-		scanImages(scanInfo.ScanType, scanData, ks.Context(), resultsHandling)
+		scanImages(scanInfo.ScanType, scanData, ctx, resultsHandling)
 	}
 	// ========================= results handling =====================
 	resultsHandling.SetData(scanData)
@@ -257,7 +258,7 @@ func scanImages(scanType cautils.ScanTypes, scanData *cautils.OPASessionObj, ctx

 func scanSingleImage(ctx context.Context, img string, svc imagescan.Service, resultsHandling *resultshandling.ResultsHandler) error {

-	scanResults, err := svc.Scan(ctx, img, imagescan.RegistryCredentials{}, nil, nil)
+	scanResults, err := svc.Scan(ctx, img, imagescan.RegistryCredentials{})
 	if err != nil {
 		return err
 	}
--- a/core/core/testdata/alpine-nginx-exceptions.json
+++ b/core/core/testdata/alpine-nginx-exceptions.json
@@ -1,67 +0,0 @@
-[
-    {   
-        "metadata": {
-                "name": "alpine-exceptions"
-        },
-        "kind": "VulnerabilitiesIgnorePolicy",
-        "targets": [
-            {
-                "designatorType": "Attributes",
-                "attributes": {
-                    "imageName": "alpine*"
-                }
-            }
-        ],
-        "severities": [
-            "medium"
-         ]
-    },
-    {   
-        "metadata": {
-                "name": "nginx-exceptions"
-        },
-        "kind": "VulnerabilitiesIgnorePolicy",
-        "targets": [
-            {
-                "designatorType": "Attributes",
-                "attributes": {
-                    "imageName": "nginx*"
-                }
-            }
-        ],
-        "vulnerabilities": [
-            "invalid-cve",
-            "CVE-2023-45853",
-            "CVE-2023-49463"
-        ],
-        "severities": [
-            "critical",
-            "medium",
-            "invalid-severity"
-         ]
-    },
-    {   
-        "metadata": {
-                "name": "applicable-only-to-quay-registry-images"
-        },
-        "kind": "VulnerabilitiesIgnorePolicy",
-        "targets": [
-            {
-                "designatorType": "Attributes",
-                "attributes": {
-                    "registry": "quay.io"
-                }
-            }
-        ],
-        "vulnerabilities": [
-            "CVE-2023-42365"
-        ],
-        "severities": [
-            "critical",
-            "medium",
-            "high",
-            "low"
-         ]
-    }   
-]
-
--- a/core/core/testdata/empty_exceptions.json
+++ b/core/core/testdata/empty_exceptions.json
@@ -1 +0,0 @@
-[]
--- a/core/core/testdata/exceptions.json
+++ b/core/core/testdata/exceptions.json
@@ -1,78 +0,0 @@
-[
-    {   
-        "metadata": {
-                "name": "medium-severity-vulnerabilites-exceptions"
-        },
-        "kind": "VulnerabilitiesIgnorePolicy",
-        "targets": [
-            {
-                "designatorType": "Attributes",
-                "attributes": {
-                    "Registry": "docker.io",
-                    "Organization": "",
-                    "ImageName": ""
-                }
-            }
-        ],
-        "vulnerabilities": [
-        ],
-        "severities": [
-            "medium"
-         ]
-    },
-    {   
-        "metadata": {
-                "name": "exclude-allowed-hostPath-control"
-        },
-        "kind": "VulnerabilitiesIgnorePolicy",
-        "targets": [
-            {
-                "designatorType": "Attributes",
-                "attributes": {
-                }
-            }
-        ],
-        "vulnerabilities": [
-            "CVE-2023-42366",
-            "CVE-2023-42365"
-        ],
-        "severities": [
-            "critical",
-            "low"
-         ]
-    },
-    {   
-        "metadata": {
-                "name": "regex-example"
-        },
-        "kind": "VulnerabilitiesIgnorePolicy",
-        "targets": [
-            {
-                "designatorType": "Attributes",
-                "attributes": {
-                    "Registry": "quay.*",
-                    "Organization": "kube*",
-                    "ImageName": "kubescape*",
-                    "ImageTag": "v2*"
-                }
-            },
-            {
-                "designatorType": "Attributes",
-                "attributes": {
-                    "Registry": "docker.io",
-                    "Organization": ".*",
-                    "ImageName": "kube*",
-                    "ImageTag": "v3*"
-                }
-            }
-        ],
-        "vulnerabilities": [
-            "CVE-2023-6879",
-            "CVE-2023-44487"
-        ],
-        "severities": [
-            "critical",
-            "low"
-         ]
-    }   
-]
--- a/core/meta/datastructures/v1/config.go
+++ b/core/meta/datastructures/v1/config.go
@@ -8,8 +8,10 @@ type SetConfig struct {
 	CloudReportURL string
 	CloudAPIURL    string
 }
+
 type ViewConfig struct {
 	Writer io.Writer
 }
+
 type DeleteConfig struct {
 }
--- a/core/meta/datastructures/v1/image_scan.go
+++ b/core/meta/datastructures/v1/image_scan.go
@@ -1,8 +1,7 @@
 package v1

 type ImageScanInfo struct {
-	Username   string
-	Password   string
-	Image      string
-	Exceptions string
+	Username string
+	Password string
+	Image    string
 }
--- a/core/meta/ksinterface.go
+++ b/core/meta/ksinterface.go
@@ -10,25 +10,23 @@ import (
 )

 type IKubescape interface {
-	Context() context.Context
-
-	Scan(scanInfo *cautils.ScanInfo) (*resultshandling.ResultsHandler, error) // TODO - use scanInfo from v1
+	Scan(ctx context.Context, scanInfo *cautils.ScanInfo) (*resultshandling.ResultsHandler, error) // TODO - use scanInfo from v1

 	// policies
-	List(listPolicies *metav1.ListPolicies) error     // TODO - return list response
-	Download(downloadInfo *metav1.DownloadInfo) error // TODO - return downloaded policies
+	List(ctx context.Context, listPolicies *metav1.ListPolicies) error     // TODO - return list response
+	Download(ctx context.Context, downloadInfo *metav1.DownloadInfo) error // TODO - return downloaded policies

 	// config
 	SetCachedConfig(setConfig *metav1.SetConfig) error
 	ViewCachedConfig(viewConfig *metav1.ViewConfig) error
-	DeleteCachedConfig(deleteConfig *metav1.DeleteConfig) error
+	DeleteCachedConfig(ctx context.Context, deleteConfig *metav1.DeleteConfig) error

 	// fix
-	Fix(fixInfo *metav1.FixInfo) error
+	Fix(ctx context.Context, fixInfo *metav1.FixInfo) error

 	// patch
-	Patch(patchInfo *metav1.PatchInfo, scanInfo *cautils.ScanInfo) (*models.PresenterConfig, error)
+	Patch(ctx context.Context, patchInfo *metav1.PatchInfo, scanInfo *cautils.ScanInfo) (*models.PresenterConfig, error)

 	// scan image
-	ScanImage(imgScanInfo *metav1.ImageScanInfo, scanInfo *cautils.ScanInfo) (*models.PresenterConfig, error)
+	ScanImage(ctx context.Context, imgScanInfo *metav1.ImageScanInfo, scanInfo *cautils.ScanInfo) (*models.PresenterConfig, error)
 }
--- a/core/mocks/cmd_mocks.go
+++ b/core/mocks/cmd_mocks.go
@@ -11,19 +11,15 @@ import (

 type MockIKubescape struct{}

-func (m *MockIKubescape) Context() context.Context {
-	return context.TODO()
-}
-
-func (m *MockIKubescape) Scan(scanInfo *cautils.ScanInfo) (*resultshandling.ResultsHandler, error) {
+func (m *MockIKubescape) Scan(ctx context.Context, scanInfo *cautils.ScanInfo) (*resultshandling.ResultsHandler, error) {
 	return nil, nil
 }

-func (m *MockIKubescape) List(listPolicies *metav1.ListPolicies) error {
+func (m *MockIKubescape) List(ctx context.Context, listPolicies *metav1.ListPolicies) error {
 	return nil
 }

-func (m *MockIKubescape) Download(downloadInfo *metav1.DownloadInfo) error {
+func (m *MockIKubescape) Download(ctx context.Context, downloadInfo *metav1.DownloadInfo) error {
 	return nil
 }

@@ -35,18 +31,18 @@ func (m *MockIKubescape) ViewCachedConfig(viewConfig *metav1.ViewConfig) error {
 	return nil
 }

-func (m *MockIKubescape) DeleteCachedConfig(deleteConfig *metav1.DeleteConfig) error {
+func (m *MockIKubescape) DeleteCachedConfig(ctx context.Context, deleteConfig *metav1.DeleteConfig) error {
 	return nil
 }

-func (m *MockIKubescape) Fix(fixInfo *metav1.FixInfo) error {
+func (m *MockIKubescape) Fix(ctx context.Context, fixInfo *metav1.FixInfo) error {
 	return nil
 }

-func (m *MockIKubescape) Patch(patchInfo *metav1.PatchInfo, scanInfo *cautils.ScanInfo) (*models.PresenterConfig, error) {
+func (m *MockIKubescape) Patch(ctx context.Context, patchInfo *metav1.PatchInfo, scanInfo *cautils.ScanInfo) (*models.PresenterConfig, error) {
 	return nil, nil
 }

-func (m *MockIKubescape) ScanImage(imgScanInfo *metav1.ImageScanInfo, scanInfo *cautils.ScanInfo) (*models.PresenterConfig, error) {
+func (m *MockIKubescape) ScanImage(ctx context.Context, imgScanInfo *metav1.ImageScanInfo, scanInfo *cautils.ScanInfo) (*models.PresenterConfig, error) {
 	return nil, nil
 }
--- a/core/pkg/fixhandler/fixhandler.go
+++ b/core/pkg/fixhandler/fixhandler.go
@@ -13,8 +13,9 @@ import (
 	"strings"

 	"github.com/armosec/armoapi-go/armotypes"
-	"github.com/kubescape/go-logger"
 	metav1 "github.com/kubescape/kubescape/v3/core/meta/datastructures/v1"
+
+	"github.com/kubescape/go-logger"
 	"github.com/kubescape/opa-utils/objectsenvelopes"
 	"github.com/kubescape/opa-utils/objectsenvelopes/localworkload"
 	"github.com/kubescape/opa-utils/reporthandling"
--- a/core/pkg/fixhandler/yamlhandler.go
+++ b/core/pkg/fixhandler/yamlhandler.go
@@ -9,6 +9,7 @@ import (
 	"strings"

 	"github.com/mikefarah/yq/v4/pkg/yqlib"
+
 	"gopkg.in/yaml.v3"
 )

--- a/core/pkg/hostsensorutils/hostsensordeploy.go
+++ b/core/pkg/hostsensorutils/hostsensordeploy.go
@@ -13,6 +13,7 @@ import (
 	"github.com/kubescape/k8s-interface/k8sinterface"
 	"github.com/kubescape/k8s-interface/workloadinterface"
 	"github.com/kubescape/kubescape/v3/core/cautils"
+
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
--- a/core/pkg/opaprocessor/cosign_verify.go
+++ b/core/pkg/opaprocessor/cosign_verify.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"crypto"
 	"fmt"
-
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/sigstore/cosign/v2/cmd/cosign/cli/options"
 	"github.com/sigstore/cosign/v2/cmd/cosign/cli/sign"
--- a/core/pkg/opaprocessor/cosign_verify_test.go
+++ b/core/pkg/opaprocessor/cosign_verify_test.go
@@ -2,9 +2,8 @@ package opaprocessor

 import (
 	"fmt"
-	"testing"
-
 	"github.com/stretchr/testify/assert"
+	"testing"
 )

 func Test_verify(t *testing.T) {
--- a/core/pkg/opaprocessor/processorhandler.go
+++ b/core/pkg/opaprocessor/processorhandler.go
@@ -3,7 +3,6 @@ package opaprocessor
 import (
 	"context"
 	"fmt"
-	"slices"
 	"strings"
 	"sync"

@@ -24,6 +23,7 @@ import (
 	"github.com/open-policy-agent/opa/storage"
 	opaprint "github.com/open-policy-agent/opa/topdown/print"
 	"go.opentelemetry.io/otel"
+	"golang.org/x/exp/slices"
 )

 const ScoreConfigPath = "/resources/config"
--- a/core/pkg/opaprocessor/processorhandler_test.go
+++ b/core/pkg/opaprocessor/processorhandler_test.go
@@ -14,13 +14,14 @@ import (
 	"time"

 	"github.com/armosec/armoapi-go/armotypes"
-	"github.com/kubescape/k8s-interface/workloadinterface"
 	"github.com/kubescape/kubescape/v3/core/cautils"
 	"github.com/kubescape/kubescape/v3/core/mocks"
 	"github.com/kubescape/opa-utils/reporthandling"
 	"github.com/kubescape/opa-utils/reporthandling/results/v1/resourcesresults"
 	"github.com/kubescape/opa-utils/resources"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/kubescape/k8s-interface/workloadinterface"
 )

 var (
--- a/core/pkg/opaprocessor/processorhandlerutils.go
+++ b/core/pkg/opaprocessor/processorhandlerutils.go
@@ -3,6 +3,8 @@ package opaprocessor
 import (
 	"context"

+	corev1 "k8s.io/api/core/v1"
+
 	"github.com/kubescape/go-logger"
 	"github.com/kubescape/k8s-interface/k8sinterface"
 	"github.com/kubescape/k8s-interface/workloadinterface"
@@ -14,7 +16,6 @@ import (
 	"github.com/kubescape/opa-utils/reporthandling/results/v1/resourcesresults"
 	resources "github.com/kubescape/opa-utils/resources"
 	"go.opentelemetry.io/otel"
-	corev1 "k8s.io/api/core/v1"
 )

 const clusterScope = "clusterScope"
--- a/core/pkg/opaprocessor/processorhandlerutils_test.go
+++ b/core/pkg/opaprocessor/processorhandlerutils_test.go
@@ -3,9 +3,11 @@ package opaprocessor
 import (
 	"testing"

-	"github.com/kubescape/k8s-interface/workloadinterface"
-	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/kubescape/k8s-interface/workloadinterface"
 )

 func TestRemoveData(t *testing.T) {
--- a/core/pkg/opaprocessor/utils.go
+++ b/core/pkg/opaprocessor/utils.go
@@ -2,7 +2,6 @@ package opaprocessor

 import (
 	"fmt"
-	"slices"
 	"strings"

 	"github.com/kubescape/go-logger"
@@ -15,6 +14,7 @@ import (
 	"github.com/open-policy-agent/opa/rego"
 	"github.com/open-policy-agent/opa/topdown/builtins"
 	"github.com/open-policy-agent/opa/types"
+	"golang.org/x/exp/slices"
 )

 // convertFrameworksToPolicies convert list of frameworks to list of policies
--- a/core/pkg/opaprocessor/utils_test.go
+++ b/core/pkg/opaprocessor/utils_test.go
@@ -3,12 +3,13 @@ package opaprocessor
 import (
 	"testing"

+	"github.com/stretchr/testify/assert"
+
 	"github.com/kubescape/kubescape/v3/core/cautils"
 	"github.com/kubescape/kubescape/v3/core/mocks"
 	"github.com/kubescape/opa-utils/reporthandling"
 	"github.com/kubescape/opa-utils/reporthandling/results/v1/reportsummary"
 	v2 "github.com/kubescape/opa-utils/reporthandling/v2"
-	"github.com/stretchr/testify/assert"
 )

 func TestConvertFrameworksToPolicies(t *testing.T) {
--- a/core/pkg/policyhandler/handlepullpolicies.go
+++ b/core/pkg/policyhandler/handlepullpolicies.go
@@ -158,11 +158,8 @@ func (policyHandler *PolicyHandler) downloadScanPolicies(ctx context.Context, po
 			if receivedFramework != nil {
 				frameworks = append(frameworks, *receivedFramework)
 				cache := getter.GetDefaultPath(rule.Identifier + ".json")
-				if _, ok := policyHandler.getters.PolicyGetter.(*getter.LoadPolicy); ok {
-					continue // skip caching for local files
-				}
 				if err := getter.SaveInFile(receivedFramework, cache); err != nil {
-					logger.L().Ctx(ctx).Warning("failed to cache framework", helpers.String("file", cache), helpers.Error(err))
+					logger.L().Ctx(ctx).Warning("failed to cache file", helpers.String("file", cache), helpers.Error(err))
 				}
 			}
 		}
@@ -181,7 +178,7 @@ func (policyHandler *PolicyHandler) downloadScanPolicies(ctx context.Context, po

 				cache := getter.GetDefaultPath(policy.Identifier + ".json")
 				if err := getter.SaveInFile(receivedControl, cache); err != nil {
-					logger.L().Ctx(ctx).Warning("failed to cache control", helpers.String("file", cache), helpers.Error(err))
+					logger.L().Ctx(ctx).Warning("failed to cache file", helpers.String("file", cache), helpers.Error(err))
 				}
 			}
 		}
--- a/core/pkg/policyhandler/handlepullpoliciesutils.go
+++ b/core/pkg/policyhandler/handlepullpoliciesutils.go
@@ -5,9 +5,10 @@ import (
 	"strings"
 	"time"

-	"github.com/kubescape/kubescape/v3/core/cautils"
 	apisv1 "github.com/kubescape/opa-utils/httpserver/apis/v1"
 	"github.com/kubescape/opa-utils/reporthandling"
+
+	"github.com/kubescape/kubescape/v3/core/cautils"
 )

 func getScanKind(policyIdentifier []cautils.PolicyIdentifier) apisv1.NotificationPolicyKind {
--- a/core/pkg/resourcehandler/filesloader.go
+++ b/core/pkg/resourcehandler/filesloader.go
@@ -6,13 +6,14 @@ import (
 	"path/filepath"
 	"strings"

+	"github.com/kubescape/k8s-interface/workloadinterface"
+	"github.com/kubescape/opa-utils/reporthandling"
+	"k8s.io/apimachinery/pkg/version"
+
 	"github.com/kubescape/go-logger"
 	"github.com/kubescape/go-logger/helpers"
 	"github.com/kubescape/k8s-interface/k8sinterface"
-	"github.com/kubescape/k8s-interface/workloadinterface"
 	"github.com/kubescape/kubescape/v3/core/cautils"
-	"github.com/kubescape/opa-utils/reporthandling"
-	"k8s.io/apimachinery/pkg/version"
 )

 // FileResourceHandler handle resources from files and URLs
--- a/core/pkg/resourcehandler/handlepullresources_test.go
+++ b/core/pkg/resourcehandler/handlepullresources_test.go
@@ -8,6 +8,7 @@ import (

 	"github.com/kubescape/k8s-interface/k8sinterface"
 	"github.com/kubescape/kubescape/v3/core/cautils"
+
 	"github.com/kubescape/opa-utils/reporthandling/apis"
 	helpersv1 "github.com/kubescape/opa-utils/reporthandling/helpers/v1"
 	reportv2 "github.com/kubescape/opa-utils/reporthandling/v2"
--- a/core/pkg/resourcehandler/k8sresources.go
+++ b/core/pkg/resourcehandler/k8sresources.go
@@ -7,24 +7,26 @@ import (

 	"github.com/kubescape/go-logger"
 	"github.com/kubescape/go-logger/helpers"
-	"github.com/kubescape/k8s-interface/cloudsupport"
-	cloudapis "github.com/kubescape/k8s-interface/cloudsupport/apis"
-	cloudv1 "github.com/kubescape/k8s-interface/cloudsupport/v1"
-	"github.com/kubescape/k8s-interface/k8sinterface"
-	"github.com/kubescape/k8s-interface/workloadinterface"
 	"github.com/kubescape/kubescape/v3/core/cautils"
 	"github.com/kubescape/kubescape/v3/core/metrics"
 	"github.com/kubescape/kubescape/v3/core/pkg/hostsensorutils"
 	"github.com/kubescape/opa-utils/objectsenvelopes"
 	"github.com/kubescape/opa-utils/reporthandling/apis"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/client-go/tools/pager"
+
+	"github.com/kubescape/k8s-interface/cloudsupport"
+	cloudapis "github.com/kubescape/k8s-interface/cloudsupport/apis"
+	cloudv1 "github.com/kubescape/k8s-interface/cloudsupport/v1"
+	"github.com/kubescape/k8s-interface/k8sinterface"
+	"github.com/kubescape/k8s-interface/workloadinterface"
+
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	k8slabels "k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/version"
-	"k8s.io/client-go/tools/pager"
 )

 type cloudResourceGetter func(string, string) (workloadinterface.IMetadata, error)
@@ -375,13 +377,12 @@ func (k8sHandler *K8sResourceHandler) pullSingleResource(resource *schema.GroupV
 		clientResource := k8sHandler.k8s.DynamicClient.Resource(*resource)

 		// list resources
-		lenBefore := len(resourceList)
 		if err := pager.New(func(ctx context.Context, opts metav1.ListOptions) (runtime.Object, error) {
 			return clientResource.List(ctx, opts)
 		}).EachListItem(context.Background(), listOptions, func(obj runtime.Object) error {
 			uObject := obj.(*unstructured.Unstructured)
 			if k8sinterface.IsTypeWorkload(uObject.Object) && k8sinterface.WorkloadHasParent(workloadinterface.NewWorkloadObj(uObject.Object)) {
-				logger.L().Debug("Skipping resource with parent", helpers.String("resource", resource.String()), helpers.String("namespace", uObject.GetNamespace()), helpers.String("name", uObject.GetName()))
+				logger.L().Debug("Skipping resource with parent", helpers.String("kind", uObject.GetKind()), helpers.String("name", uObject.GetName()))
 				return nil
 			}
 			resourceList = append(resourceList, *obj.(*unstructured.Unstructured))
@@ -389,7 +390,7 @@ func (k8sHandler *K8sResourceHandler) pullSingleResource(resource *schema.GroupV
 		}); err != nil {
 			return nil, fmt.Errorf("failed to get resource: %v, labelSelector: %v, fieldSelector: %v, reason: %w", resource, listOptions.LabelSelector, listOptions.FieldSelector, err)
 		}
-		logger.L().Debug("Pulled resources", helpers.String("resource", resource.String()), helpers.String("fieldSelector", listOptions.FieldSelector), helpers.String("labelSelector", listOptions.LabelSelector), helpers.Int("count", len(resourceList)-lenBefore))
+
 	}

 	return resourceList, nil
--- a/core/pkg/resourcehandler/k8sresourcesutils.go
+++ b/core/pkg/resourcehandler/k8sresourcesutils.go
@@ -4,12 +4,13 @@ import (
 	"fmt"
 	"strings"

-	"github.com/kubescape/k8s-interface/k8sinterface"
-	"github.com/kubescape/k8s-interface/workloadinterface"
 	"github.com/kubescape/kubescape/v3/core/cautils"
 	"github.com/kubescape/opa-utils/objectsenvelopes"
 	"github.com/kubescape/opa-utils/reporthandling"
 	"k8s.io/utils/strings/slices"
+
+	"github.com/kubescape/k8s-interface/k8sinterface"
+	"github.com/kubescape/k8s-interface/workloadinterface"
 )

 var (
--- a/core/pkg/resourcehandler/k8sresourcesutils_test.go
+++ b/core/pkg/resourcehandler/k8sresourcesutils_test.go
@@ -1,11 +1,11 @@
 package resourcehandler

 import (
-	"testing"
-
 	"github.com/kubescape/kubescape/v3/core/cautils"
 	"github.com/kubescape/opa-utils/objectsenvelopes"
 	"github.com/stretchr/testify/assert"
+
+	"testing"
 )

 func TestSsEmptyImgVulns(t *testing.T) {
--- a/core/pkg/resourcehandler/repositoryscanner.go
+++ b/core/pkg/resourcehandler/repositoryscanner.go
@@ -246,6 +246,7 @@ func (g *GitHubRepository) getFilesFromTree(filesExtensions []string) []string {
 	return urls
 }

+
 func (g *GitHubRepository) rowYamlUrl() string {
 	return fmt.Sprintf("https://raw.githubusercontent.com/%s/%s", joinOwnerNRepo(g.owner, g.repo), g.branch)
 }
--- a/core/pkg/resourcesprioritization/prioritizationhandler.go
+++ b/core/pkg/resourcesprioritization/prioritizationhandler.go
@@ -60,7 +60,7 @@ func NewResourcesPrioritizationHandler(ctx context.Context, attackTracksGetter g
 	// Store attack tracks in cache
 	cache := getter.GetDefaultPath(cautils.LocalAttackTracksFilename)
 	if err := getter.SaveInFile(tracks, cache); err != nil {
-		logger.L().Ctx(ctx).Warning("failed to cache attack track", helpers.String("file", cache), helpers.Error(err))
+		logger.L().Ctx(ctx).Warning("failed to cache file", helpers.String("file", cache), helpers.Error(err))
 	}

 	return handler, nil
--- a/core/pkg/resultshandling/locationresolver/locationresolver.go
+++ b/core/pkg/resultshandling/locationresolver/locationresolver.go
@@ -10,6 +10,7 @@ import (

 	"github.com/kubescape/go-logger"
 	"github.com/mikefarah/yq/v4/pkg/yqlib"
+
 	"gopkg.in/op/go-logging.v1"
 	"gopkg.in/yaml.v3"
 )
--- a/core/pkg/resultshandling/printer/v2/controltable.go
+++ b/core/pkg/resultshandling/printer/v2/controltable.go
@@ -3,39 +3,78 @@ package printer
 import (
 	"fmt"
 	"sort"
+	"strings"

 	"github.com/jwalton/gchalk"
 	"github.com/kubescape/kubescape/v3/core/cautils"
 	"github.com/kubescape/opa-utils/reporthandling/apis"
 	"github.com/kubescape/opa-utils/reporthandling/results/v1/reportsummary"
+	"github.com/olekukonko/tablewriter"
 )

-const controlNameMaxLength = 70
+const (
+	columnSeverity        = iota
+	columnRef             = iota
+	columnName            = iota
+	columnCounterFailed   = iota
+	columnCounterAll      = iota
+	columnComplianceScore = iota
+	_rowLen               = iota
+	controlNameMaxLength  = 70
+)

-type TableRow struct {
-	ref             string
-	name            string
-	counterFailed   string
-	counterAll      string
-	severity        string
-	complianceScore string
+func generateRow(controlSummary reportsummary.IControlSummary, infoToPrintInfo []infoStars, verbose bool) []string {
+	row := make([]string, _rowLen)
+
+	// ignore passed results
+	if !verbose && (controlSummary.GetStatus().IsPassed()) {
+		return []string{}
+	}
+
+	row[columnSeverity] = getSeverityColumn(controlSummary)
+	if len(controlSummary.GetName()) > controlNameMaxLength {
+		row[columnName] = controlSummary.GetName()[:controlNameMaxLength] + "..."
+	} else {
+		row[columnName] = controlSummary.GetName()
+	}
+	row[columnCounterFailed] = fmt.Sprintf("%d", controlSummary.NumberOfResources().Failed())
+	row[columnCounterAll] = fmt.Sprintf("%d", controlSummary.NumberOfResources().All())
+	row[columnComplianceScore] = getComplianceScoreColumn(controlSummary, infoToPrintInfo)
+	if row[columnComplianceScore] == "-1%" {
+		row[columnComplianceScore] = "N/A"
+	}
+
+	return row
 }

-// generateTableRow is responsible for generating the row that will be printed in the table
-func generateTableRow(controlSummary reportsummary.IControlSummary, infoToPrintInfo []infoStars) *TableRow {
-	tableRow := &TableRow{
-		ref:             controlSummary.GetID(),
-		name:            controlSummary.GetName(),
-		counterFailed:   fmt.Sprintf("%d", controlSummary.NumberOfResources().Failed()),
-		counterAll:      fmt.Sprintf("%d", controlSummary.NumberOfResources().All()),
-		severity:        apis.ControlSeverityToString(controlSummary.GetScoreFactor()),
-		complianceScore: getComplianceScoreColumn(controlSummary, infoToPrintInfo),
+func shortFormatRow(dataRows [][]string) [][]string {
+	rows := [][]string{}
+	for _, dataRow := range dataRows {
+		rows = append(rows, []string{fmt.Sprintf("Severity"+strings.Repeat(" ", 11)+": %+v\nControl Name"+strings.Repeat(" ", 7)+": %+v\nFailed Resources"+strings.Repeat(" ", 3)+": %+v\nAll Resources"+strings.Repeat(" ", 6)+": %+v\n%% Compliance-Score"+strings.Repeat(" ", 1)+": %+v", dataRow[columnSeverity], dataRow[columnName], dataRow[columnCounterFailed], dataRow[columnCounterAll], dataRow[columnComplianceScore])})
 	}
-	if len(controlSummary.GetName()) > controlNameMaxLength {
-		tableRow.name = controlSummary.GetName()[:controlNameMaxLength] + "..."
+	return rows
+}
+
+func generateRowPdf(controlSummary reportsummary.IControlSummary, infoToPrintInfo []infoStars, verbose bool) []string {
+	row := make([]string, _rowLen)
+
+	// ignore passed results
+	if !verbose && (controlSummary.GetStatus().IsPassed()) {
+		return []string{}
 	}

-	return tableRow
+	row[columnSeverity] = apis.ControlSeverityToString(controlSummary.GetScoreFactor())
+	row[columnRef] = controlSummary.GetID()
+	if len(controlSummary.GetName()) > controlNameMaxLength {
+		row[columnName] = controlSummary.GetName()[:controlNameMaxLength] + "..."
+	} else {
+		row[columnName] = controlSummary.GetName()
+	}
+	row[columnCounterFailed] = fmt.Sprintf("%d", controlSummary.NumberOfResources().Failed())
+	row[columnCounterAll] = fmt.Sprintf("%d", controlSummary.NumberOfResources().All())
+	row[columnComplianceScore] = getComplianceScoreColumn(controlSummary, infoToPrintInfo)
+
+	return row
 }

 func getInfoColumn(controlSummary reportsummary.IControlSummary, infoToPrintInfo []infoStars) string {
@@ -51,12 +90,7 @@ func getComplianceScoreColumn(controlSummary reportsummary.IControlSummary, info
 	if controlSummary.GetStatus().IsSkipped() {
 		return fmt.Sprintf("%s %s", "Action Required", getInfoColumn(controlSummary, infoToPrintInfo))
 	}
-	if compliance := cautils.Float32ToInt(controlSummary.GetComplianceScore()); compliance < 0 {
-		return "N/A"
-	} else {
-		return fmt.Sprintf("%d", cautils.Float32ToInt(controlSummary.GetComplianceScore())) + "%"
-	}
-
+	return fmt.Sprintf("%d", cautils.Float32ToInt(controlSummary.GetComplianceScore())) + "%"
 }

 func getSeverityColumn(controlSummary reportsummary.IControlSummary) string {
@@ -90,3 +124,45 @@ func getSortedControlsIDs(controls reportsummary.ControlSummaries) [][]string {
 	}
 	return controlIDs
 }
+
+/* unused for now
+func getSortedControlsNames(controls reportsummary.ControlSummaries) [][]string {
+	controlNames := make([][]string, 5)
+	for k := range controls {
+		c := controls[k]
+		i := apis.ControlSeverityToInt(c.GetScoreFactor())
+		controlNames[i] = append(controlNames[i], c.GetName())
+	}
+	for i := range controlNames {
+		sort.Strings(controlNames[i])
+	}
+	return controlNames
+}
+*/
+
+func getControlTableHeaders(short bool) []string {
+	var headers []string
+	if short {
+		headers = make([]string, 1)
+		headers[0] = "Controls"
+	} else {
+		headers = make([]string, _rowLen)
+		headers[columnRef] = "Control reference"
+		headers[columnName] = "Control name"
+		headers[columnCounterFailed] = "Failed resources"
+		headers[columnCounterAll] = "All resources"
+		headers[columnSeverity] = "Severity"
+		headers[columnComplianceScore] = "Compliance score"
+	}
+	return headers
+}
+
+func getColumnsAlignments() []int {
+	alignments := make([]int, _rowLen)
+	alignments[columnName] = tablewriter.ALIGN_LEFT
+	alignments[columnCounterFailed] = tablewriter.ALIGN_CENTER
+	alignments[columnCounterAll] = tablewriter.ALIGN_CENTER
+	alignments[columnSeverity] = tablewriter.ALIGN_LEFT
+	alignments[columnComplianceScore] = tablewriter.ALIGN_CENTER
+	return alignments
+}
--- a/core/pkg/resultshandling/printer/v2/controltable_test.go
+++ b/core/pkg/resultshandling/printer/v2/controltable_test.go
@@ -10,6 +10,7 @@ import (

 	"github.com/kubescape/kubescape/v3/internal/testutils"
 	"github.com/kubescape/opa-utils/reporthandling/results/v1/reportsummary"
+
 	"github.com/stretchr/testify/assert"
 )

@@ -23,43 +24,45 @@ func Test_generateRowPdf(t *testing.T) {
 	infoToPrintInfoMap := mapInfoToPrintInfo(mockSummary.Controls)
 	sortedControlIDs := getSortedControlsIDs(mockSummary.Controls)

-	var rows []TableRow
+	var results [][]string

 	for i := len(sortedControlIDs) - 1; i >= 0; i-- {
 		for _, c := range sortedControlIDs[i] {
-			row := *generateTableRow(mockSummary.Controls.GetControl(reportsummary.EControlCriteriaID, c), infoToPrintInfoMap)
-			rows = append(rows, row)
+			result := generateRowPdf(mockSummary.Controls.GetControl(reportsummary.EControlCriteriaID, c), infoToPrintInfoMap, true)
+			if len(result) > 0 {
+				results = append(results, result)
+			}
 		}
 	}

-	for _, row := range rows {
+	for _, c := range results {
 		//validating severity column
-		if row.severity != "Low" && row.severity != "Medium" && row.severity != "High" && row.severity != "Critical" {
-			t.Errorf("got %s, want either of these: %s", row.severity, "Low, Medium, High, Critical")
+		if c[0] != "Low" && c[0] != "Medium" && c[0] != "High" && c[0] != "Critical" {
+			t.Errorf("got %s, want either of these: %s", c[0], "Low, Medium, High, Critical")
 		}

 		// Validating length of control ID
-		if len(row.ref) > 6 {
-			t.Errorf("got %s, want %s", row.ref, "less than 7 characters")
+		if len(c[1]) > 6 {
+			t.Errorf("got %s, want %s", c[1], "less than 7 characters")
 		}

 		// Validating length of control name
-		if len(row.name) > controlNameMaxLength {
-			t.Errorf("got %s, want %s", row.name, fmt.Sprintf("less than %d characters", controlNameMaxLength))
+		if len(c[2]) > controlNameMaxLength {
+			t.Errorf("got %s, want %s", c[1], fmt.Sprintf("less than %d characters", controlNameMaxLength))
 		}

 		// Validating numeric fields
-		_, err := strconv.Atoi(row.counterFailed)
+		_, err := strconv.Atoi(c[3])
 		if err != nil {
-			t.Errorf("got %s, want an integer %s", row.counterFailed, err)
+			t.Errorf("got %s, want an integer %s", c[2], err)
 		}

-		_, err = strconv.Atoi(row.counterAll)
+		_, err = strconv.Atoi(c[4])
 		if err != nil {
-			t.Errorf("got %s, want an integer %s", row.counterAll, err)
+			t.Errorf("got %s, want an integer %s", c[3], err)
 		}

-		assert.NotEmpty(t, row.complianceScore, "expected a non-empty string")
+		assert.NotEmpty(t, c[5], "expected a non-empty string")

 	}

--- a/core/pkg/resultshandling/printer/v2/pdf.go
+++ b/core/pkg/resultshandling/printer/v2/pdf.go
@@ -3,20 +3,24 @@ package printer
 import (
 	"context"
 	_ "embed"
+	b64 "encoding/base64"
 	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
 	"time"

-	"github.com/johnfercher/maroto/v2/pkg/props"
 	"github.com/kubescape/go-logger"
 	"github.com/kubescape/go-logger/helpers"
 	"github.com/kubescape/kubescape/v3/core/cautils"
 	"github.com/kubescape/kubescape/v3/core/pkg/resultshandling/printer"
-	"github.com/kubescape/kubescape/v3/core/pkg/resultshandling/printer/v2/pdf"
 	"github.com/kubescape/kubescape/v3/core/pkg/resultshandling/printer/v2/prettyprinter/tableprinter/utils"
 	"github.com/kubescape/opa-utils/reporthandling/results/v1/reportsummary"
+
+	"github.com/johnfercher/maroto/pkg/color"
+	"github.com/johnfercher/maroto/pkg/consts"
+	"github.com/johnfercher/maroto/pkg/pdf"
+	"github.com/johnfercher/maroto/pkg/props"
 )

 const (
@@ -24,6 +28,11 @@ const (
 	pdfOutputExt  = ".pdf"
 )

+var (
+	//go:embed pdf/logo.png
+	kubescapeLogo []byte
+)
+
 var _ printer.IPrinter = &PdfPrinter{}

 type PdfPrinter struct {
@@ -58,79 +67,219 @@ func (pp *PdfPrinter) Score(score float32) {

 	fmt.Fprintf(os.Stderr, "\nOverall compliance-score (100- Excellent, 0- All failed): %d\n", cautils.Float32ToInt(score))
 }
+func (pp *PdfPrinter) printInfo(m pdf.Maroto, summaryDetails *reportsummary.SummaryDetails, infoMap []infoStars) {
+	emptyRowCounter := 1
+	for i := range infoMap {
+		if infoMap[i].info != "" {
+			m.Row(5, func() {
+				m.Col(12, func() {
+					m.Text(fmt.Sprintf("%v %v", infoMap[i].stars, infoMap[i].info), props.Text{
+						Style:       consts.Bold,
+						Align:       consts.Left,
+						Size:        8,
+						Extrapolate: false,
+						Color: color.Color{
+							Red:   0,
+							Green: 0,
+							Blue:  255,
+						},
+					})
+				})
+			})
+			if emptyRowCounter < len(infoMap) {
+				m.Row(2.5, func() {})
+				emptyRowCounter++
+			}
+		}
+	}
+
+}

 func (pp *PdfPrinter) PrintNextSteps() {

 }

-// ActionPrint is responsible for generating a report in pdf format
 func (pp *PdfPrinter) ActionPrint(ctx context.Context, opaSessionObj *cautils.OPASessionObj, imageScanData []cautils.ImageScanData) {
 	if opaSessionObj == nil {
 		logger.L().Ctx(ctx).Error("failed to print results, missing data")
 		return
 	}

-	outBuff, err := pp.generatePdf(&opaSessionObj.Report.SummaryDetails)
+	sortedControlIDs := getSortedControlsIDs(opaSessionObj.Report.SummaryDetails.Controls)
+
+	infoToPrintInfo := mapInfoToPrintInfo(opaSessionObj.Report.SummaryDetails.Controls)
+	m := pdf.NewMaroto(consts.Portrait, consts.A4)
+	pp.printHeader(m)
+	pp.printFramework(m, opaSessionObj.Report.SummaryDetails.ListFrameworks())
+	pp.printTable(m, &opaSessionObj.Report.SummaryDetails, sortedControlIDs)
+	pp.printFinalResult(m, &opaSessionObj.Report.SummaryDetails)
+	pp.printInfo(m, &opaSessionObj.Report.SummaryDetails, infoToPrintInfo)
+
+	// Extrat output buffer.
+	outBuff, err := m.Output()
 	if err != nil {
 		logger.L().Ctx(ctx).Error("failed to generate pdf format", helpers.Error(err))
 		return
 	}

-	if _, err := pp.writer.Write(outBuff); err != nil {
+	if _, err := pp.writer.Write(outBuff.Bytes()); err != nil {
 		logger.L().Ctx(ctx).Error("failed to write results", helpers.Error(err))
 		return
 	}
 	printer.LogOutputFile(pp.writer.Name())
 }

-func (pp *PdfPrinter) generatePdf(summaryDetails *reportsummary.SummaryDetails) ([]byte, error) {
-	sortedControlIDs := getSortedControlsIDs(summaryDetails.Controls)
-	infoToPrintInfo := mapInfoToPrintInfo(summaryDetails.Controls)
+// printHeader prints the Kubescape logo and report date
+func (pp *PdfPrinter) printHeader(m pdf.Maroto) {
+	// Retrieve current time (we need it for the report timestamp).
+	t := time.Now()
+	// Enconde PNG into Base64 to embed it into the pdf.
+	kubescapeLogoEnc := b64.StdEncoding.EncodeToString(kubescapeLogo)

-	template := pdf.NewReportTemplate()
-	template.GenerateHeader(utils.FrameworksScoresToString(summaryDetails.ListFrameworks()), time.Now().Format(time.DateTime))
-	err := template.GenerateTable(pp.getTableObjects(summaryDetails, sortedControlIDs),
-		summaryDetails.NumberOfResources().Failed(), summaryDetails.NumberOfResources().All(), summaryDetails.ComplianceScore)
-
-	if err != nil {
-		return nil, err
-	}
-	template.GenerateInfoRows(pp.getFormattedInformation(infoToPrintInfo))
-	return template.GetPdf()
+	m.SetPageMargins(10, 15, 10)
+	m.Row(40, func() {
+		//m.Text(fmt.Sprintf("Security Assessment"), props.Text{
+		//	Align:  consts.Center,
+		//	Size:   24,
+		//	Family: consts.Arial,
+		//	Style:  consts.Bold,
+		//})
+		_ = m.Base64Image(kubescapeLogoEnc, consts.Png, props.Rect{
+			Center:  true,
+			Percent: 100,
+		})
+	})
+	m.Row(6, func() {
+		m.Text(fmt.Sprintf("Report date: %d-%02d-%02dT%02d:%02d:%02d",
+			t.Year(),
+			t.Month(),
+			t.Day(),
+			t.Hour(),
+			t.Minute(),
+			t.Second()), props.Text{
+			Align:  consts.Left,
+			Size:   6.0,
+			Style:  consts.Bold,
+			Family: consts.Arial,
+		})
+	})
+	m.Line(1)
 }

-func (pp *PdfPrinter) getFormattedInformation(infoMap []infoStars) []string {
-	rows := make([]string, 0, len(infoMap))
-	for i := range infoMap {
-		if infoMap[i].info != "" {
-			rows = append(rows, fmt.Sprintf("%v %v", infoMap[i].stars, infoMap[i].info))
-		}
-	}
-	return rows
+// printFramework prints the PDF frameworks after the PDF header
+func (pp *PdfPrinter) printFramework(m pdf.Maroto, frameworks []reportsummary.IFrameworkSummary) {
+	m.Row(10, func() {
+		m.Text(utils.FrameworksScoresToString(frameworks), props.Text{
+			Align:  consts.Center,
+			Size:   8,
+			Family: consts.Arial,
+			Style:  consts.Bold,
+		})
+	})
 }

-// getTableData is responsible for getting the table data in a standardized format
-func (pp *PdfPrinter) getTableObjects(summaryDetails *reportsummary.SummaryDetails, sortedControlIDs [][]string) *[]pdf.TableObject {
+// printTable creates the PDF table
+func (pp *PdfPrinter) printTable(m pdf.Maroto, summaryDetails *reportsummary.SummaryDetails, sortedControlIDs [][]string) {
+	headers := getControlTableHeaders(false)
 	infoToPrintInfoMap := mapInfoToPrintInfo(summaryDetails.Controls)
-	var controls []pdf.TableObject
+	var controls [][]string
 	for i := len(sortedControlIDs) - 1; i >= 0; i-- {
 		for _, c := range sortedControlIDs[i] {
-			row := generateTableRow(summaryDetails.Controls.GetControl(reportsummary.EControlCriteriaID, c), infoToPrintInfoMap)
-			controls = append(controls, *pdf.NewTableRow(
-				row.ref, row.name, row.counterFailed, row.counterAll, row.severity, row.complianceScore, getSeverityColor,
-			))
+			row := generateRowPdf(summaryDetails.Controls.GetControl(reportsummary.EControlCriteriaID, c), infoToPrintInfoMap, true)
+			if len(row) > 0 {
+				controls = append(controls, row)
+			}
 		}
 	}
-	return &controls
+
+	size := 6.0
+	gridSize := []uint{1, 1, 6, 1, 1, 2}
+
+	m.TableList(headers, controls, props.TableList{
+		HeaderProp: props.TableListContent{
+			Family:    consts.Arial,
+			Style:     consts.Bold,
+			Size:      size,
+			GridSizes: gridSize,
+		},
+		ContentProp: props.TableListContent{
+			Family:                          consts.Courier,
+			Style:                           consts.Normal,
+			Size:                            size,
+			GridSizes:                       gridSize,
+			CellTextColorChangerColumnIndex: 0,
+			CellTextColorChangerFunc: func(cellValue string) color.Color {
+				if cellValue == "Critical" {
+					return color.Color{
+						Red:   255,
+						Green: 0,
+						Blue:  0,
+					}
+				} else if cellValue == "High" {
+					return color.Color{
+						Red:   0,
+						Green: 0,
+						Blue:  255,
+					}
+				} else if cellValue == "Medium" {
+					return color.Color{
+						Red:   252,
+						Green: 186,
+						Blue:  3,
+					}
+				}
+				return color.NewBlack()
+			},
+		},
+		Align: consts.Left,
+		AlternatedBackground: &color.Color{
+			Red:   224,
+			Green: 224,
+			Blue:  224,
+		},
+		HeaderContentSpace: 2.0,
+		Line:               false,
+	})
+	m.Line(1)
+	m.Row(2, func() {})
 }

-func getSeverityColor(severity string) *props.Color {
-	if severity == "Critical" {
-		return &props.Color{Red: 255, Green: 0, Blue: 0}
-	} else if severity == "High" {
-		return &props.Color{Red: 0, Green: 0, Blue: 255}
-	} else if severity == "Medium" {
-		return &props.Color{Red: 252, Green: 186, Blue: 3}
-	}
-	return &props.BlackColor
+// printFinalResult adds the final results
+func (pp *PdfPrinter) printFinalResult(m pdf.Maroto, summaryDetails *reportsummary.SummaryDetails) {
+	m.Row(_rowLen, func() {
+		m.Col(1, func() {
+		})
+		m.Col(5, func() {
+			m.Text("Resource summary", props.Text{
+				Align:  consts.Left,
+				Size:   8.0,
+				Style:  consts.Bold,
+				Family: consts.Arial,
+			})
+		})
+		m.Col(2, func() {
+			m.Text(fmt.Sprintf("%d", summaryDetails.NumberOfResources().Failed()), props.Text{
+				Align:  consts.Left,
+				Size:   8.0,
+				Style:  consts.Bold,
+				Family: consts.Arial,
+			})
+		})
+		m.Col(2, func() {
+			m.Text(fmt.Sprintf("%d", summaryDetails.NumberOfResources().All()), props.Text{
+				Align:  consts.Left,
+				Size:   8.0,
+				Style:  consts.Bold,
+				Family: consts.Arial,
+			})
+		})
+		m.Col(2, func() {
+			m.Text(fmt.Sprintf("%.2f%s", summaryDetails.ComplianceScore, "%"), props.Text{
+				Align:  consts.Left,
+				Size:   8.0,
+				Style:  consts.Bold,
+				Family: consts.Arial,
+			})
+		})
+	})
 }
--- a/core/pkg/resultshandling/printer/v2/pdf/.maroto.yml
+++ b/core/pkg/resultshandling/printer/v2/pdf/.maroto.yml
@@ -1 +0,0 @@
-test_path: "testStructure/"
--- a/core/pkg/resultshandling/printer/v2/pdf/report_template.go
+++ b/core/pkg/resultshandling/printer/v2/pdf/report_template.go
@@ -1,195 +0,0 @@
-package pdf
-
-import (
-	_ "embed"
-	"fmt"
-
-	"github.com/johnfercher/go-tree/node"
-	"github.com/johnfercher/maroto/v2"
-	"github.com/johnfercher/maroto/v2/pkg/components/image"
-	"github.com/johnfercher/maroto/v2/pkg/components/line"
-	"github.com/johnfercher/maroto/v2/pkg/components/list"
-	"github.com/johnfercher/maroto/v2/pkg/components/row"
-	"github.com/johnfercher/maroto/v2/pkg/components/text"
-	"github.com/johnfercher/maroto/v2/pkg/config"
-	"github.com/johnfercher/maroto/v2/pkg/consts/align"
-	"github.com/johnfercher/maroto/v2/pkg/consts/extension"
-	"github.com/johnfercher/maroto/v2/pkg/consts/fontfamily"
-	"github.com/johnfercher/maroto/v2/pkg/consts/fontstyle"
-	"github.com/johnfercher/maroto/v2/pkg/consts/orientation"
-	"github.com/johnfercher/maroto/v2/pkg/consts/pagesize"
-	"github.com/johnfercher/maroto/v2/pkg/core"
-	"github.com/johnfercher/maroto/v2/pkg/props"
-)
-
-var (
-	//go:embed logo.png
-	kubescapeLogo []byte
-)
-
-type getTextColorFunc func(severity string) *props.Color
-
-type Template struct {
-	maroto core.Maroto
-}
-
-// New Report Template is responsible for creating an object that generates a report with the submitted data
-func NewReportTemplate() *Template {
-	return &Template{
-		maroto: maroto.New(
-			config.NewBuilder().
-				WithPageSize(pagesize.A4).
-				WithOrientation(orientation.Vertical).
-				WithLeftMargin(10).
-				WithTopMargin(15).
-				WithRightMargin(10).
-				Build()),
-	}
-}
-
-// GetPdf is responsible for generating the pdf and returning the file's bytes
-func (t *Template) GetPdf() ([]byte, error) {
-	doc, err := t.maroto.Generate()
-	if err != nil {
-		return nil, err
-	}
-	return doc.GetBytes(), nil
-}
-
-// printHeader prints the Kubescape logo, report date and framework
-func (t *Template) GenerateHeader(scoreOfScannedFrameworks, reportDate string) *Template {
-	t.maroto.AddRow(40, image.NewFromBytesCol(12, kubescapeLogo, extension.Png, props.Rect{
-		Center:  true,
-		Percent: 100,
-	}))
-
-	t.maroto.AddRow(6, text.NewCol(12, fmt.Sprintf("Report date: %s", reportDate),
-		props.Text{
-			Align:  align.Left,
-			Size:   6.0,
-			Style:  fontstyle.Bold,
-			Family: fontfamily.Arial,
-		}))
-
-	t.maroto.AddAutoRow(line.NewCol(12, props.Line{Thickness: 0.3, SizePercent: 100}))
-
-	t.maroto.AddRow(10, text.NewCol(12, scoreOfScannedFrameworks, props.Text{
-		Align:  align.Center,
-		Size:   8,
-		Family: fontfamily.Arial,
-		Style:  fontstyle.Bold,
-	}))
-
-	return t
-}
-
-// GenerateTable is responsible for adding data in table format to the pdf
-func (t *Template) GenerateTable(tableRows *[]TableObject, totalFailed, total int, score float32) error {
-	rows, err := list.Build[TableObject](*tableRows)
-	if err != nil {
-		return err
-	}
-	t.maroto.AddRows(rows...)
-	t.maroto.AddRows(
-		line.NewAutoRow(props.Line{Thickness: 0.3, SizePercent: 100}),
-		row.New(2),
-	)
-	t.generateTableTableResult(totalFailed, total, score)
-
-	return nil
-}
-
-// GenerateInfoRows is responsible for adding the information in pdf
-func (t *Template) GenerateInfoRows(rows []string) *Template {
-	for _, row := range rows {
-		t.maroto.AddAutoRow(text.NewCol(12, row, props.Text{
-			Style: fontstyle.Bold,
-			Align: align.Left,
-			Top:   2.5,
-			Size:  8,
-			Color: &props.Color{
-				Red:   0,
-				Green: 0,
-				Blue:  255,
-			},
-		}))
-	}
-	return t
-}
-
-func (t *Template) generateTableTableResult(totalFailed, total int, score float32) {
-	defaultProps := props.Text{
-		Align:  align.Left,
-		Size:   8,
-		Style:  fontstyle.Bold,
-		Family: fontfamily.Arial,
-	}
-
-	t.maroto.AddRow(10,
-		text.NewCol(5, "Resource summary", defaultProps),
-		text.NewCol(2, fmt.Sprintf("%d", totalFailed), defaultProps),
-		text.NewCol(2, fmt.Sprintf("%d", total), defaultProps),
-		text.NewCol(2, fmt.Sprintf("%.2f%s", score, "%"), defaultProps),
-	)
-}
-
-func (t *Template) GetStructure() *node.Node[core.Structure] {
-	return t.maroto.GetStructure()
-}
-
-// TableObject is responsible for mapping the table data, it will be sent to Maroto and will make it possible to generate the table
-type TableObject struct {
-	ref             string
-	name            string
-	counterFailed   string
-	counterAll      string
-	severity        string
-	complianceScore string
-	getTextColor    getTextColorFunc
-}
-
-func NewTableRow(ref, name, counterFailed, counterAll, severity, score string, getTextColor getTextColorFunc) *TableObject {
-	return &TableObject{
-		ref:             ref,
-		name:            name,
-		counterFailed:   counterFailed,
-		counterAll:      counterAll,
-		severity:        severity,
-		complianceScore: score,
-		getTextColor:    getTextColor,
-	}
-}
-
-func (t TableObject) GetHeader() core.Row {
-	return row.New(10).Add(
-		text.NewCol(1, "Severity", props.Text{Size: 6, Family: fontfamily.Arial, Style: fontstyle.Bold}),
-		text.NewCol(1, "Control reference", props.Text{Size: 6, Family: fontfamily.Arial, Style: fontstyle.Bold}),
-		text.NewCol(6, "Control name", props.Text{Size: 6, Family: fontfamily.Arial, Style: fontstyle.Bold}),
-		text.NewCol(1, "Failed resources", props.Text{Size: 6, Family: fontfamily.Arial, Style: fontstyle.Bold}),
-		text.NewCol(1, "All resources", props.Text{Size: 6, Family: fontfamily.Arial, Style: fontstyle.Bold}),
-		text.NewCol(2, "Compliance score", props.Text{Size: 6, Family: fontfamily.Arial, Style: fontstyle.Bold}),
-	)
-}
-
-func (t TableObject) GetContent(i int) core.Row {
-	r := row.New(3).Add(
-		text.NewCol(1, t.severity, props.Text{Style: fontstyle.Normal, Family: fontfamily.Courier, Size: 6, Color: t.getTextColor(t.severity)}),
-		text.NewCol(1, t.ref, props.Text{Style: fontstyle.Normal, Family: fontfamily.Courier, Size: 6, Color: &props.Color{}}),
-		text.NewCol(6, t.name, props.Text{Style: fontstyle.Normal, Family: fontfamily.Courier, Size: 6}),
-		text.NewCol(1, t.counterFailed, props.Text{Style: fontstyle.Normal, Family: fontfamily.Courier, Size: 6}),
-		text.NewCol(1, t.counterAll, props.Text{Style: fontstyle.Normal, Family: fontfamily.Courier, Size: 6}),
-		text.NewCol(2, t.complianceScore, props.Text{VerticalPadding: 1, Style: fontstyle.Normal, Family: fontfamily.Courier, Size: 6}),
-	)
-
-	if i%2 == 0 {
-		r.WithStyle(&props.Cell{
-			BackgroundColor: &props.Color{
-				Red:   224,
-				Green: 224,
-				Blue:  224,
-			},
-		})
-	}
-
-	return r
-}
--- a/core/pkg/resultshandling/printer/v2/pdf/report_template_test.go
+++ b/core/pkg/resultshandling/printer/v2/pdf/report_template_test.go
@@ -1,58 +0,0 @@
-package pdf_test
-
-import (
-	"testing"
-
-	"github.com/johnfercher/maroto/v2/pkg/props"
-	"github.com/johnfercher/maroto/v2/pkg/test"
-	"github.com/kubescape/kubescape/v3/core/pkg/resultshandling/printer/v2/pdf"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestGetPdf(t *testing.T) {
-	t.Run("when GetPdf is called, it should return pdf bytes", func(t *testing.T) {
-
-		template := pdf.NewReportTemplate().GenerateHeader("Framework test 1, Framework test 2", "2024-04-01 20:31:00")
-		bytes, err := template.GetPdf()
-
-		assert.Nil(t, err)
-		assert.NotNil(t, bytes)
-	})
-}
-
-func TestGenerateHeader(t *testing.T) {
-	t.Run("when generateHeader is called, it should set the header in the pdf", func(t *testing.T) {
-		template := pdf.NewReportTemplate().GenerateHeader("Framework test 1, Framework test 2", "2024-04-01 20:31:00")
-
-		node := template.GetStructure()
-
-		assert.NotNil(t, node)
-		test.New(t).Assert(node).Equals("headerTemplate.json")
-	})
-}
-
-func TestGenerateTable(t *testing.T) {
-	t.Run("when generateTable is called, it should set the table in the pdf", func(t *testing.T) {
-		TableObjectMock := pdf.NewTableRow(
-			"ref", "name", "failed", "all", "severity", "score",
-			func(severity string) *props.Color { return &props.Color{Red: 0, Blue: 0, Green: 0} },
-		)
-
-		template := pdf.NewReportTemplate()
-
-		err := template.GenerateTable(&[]pdf.TableObject{*TableObjectMock}, 100, 10, 10.0)
-
-		assert.Nil(t, err)
-		test.New(t).Assert(template.GetStructure()).Equals("tableTemplate.json")
-	})
-}
-
-func TestGenerateInfoRows(t *testing.T) {
-	t.Run("when generateInfoRows is called, it should set the info rows in the pdf", func(t *testing.T) {
-
-		template := pdf.NewReportTemplate().GenerateInfoRows([]string{"row info 1", "row info 2", "row info 3"})
-
-		assert.NotNil(t, template)
-		test.New(t).Assert(template.GetStructure()).Equals("infoTemplate.json")
-	})
-}
--- a/core/pkg/resultshandling/printer/v2/pdf/testStructure/headerTemplate.json
+++ b/core/pkg/resultshandling/printer/v2/pdf/testStructure/headerTemplate.json
@@ -1,127 +0,0 @@
-{
-    "type": "maroto",
-    "details": {
-        "chunk_workers": 1,
-        "config_margin_bottom": 20.0025,
-        "config_margin_left": 10,
-        "config_margin_right": 10,
-        "config_margin_top": 15,
-        "config_max_grid_sum": 12,
-        "config_provider_type": "gofpdf",
-        "generation_mode": "sequential",
-        "maroto_dimension_height": 297,
-        "maroto_dimension_width": 210,
-        "prop_font_color": "RGB(0, 0, 0)",
-        "prop_font_family": "arial",
-        "prop_font_size": 10
-    },
-    "nodes": [
-        {
-            "type": "page",
-            "nodes": [
-                {
-                    "value": 40,
-                    "type": "row",
-                    "nodes": [
-                        {
-                            "value": 12,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "value": "iVBORw0KGgoAAA==",
-                                    "type": "bytesImage",
-                                    "details": {
-                                        "bytes_size": 54270,
-                                        "extension": "png",
-                                        "prop_center": true,
-                                        "prop_percent": 100
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "value": 6,
-                    "type": "row",
-                    "nodes": [
-                        {
-                            "value": 12,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "value": "Report date: 2024-04-01 20:31:00",
-                                    "type": "text",
-                                    "details": {
-                                        "prop_align": "L",
-                                        "prop_breakline_strategy": "empty_space_strategy",
-                                        "prop_color": "RGB(0, 0, 0)",
-                                        "prop_font_family": "arial",
-                                        "prop_font_size": 6,
-                                        "prop_font_style": "B"
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "value": 0.3,
-                    "type": "row",
-                    "nodes": [
-                        {
-                            "value": 12,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "type": "line",
-                                    "details": {
-                                        "prop_offset_percent": 5,
-                                        "prop_orientation": "horizontal",
-                                        "prop_size_percent": 100,
-                                        "prop_style": "solid",
-                                        "prop_thickness": 0.3
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "value": 10,
-                    "type": "row",
-                    "nodes": [
-                        {
-                            "value": 12,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "value": "Framework test 1, Framework test 2",
-                                    "type": "text",
-                                    "details": {
-                                        "prop_align": "C",
-                                        "prop_breakline_strategy": "empty_space_strategy",
-                                        "prop_color": "RGB(0, 0, 0)",
-                                        "prop_font_family": "arial",
-                                        "prop_font_size": 8,
-                                        "prop_font_style": "B"
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "value": 205.6975,
-                    "type": "row",
-                    "nodes": [
-                        {
-                            "value": 12,
-                            "type": "col"
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
--- a/core/pkg/resultshandling/printer/v2/pdf/testStructure/infoTemplate.json
+++ b/core/pkg/resultshandling/printer/v2/pdf/testStructure/infoTemplate.json
@@ -1,110 +0,0 @@
-{
-    "type": "maroto",
-    "details": {
-        "chunk_workers": 1,
-        "config_margin_bottom": 20.0025,
-        "config_margin_left": 10,
-        "config_margin_right": 10,
-        "config_margin_top": 15,
-        "config_max_grid_sum": 12,
-        "config_provider_type": "gofpdf",
-        "generation_mode": "sequential",
-        "maroto_dimension_height": 297,
-        "maroto_dimension_width": 210,
-        "prop_font_color": "RGB(0, 0, 0)",
-        "prop_font_family": "arial",
-        "prop_font_size": 10
-    },
-    "nodes": [
-        {
-            "type": "page",
-            "nodes": [
-                {
-                    "value": 5.322222222222223,
-                    "type": "row",
-                    "nodes": [
-                        {
-                            "value": 12,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "value": "row info 1",
-                                    "type": "text",
-                                    "details": {
-                                        "prop_align": "L",
-                                        "prop_breakline_strategy": "empty_space_strategy",
-                                        "prop_color": "RGB(0, 0, 255)",
-                                        "prop_font_family": "arial",
-                                        "prop_font_size": 8,
-                                        "prop_font_style": "B",
-                                        "prop_top": 2.5
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "value": 5.322222222222223,
-                    "type": "row",
-                    "nodes": [
-                        {
-                            "value": 12,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "value": "row info 2",
-                                    "type": "text",
-                                    "details": {
-                                        "prop_align": "L",
-                                        "prop_breakline_strategy": "empty_space_strategy",
-                                        "prop_color": "RGB(0, 0, 255)",
-                                        "prop_font_family": "arial",
-                                        "prop_font_size": 8,
-                                        "prop_font_style": "B",
-                                        "prop_top": 2.5
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "value": 5.322222222222223,
-                    "type": "row",
-                    "nodes": [
-                        {
-                            "value": 12,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "value": "row info 3",
-                                    "type": "text",
-                                    "details": {
-                                        "prop_align": "L",
-                                        "prop_breakline_strategy": "empty_space_strategy",
-                                        "prop_color": "RGB(0, 0, 255)",
-                                        "prop_font_family": "arial",
-                                        "prop_font_size": 8,
-                                        "prop_font_style": "B",
-                                        "prop_top": 2.5
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "value": 246.03083333333333,
-                    "type": "row",
-                    "nodes": [
-                        {
-                            "value": 12,
-                            "type": "col"
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
--- a/core/pkg/resultshandling/printer/v2/pdf/testStructure/tableTemplate.json
+++ b/core/pkg/resultshandling/printer/v2/pdf/testStructure/tableTemplate.json
@@ -1,377 +0,0 @@
-{
-    "type": "maroto",
-    "details": {
-        "chunk_workers": 1,
-        "config_margin_bottom": 20.0025,
-        "config_margin_left": 10,
-        "config_margin_right": 10,
-        "config_margin_top": 15,
-        "config_max_grid_sum": 12,
-        "config_provider_type": "gofpdf",
-        "generation_mode": "sequential",
-        "maroto_dimension_height": 297,
-        "maroto_dimension_width": 210,
-        "prop_font_color": "RGB(0, 0, 0)",
-        "prop_font_family": "arial",
-        "prop_font_size": 10
-    },
-    "nodes": [
-        {
-            "type": "page",
-            "nodes": [
-                {
-                    "value": 10,
-                    "type": "row",
-                    "nodes": [
-                        {
-                            "value": 1,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "value": "Severity",
-                                    "type": "text",
-                                    "details": {
-                                        "prop_align": "L",
-                                        "prop_breakline_strategy": "empty_space_strategy",
-                                        "prop_color": "RGB(0, 0, 0)",
-                                        "prop_font_family": "arial",
-                                        "prop_font_size": 6,
-                                        "prop_font_style": "B"
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "value": 1,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "value": "Control reference",
-                                    "type": "text",
-                                    "details": {
-                                        "prop_align": "L",
-                                        "prop_breakline_strategy": "empty_space_strategy",
-                                        "prop_color": "RGB(0, 0, 0)",
-                                        "prop_font_family": "arial",
-                                        "prop_font_size": 6,
-                                        "prop_font_style": "B"
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "value": 6,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "value": "Control name",
-                                    "type": "text",
-                                    "details": {
-                                        "prop_align": "L",
-                                        "prop_breakline_strategy": "empty_space_strategy",
-                                        "prop_color": "RGB(0, 0, 0)",
-                                        "prop_font_family": "arial",
-                                        "prop_font_size": 6,
-                                        "prop_font_style": "B"
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "value": 1,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "value": "Failed resources",
-                                    "type": "text",
-                                    "details": {
-                                        "prop_align": "L",
-                                        "prop_breakline_strategy": "empty_space_strategy",
-                                        "prop_color": "RGB(0, 0, 0)",
-                                        "prop_font_family": "arial",
-                                        "prop_font_size": 6,
-                                        "prop_font_style": "B"
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "value": 1,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "value": "All resources",
-                                    "type": "text",
-                                    "details": {
-                                        "prop_align": "L",
-                                        "prop_breakline_strategy": "empty_space_strategy",
-                                        "prop_color": "RGB(0, 0, 0)",
-                                        "prop_font_family": "arial",
-                                        "prop_font_size": 6,
-                                        "prop_font_style": "B"
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "value": 2,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "value": "Compliance score",
-                                    "type": "text",
-                                    "details": {
-                                        "prop_align": "L",
-                                        "prop_breakline_strategy": "empty_space_strategy",
-                                        "prop_color": "RGB(0, 0, 0)",
-                                        "prop_font_family": "arial",
-                                        "prop_font_size": 6,
-                                        "prop_font_style": "B"
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "value": 3,
-                    "type": "row",
-                    "details": {
-                        "prop_background_color": "RGB(224, 224, 224)"
-                    },
-                    "nodes": [
-                        {
-                            "value": 1,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "value": "severity",
-                                    "type": "text",
-                                    "details": {
-                                        "prop_align": "L",
-                                        "prop_breakline_strategy": "empty_space_strategy",
-                                        "prop_color": "RGB(0, 0, 0)",
-                                        "prop_font_family": "courier",
-                                        "prop_font_size": 6
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "value": 1,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "value": "ref",
-                                    "type": "text",
-                                    "details": {
-                                        "prop_align": "L",
-                                        "prop_breakline_strategy": "empty_space_strategy",
-                                        "prop_color": "RGB(0, 0, 0)",
-                                        "prop_font_family": "courier",
-                                        "prop_font_size": 6
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "value": 6,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "value": "name",
-                                    "type": "text",
-                                    "details": {
-                                        "prop_align": "L",
-                                        "prop_breakline_strategy": "empty_space_strategy",
-                                        "prop_color": "RGB(0, 0, 0)",
-                                        "prop_font_family": "courier",
-                                        "prop_font_size": 6
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "value": 1,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "value": "failed",
-                                    "type": "text",
-                                    "details": {
-                                        "prop_align": "L",
-                                        "prop_breakline_strategy": "empty_space_strategy",
-                                        "prop_color": "RGB(0, 0, 0)",
-                                        "prop_font_family": "courier",
-                                        "prop_font_size": 6
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "value": 1,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "value": "all",
-                                    "type": "text",
-                                    "details": {
-                                        "prop_align": "L",
-                                        "prop_breakline_strategy": "empty_space_strategy",
-                                        "prop_color": "RGB(0, 0, 0)",
-                                        "prop_font_family": "courier",
-                                        "prop_font_size": 6
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "value": 2,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "value": "score",
-                                    "type": "text",
-                                    "details": {
-                                        "prop_align": "L",
-                                        "prop_breakline_strategy": "empty_space_strategy",
-                                        "prop_color": "RGB(0, 0, 0)",
-                                        "prop_font_family": "courier",
-                                        "prop_font_size": 6,
-                                        "prop_vertical_padding": 1
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "value": 0.3,
-                    "type": "row",
-                    "nodes": [
-                        {
-                            "value": 0,
-                            "type": "col",
-                            "details": {
-                                "is_max": true
-                            },
-                            "nodes": [
-                                {
-                                    "type": "line",
-                                    "details": {
-                                        "prop_offset_percent": 5,
-                                        "prop_orientation": "horizontal",
-                                        "prop_size_percent": 100,
-                                        "prop_style": "solid",
-                                        "prop_thickness": 0.3
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "value": 2,
-                    "type": "row",
-                    "nodes": [
-                        {
-                            "value": 0,
-                            "type": "col",
-                            "details": {
-                                "is_max": true
-                            }
-                        }
-                    ]
-                },
-                {
-                    "value": 10,
-                    "type": "row",
-                    "nodes": [
-                        {
-                            "value": 5,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "value": "Resource summary",
-                                    "type": "text",
-                                    "details": {
-                                        "prop_align": "L",
-                                        "prop_breakline_strategy": "empty_space_strategy",
-                                        "prop_color": "RGB(0, 0, 0)",
-                                        "prop_font_family": "arial",
-                                        "prop_font_size": 8,
-                                        "prop_font_style": "B"
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "value": 2,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "value": "100",
-                                    "type": "text",
-                                    "details": {
-                                        "prop_align": "L",
-                                        "prop_breakline_strategy": "empty_space_strategy",
-                                        "prop_color": "RGB(0, 0, 0)",
-                                        "prop_font_family": "arial",
-                                        "prop_font_size": 8,
-                                        "prop_font_style": "B"
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "value": 2,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "value": "10",
-                                    "type": "text",
-                                    "details": {
-                                        "prop_align": "L",
-                                        "prop_breakline_strategy": "empty_space_strategy",
-                                        "prop_color": "RGB(0, 0, 0)",
-                                        "prop_font_family": "arial",
-                                        "prop_font_size": 8,
-                                        "prop_font_style": "B"
-                                    }
-                                }
-                            ]
-                        },
-                        {
-                            "value": 2,
-                            "type": "col",
-                            "nodes": [
-                                {
-                                    "value": "10.00%",
-                                    "type": "text",
-                                    "details": {
-                                        "prop_align": "L",
-                                        "prop_breakline_strategy": "empty_space_strategy",
-                                        "prop_color": "RGB(0, 0, 0)",
-                                        "prop_font_family": "arial",
-                                        "prop_font_size": 8,
-                                        "prop_font_style": "B"
-                                    }
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "value": 236.6975,
-                    "type": "row",
-                    "nodes": [
-                        {
-                            "value": 12,
-                            "type": "col"
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
--- a/core/pkg/resultshandling/printer/v2/sarifprinter.go
+++ b/core/pkg/resultshandling/printer/v2/sarifprinter.go
@@ -201,7 +201,7 @@ func (sp *SARIFPrinter) printConfigurationScan(ctx context.Context, opaSessionOb
 			}

 			// If the fileType is helm chart
-			if templateNodes, ok := opaSessionObj.TemplateMapping[resourceID]; ok && len(templateNodes.Nodes) > 0 {
+			if templateNodes, ok := opaSessionObj.TemplateMapping[resourceID]; ok {
 				mappingnodes = templateNodes.Nodes
 				helmChartFileType = true
 			}
@@ -209,7 +209,8 @@ func (sp *SARIFPrinter) printConfigurationScan(ctx context.Context, opaSessionOb
 			rsrcAbsPath := path.Join(basePath, filepath)
 			locationResolver, err := locationresolver.NewFixPathLocationResolver(rsrcAbsPath) //
 			if err != nil && !helmChartFileType {
-				logger.L().Debug("failed to create location resolver, will use default location", helpers.Error(err))
+				logger.L().Debug("failed to create location resolver", helpers.Error(err))
+				continue
 			}

 			for _, toPin := range result.AssociatedControls {
--- a/core/pkg/resultshandling/reporter/v2/reporteventreceiverutils.go
+++ b/core/pkg/resultshandling/reporter/v2/reporteventreceiverutils.go
@@ -15,7 +15,6 @@ func (report *ReportEventReceiver) setSubReport(opaSessionObj *cautils.OPASessio
 		Attributes:            opaSessionObj.Report.Attributes,
 		ClusterAPIServerInfo:  opaSessionObj.Report.ClusterAPIServerInfo,
 		CustomerGUIDGenerated: report.accountIdGenerated,
-		TriggeredByCLI:        opaSessionObj.TriggeredByCLI,
 	}
 	if opaSessionObj.Metadata != nil {
 		reportObj.Metadata = *opaSessionObj.Metadata
--- a/Show More
+++ b/Show More