diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 378366cd1f..03e8f735ee 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -236,6 +236,14 @@ jobs:
           push: true
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
+      
+      - name: Update Docker Hub Description
+        uses: peter-evans/dockerhub-description@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          repository: ${{ env.DOCKER_NAMESPACE }}/auto-discovery-kubernetes
+          readme-filepath: ./auto-discovery/kubernetes/docs/README.DockerHub-Core.md
 
   # ---- Build Stage | SDK Matrix ----
 
diff --git a/.github/workflows/helm-charts-release.yaml b/.github/workflows/helm-charts-release.yaml
index 9f269f5c60..c75ddd22cf 100644
--- a/.github/workflows/helm-charts-release.yaml
+++ b/.github/workflows/helm-charts-release.yaml
@@ -31,7 +31,6 @@ jobs:
             dir="$(dirname "${chart}")"
             cd "${dir}" || exit
             echo "Processing Helm Chart in $dir"
-            helm package --version $RELEASE_VERSION .
             NAME=$(yq eval '.name' - < Chart.yaml)
             if [ -d "docs" ]; then
               echo "Docs Folder found at: ${dir}/docs"
@@ -40,6 +39,7 @@ jobs:
             else
               echo "Ignoring Docs process for Chart $dir, because no `docs` folder found at: ${dir}/docs"
             fi
+            helm package --version $RELEASE_VERSION .
 
             curl --silent --show-error --http1.1 --user "${USERNAME}:${PASSWORD}" --data-binary "@${NAME}-${RELEASE_VERSION}.tgz" "${HELM_REGISTRY}/api/charts"
             sleep 5s
diff --git a/auto-discovery/kubernetes/Chart.yaml b/auto-discovery/kubernetes/Chart.yaml
index 638dafa345..d0efceb6d9 100644
--- a/auto-discovery/kubernetes/Chart.yaml
+++ b/auto-discovery/kubernetes/Chart.yaml
@@ -9,7 +9,7 @@ description: "Automatically creates secureCodeBox Scans for Resources found in t
 type: application
 
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: 3.0.0-beta1
+version: v3.1.0-alpha1
 kubeVersion: ">=v1.11.0-0"
 
 keywords:
diff --git a/demo-targets/bodgeit/Chart.yaml b/demo-targets/bodgeit/Chart.yaml
index e46f669558..32a8a8e45a 100644
--- a/demo-targets/bodgeit/Chart.yaml
+++ b/demo-targets/bodgeit/Chart.yaml
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 type: application
 appVersion: "v1.4.0"
 name: bodgeit
diff --git a/demo-targets/dummy-ssh/Chart.yaml b/demo-targets/dummy-ssh/Chart.yaml
index 73313a4b1f..cb37289817 100644
--- a/demo-targets/dummy-ssh/Chart.yaml
+++ b/demo-targets/dummy-ssh/Chart.yaml
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 type: application
 appVersion: "v1.0.0"
 name: dummy-ssh
diff --git a/demo-targets/http-webhook/Chart.yaml b/demo-targets/http-webhook/Chart.yaml
index af40c54aa6..da81982979 100644
--- a/demo-targets/http-webhook/Chart.yaml
+++ b/demo-targets/http-webhook/Chart.yaml
@@ -19,7 +19,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/demo-targets/juice-shop/Chart.yaml b/demo-targets/juice-shop/Chart.yaml
index fdcb70e4dc..2d41546e06 100644
--- a/demo-targets/juice-shop/Chart.yaml
+++ b/demo-targets/juice-shop/Chart.yaml
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 appVersion: "v12.7.0"
 name: juice-shop
 description: "OWASP Juice Shop: Probably the most modern and sophisticated insecure web application"
diff --git a/demo-targets/old-wordpress/Chart.yaml b/demo-targets/old-wordpress/Chart.yaml
index 46efded6aa..f0d8c4fdfd 100644
--- a/demo-targets/old-wordpress/Chart.yaml
+++ b/demo-targets/old-wordpress/Chart.yaml
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 appVersion: "4.0"
 name: old-wordpress
 description: "Insecure & Outdated Wordpress Instance: Never expose it to the internet!"
diff --git a/demo-targets/swagger-petstore/Chart.yaml b/demo-targets/swagger-petstore/Chart.yaml
index 5f9dc588bd..2a8b20f4f6 100644
--- a/demo-targets/swagger-petstore/Chart.yaml
+++ b/demo-targets/swagger-petstore/Chart.yaml
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 appVersion: "1.0.3"
 name: swagger-petstore
 description: "This is the sample petstore application"
diff --git a/demo-targets/unsafe-https/Chart.yaml b/demo-targets/unsafe-https/Chart.yaml
index 455785595d..fbcac0d141 100644
--- a/demo-targets/unsafe-https/Chart.yaml
+++ b/demo-targets/unsafe-https/Chart.yaml
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 type: application
 appVersion: "v1.0.0"
 name: unsafe-https
diff --git a/hooks/cascading-scans/.helmignore b/hooks/cascading-scans/.helmignore
index 17ac5b0e0d..c675d2c530 100644
--- a/hooks/cascading-scans/.helmignore
+++ b/hooks/cascading-scans/.helmignore
@@ -32,4 +32,9 @@ src/*
 config/*
 Dockerfile
 .dockerignore
-docs/
+docs/*
+hook/*
+integration-tests/*
+examples/*
+coverage/*
+Makefile
diff --git a/hooks/cascading-scans/Chart.yaml b/hooks/cascading-scans/Chart.yaml
index 6e7b798887..857e78854b 100644
--- a/hooks/cascading-scans/Chart.yaml
+++ b/hooks/cascading-scans/Chart.yaml
@@ -9,7 +9,7 @@ description: Starts possible subsequent security scans based on findings (e.g. o
 type: application
 
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 kubeVersion: ">=v1.11.0-0"
 
 keywords:
diff --git a/hooks/finding-post-processing/.helmignore b/hooks/finding-post-processing/.helmignore
index 38b63ea1e3..c675d2c530 100644
--- a/hooks/finding-post-processing/.helmignore
+++ b/hooks/finding-post-processing/.helmignore
@@ -32,5 +32,9 @@ src/*
 config/*
 Dockerfile
 .dockerignore
-docs/
-
+docs/*
+hook/*
+integration-tests/*
+examples/*
+coverage/*
+Makefile
diff --git a/hooks/finding-post-processing/Chart.yaml b/hooks/finding-post-processing/Chart.yaml
index 05b672f69e..6474695008 100644
--- a/hooks/finding-post-processing/Chart.yaml
+++ b/hooks/finding-post-processing/Chart.yaml
@@ -9,7 +9,7 @@ description: Lets you add or override a field to every finding that meets specif
 type: application
 
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 kubeVersion: ">=v1.11.0-0"
 
 keywords:
diff --git a/hooks/generic-webhook/.helmignore b/hooks/generic-webhook/.helmignore
index 17ac5b0e0d..8b8e4f4170 100644
--- a/hooks/generic-webhook/.helmignore
+++ b/hooks/generic-webhook/.helmignore
@@ -32,4 +32,9 @@ src/*
 config/*
 Dockerfile
 .dockerignore
-docs/
+docs/*
+hook/*
+integration-tests/*
+examples/*
+coverage/*
+Makefile
\ No newline at end of file
diff --git a/hooks/generic-webhook/Chart.yaml b/hooks/generic-webhook/Chart.yaml
index 437795c3e5..31f09d8c60 100644
--- a/hooks/generic-webhook/Chart.yaml
+++ b/hooks/generic-webhook/Chart.yaml
@@ -9,7 +9,7 @@ description: Lets you send http webhooks after scans are completed
 type: application
 
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 kubeVersion: ">=v1.11.0-0"
 
 keywords:
diff --git a/hooks/notification/.helmignore b/hooks/notification/.helmignore
index 38b63ea1e3..e6386b0850 100644
--- a/hooks/notification/.helmignore
+++ b/hooks/notification/.helmignore
@@ -32,5 +32,10 @@ src/*
 config/*
 Dockerfile
 .dockerignore
-docs/
+docs/*
+hook/*
+integration-tests/*
+examples/*
+coverage/*
+Makefile
 
diff --git a/hooks/notification/Chart.yaml b/hooks/notification/Chart.yaml
index 31190b1567..6319fb2474 100644
--- a/hooks/notification/Chart.yaml
+++ b/hooks/notification/Chart.yaml
@@ -8,7 +8,7 @@ description: Lets you send a findings result summary as hook to MS Teams, Slack,
 type: application
 
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 kubeVersion: ">=v1.11.0-0"
 
 dependencies: []
diff --git a/hooks/persistence-defectdojo/.helmignore b/hooks/persistence-defectdojo/.helmignore
index fea9267a57..2a4062abcb 100644
--- a/hooks/persistence-defectdojo/.helmignore
+++ b/hooks/persistence-defectdojo/.helmignore
@@ -34,10 +34,18 @@ Dockerfile
 .dockerignore
 gradle/
 .gradle/
+.settings/
+bin/
+build/
 src/
 gradlew
 gradlew.bat
 settings.gradle
 update.sh
 build/
-docs/
+docs/*
+hook/*
+integration-tests/*
+examples/*
+coverage/*
+Makefile
\ No newline at end of file
diff --git a/hooks/persistence-defectdojo/Chart.yaml b/hooks/persistence-defectdojo/Chart.yaml
index 09a4fe389d..5361391e4e 100644
--- a/hooks/persistence-defectdojo/Chart.yaml
+++ b/hooks/persistence-defectdojo/Chart.yaml
@@ -9,7 +9,7 @@ description: The defectdojo persistence provider persists secureCodeBox scan res
 type: application
 
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 
 appVersion: 1.12.0
 kubeVersion: ">=v1.11.0-0"
diff --git a/hooks/persistence-defectdojo/README.md.gotmpl b/hooks/persistence-defectdojo/README.md.gotmpl
deleted file mode 100644
index 409f4a0e91..0000000000
--- a/hooks/persistence-defectdojo/README.md.gotmpl
+++ /dev/null
@@ -1,160 +0,0 @@
-{{- /*
-SPDX-FileCopyrightText: 2021 iteratec GmbH
-
-SPDX-License-Identifier: Apache-2.0
-*/ -}}
----
-title: "DefectDojo"
-category: "hook"
-type: "persistenceProvider"
-state: "released"
-usecase: "Publishes all Scan Reports to OWASP DefectDojo."
----
-
-## About
-
-The DefectDojo hook imports the reports from scans automatically into [OWASP DefectDojo](https://www.defectdojo.org/).
-The hook uses the import scan [API from DefectDojo](https://defectdojo.readthedocs.io/en/latest/api-v2-docs.html) to import the scan results.
-
-This means that only scan types are supported by the hook which are both supported by the secureCodeBox and DefectDojo.
-These are:
-
-- Nmap
-- ZAP (Baseline, API Scan and Full Scan)
-- SSLyze
-- Trivy
-- Gitleaks
-
-:::caution
-
-Nikto is currently **not** supported even though it's supported by the secureCodeBox and DefectDojo as the secureCodeBox
-uses the Nikto JSON format while DefectDojo uses the XML format.
-
-:::
-
-After uploading the results to DefectDojo, it will use the findings parsed by DefectDojo to overwrite the
-original secureCodeBox findings identified by the parser. This lets you access the finding metadata like the false
-positive and duplicate status from DefectDojo in further ReadOnly hooks, e.g. send out Slack notification
-for non-duplicate & non-false positive findings only.
-
-:::caution
-
-Be careful when using the DefectDojo Hook in combination with other ReadAndWrite hooks. The secureCodeBox currently has
-no way to guarantee that one ReadAndWrite hook gets executed before another ReadAndWrite hook. This can lead to
-"lost update" problems as the DefectDojo hook will overwrite all findings, which disregards the results of previously
-run ReadAndWrite hooks.
-ReadOnly hooks work fine with the DefectDojo hook as they are always executed after ReadAndWrite Hooks.
-:::
-
-## Runtime Configuration
-
-The hook will automatically import the scan results into an engagement in DefectDojo.
-If the engagement doesn't exist the hook will create the engagement (CI/CD engagement) and all objects required for it
-(product & product type).
-
-You don't need any configuration for that to work, the hook will infer engagement & product names from the scan name.
-If you want more control over the names or add additional meta information like the version of the tested software you
-can add these via annotation to the scan. See examples below.
-
-| Scan Annotation                                                    | Description                | Default if not set                                                   | Notes                                                                                 |
-| ------------------------------------------------------------------ | -------------------------- | -------------------------------------------------------------------- | ------------------------------------------------------------------------------------- |
-| `defectdojo.securecodebox.io/product-type-name`                    | Name of the Product Type   | Product Type with ID 1 (typically "Research and Development")        | Product Type will be automatically created if no Product Type under that name exists  |
-| `defectdojo.securecodebox.io/product-name`                         | Name of the Product        | ScheduledScan Name if Scheduled, Scan Name if it's a standalone Scan | Product will be automatically created if no Product under that name exists            |
-| `defectdojo.securecodebox.io/product-description`                  | Description of the Product | Empty String                                                         | Only used when creating the Product not used for updating                             |
-| `defectdojo.securecodebox.io/product-tags`                         | Product Tags               | Nothing                                                              | Only used when creating the Product not used for updating                             |
-| `defectdojo.securecodebox.io/engagement-name`                      | Name of the Engagement     | Scan Name                                                            | Will be automatically created if no *engagement* with that name **and** version exists |
-| `defectdojo.securecodebox.io/engagement-version`                   | Engagement Version         | Nothing                                                              |                                                                                       |
-| `defectdojo.securecodebox.io/engagement-deduplicate-on-engagement` | Deduplicate On Engagement  | false                                                                | Only used when creating the Engagement not used for updating                          |
-| `defectdojo.securecodebox.io/engagement-tags`                      | Engagement Tags            | Nothing                                                              | Only used when creating the Engagement not used for updating                          |
-| `defectdojo.securecodebox.io/test-title`                           | Test Title                 | Scan Name                                                            |                                                                                       |
-
-### Simple Example Scans
-
-This will import the results daily into an engagements called: "zap-juiceshop-$UNIX_TIMESTAMP" (Name of the Scan created daily by the ScheduledScan), in a Product called: "zap-juiceshop" in the default DefectDojo product type.
-
-```yaml
-apiVersion: "execution.securecodebox.io/v1"
-kind: ScheduledScan
-metadata:
-  name: "zap-juiceshop"
-spec:
-  interval: 24h
-  scanSpec:
-    scanType: "zap-full-scan"
-    parameters:
-      - "-t"
-      - "http://juice-shop.demo-targets.svc:3000"
-```
-
-### Complete Example Scan
-
-This will import the results into engagement, product and product type following the labels.
-The engagement will be reused by the hook for the daily scans / imports until the engagement version is increased.
-
-```yaml
-apiVersion: "execution.securecodebox.io/v1"
-kind: ScheduledScan
-metadata:
-  name: "zap-full-scan-juiceshop"
-  annotations:
-    defectdojo.securecodebox.io/product-type-name: "OWASP"
-    defectdojo.securecodebox.io/product-name: "Juice Shop"
-    defectdojo.securecodebox.io/product-description: |
-      OWASP Juice Shop is probably the most modern and sophisticated insecure web application!
-      It can be used in security trainings, awareness demos, CTFs and as a guinea pig for security tools!
-      Juice Shop encompasses vulnerabilities from the entire OWASP Top Ten along with many other security flaws found in real-world applications!
-    defectdojo.securecodebox.io/product-tags: vulnerable,appsec,owasp-top-ten,vulnapp
-    defectdojo.securecodebox.io/engagement-name: "Juice Shop"
-    defectdojo.securecodebox.io/engagement-version: "v12.6.1"
-    defectdojo.securecodebox.io/engagement-tags: "automated,daily"
-    defectdojo.securecodebox.io/engagement-deduplicate-on-engagement: "true"
-    defectdojo.securecodebox.io/test-title: "Juice Shop - v12.6.1"
-spec:
-  interval: 24h
-  scanSpec:
-    scanType: "zap-full-scan"
-    parameters:
-      - "-t"
-      - "http://juice-shop.demo-targets.svc:3000"
-```
-
-## Deployment
-
-Installing the DefectDojo persistenceProvider hook will add a _ReadOnly Hook_ to your namespace.
-
-```bash
-kubectl create secret generic defectdojo-credentials --from-literal="username=admin" --from-literal="apikey=08b7..."
-
-helm upgrade --install dd secureCodeBox/persistence-defectdojo \
-    --set="defectdojo.url=https://defectdojo-django.default.svc"
-```
-
-## Chart Configuration
-
-{{ template "chart.valuesTable" . }}
-
-## Running Locally from Source
-For Development, it can be useful to run the Hook locally. You can do so by following these steps:
-
-1. Make sure you have access to a running [DefectDojo](https://github.com/DefectDojo/django-DefectDojo) Instance
-2. [Run a Scan](https://docs.securecodebox.io/docs/getting-started/first-scans) of your choice. 
-3. Supply Download Links for the Scan Results (Raw Result and Findings.json). You can e.g., access them from the 
-included [Minio Instance](https://docs.securecodebox.io/docs/getting-started/installation/#accessing-the-included-minio-instance)
-and upload them to a GitHub gist.
-
-4. Set the following environment variables
-
-- DEFECTDOJO_URL (e.g http://192.168.0.228:8080);
-- DEFECTDOJO_USERNAME (e.g admin)
-- DEFECTDOJO_APIKEY= (e.g. b09c.., can be fetched from the DefectDojo Settings)
-- IS_DEV=true
-- SCAN_NAME (e.g nmap-scanme.nmap.org, must be set exactly to the name of the scan used in step 2)
-
-5. Build the jar with gradle and run it with the following CLI arguments: {Raw Result Download URL} {Findings Download URL} {Raw Result Upload URL} {Findings Upload URL}.
-See the code snippet below. You have to adjust the filename of the jar for other versions than the '0.1.0-SNAPSHOT'.
-Also you will need to change the download URLs for the Raw Result and Findings to the ones from Step 3.  
-
-```bash
-./gradlew build
-java -jar build/libs/defectdojo-persistenceprovider-0.1.0-SNAPSHOT.jar https://gist.githubusercontent.com/.../scanme-nmap-org.xml https://gist.githubusercontent.com/.../nmap-findings.json https://httpbin.org/put https://httpbin.org/put
-```
diff --git a/hooks/persistence-elastic/.helmignore b/hooks/persistence-elastic/.helmignore
index 17ac5b0e0d..d97d8f3052 100644
--- a/hooks/persistence-elastic/.helmignore
+++ b/hooks/persistence-elastic/.helmignore
@@ -32,4 +32,10 @@ src/*
 config/*
 Dockerfile
 .dockerignore
-docs/
+docs/*
+hook/*
+integration-tests/*
+examples/*
+coverage/*
+dashboardImporter/*
+Makefile
diff --git a/hooks/persistence-elastic/Chart.yaml b/hooks/persistence-elastic/Chart.yaml
index 3492641e3b..8c64397acb 100644
--- a/hooks/persistence-elastic/Chart.yaml
+++ b/hooks/persistence-elastic/Chart.yaml
@@ -9,7 +9,7 @@ description: The elastic persistence provider persists secureCodeBox findings in
 type: application
 
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 
 appVersion: 7.9.2
 kubeVersion: ">=v1.11.0-0"
diff --git a/hooks/update-field/.helmignore b/hooks/update-field/.helmignore
index 17ac5b0e0d..8b8e4f4170 100644
--- a/hooks/update-field/.helmignore
+++ b/hooks/update-field/.helmignore
@@ -32,4 +32,9 @@ src/*
 config/*
 Dockerfile
 .dockerignore
-docs/
+docs/*
+hook/*
+integration-tests/*
+examples/*
+coverage/*
+Makefile
\ No newline at end of file
diff --git a/hooks/update-field/Chart.yaml b/hooks/update-field/Chart.yaml
index e5a7f04ab4..46e87c3c06 100644
--- a/hooks/update-field/Chart.yaml
+++ b/hooks/update-field/Chart.yaml
@@ -9,7 +9,7 @@ description: Lets you add or override a field to every finding
 type: application
 
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 kubeVersion: ">=v1.11.0-0"
 
 dependencies: []
diff --git a/operator/Chart.yaml b/operator/Chart.yaml
index 850433fda9..07a727afe0 100644
--- a/operator/Chart.yaml
+++ b/operator/Chart.yaml
@@ -9,7 +9,7 @@ description: secureCodeBox Operator to automate the execution of security scans
 type: application
 
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 kubeVersion: ">=v1.11.0-0"
 
 keywords:
diff --git a/scanners/amass/.helmignore b/scanners/amass/.helmignore
index 477b018697..fb9c1d2d6f 100644
--- a/scanners/amass/.helmignore
+++ b/scanners/amass/.helmignore
@@ -34,3 +34,7 @@ Dockerfile
 *.tar
 parser/*
 scanner/*
+integration-tests/*
+examples/*
+docs/*
+Makefile
diff --git a/scanners/amass/Chart.yaml b/scanners/amass/Chart.yaml
index 3fa54f3cf8..f12e02b285 100644
--- a/scanners/amass/Chart.yaml
+++ b/scanners/amass/Chart.yaml
@@ -8,7 +8,7 @@ description: A Helm chart for the Amass security scanner that integrates with th
 
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 # Latest Amass release version can be found here: https://github.com/OWASP/Amass/releases
 appVersion: "v3.13"
 kubeVersion: ">=v1.11.0-0"
diff --git a/scanners/angularjs-csti-scanner/.helmignore b/scanners/angularjs-csti-scanner/.helmignore
index 8684993d8c..24bfe82395 100644
--- a/scanners/angularjs-csti-scanner/.helmignore
+++ b/scanners/angularjs-csti-scanner/.helmignore
@@ -7,4 +7,6 @@ parser/
 scanner/
 examples/
 docs/
-
+integration-tests/
+coverage/
+Makefile
\ No newline at end of file
diff --git a/scanners/angularjs-csti-scanner/Chart.yaml b/scanners/angularjs-csti-scanner/Chart.yaml
index a8ac0438f9..771aa61bd3 100644
--- a/scanners/angularjs-csti-scanner/Chart.yaml
+++ b/scanners/angularjs-csti-scanner/Chart.yaml
@@ -8,7 +8,7 @@ description: A Helm chart for the angularjs csti scanner that integrates with th
 
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 appVersion: 3.0.6
 kubeVersion: ">=v1.11.0-0"
 
diff --git a/scanners/git-repo-scanner/.helmignore b/scanners/git-repo-scanner/.helmignore
index 9d3dda1b74..24bfe82395 100644
--- a/scanners/git-repo-scanner/.helmignore
+++ b/scanners/git-repo-scanner/.helmignore
@@ -7,3 +7,6 @@ parser/
 scanner/
 examples/
 docs/
+integration-tests/
+coverage/
+Makefile
\ No newline at end of file
diff --git a/scanners/git-repo-scanner/Chart.yaml b/scanners/git-repo-scanner/Chart.yaml
index b68d9a82bf..61a4027923 100644
--- a/scanners/git-repo-scanner/Chart.yaml
+++ b/scanners/git-repo-scanner/Chart.yaml
@@ -8,7 +8,7 @@ description: A Helm chart for the git-repo-scanner that integrates with the secu
 
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 appVersion: 1.0
 kubeVersion: ">=v1.11.0-0"
 
diff --git a/scanners/gitleaks/.helmignore b/scanners/gitleaks/.helmignore
index 9d3dda1b74..64b2887490 100644
--- a/scanners/gitleaks/.helmignore
+++ b/scanners/gitleaks/.helmignore
@@ -7,3 +7,6 @@ parser/
 scanner/
 examples/
 docs/
+integration-tests/
+coverage/
+Makefile
diff --git a/scanners/gitleaks/Chart.yaml b/scanners/gitleaks/Chart.yaml
index fb29245725..2928495282 100644
--- a/scanners/gitleaks/Chart.yaml
+++ b/scanners/gitleaks/Chart.yaml
@@ -8,7 +8,7 @@ description: A Helm chart for the gitleaks repository scanner that integrates wi
 
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 appVersion: v7.5.0
 kubeVersion: ">=v1.11.0-0"
 
diff --git a/scanners/kube-hunter/.helmignore b/scanners/kube-hunter/.helmignore
index 9d3dda1b74..64b2887490 100644
--- a/scanners/kube-hunter/.helmignore
+++ b/scanners/kube-hunter/.helmignore
@@ -7,3 +7,6 @@ parser/
 scanner/
 examples/
 docs/
+integration-tests/
+coverage/
+Makefile
diff --git a/scanners/kube-hunter/Chart.yaml b/scanners/kube-hunter/Chart.yaml
index 7d174aa5e2..9e785bf75f 100644
--- a/scanners/kube-hunter/Chart.yaml
+++ b/scanners/kube-hunter/Chart.yaml
@@ -8,7 +8,7 @@ description: A Helm chart for the kube-hunter security scanner that integrates w
 
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 appVersion: 0.6.1
 kubeVersion: ">=v1.11.0-0"
 
diff --git a/scanners/kubeaudit/.helmignore b/scanners/kubeaudit/.helmignore
index 9d3dda1b74..64b2887490 100644
--- a/scanners/kubeaudit/.helmignore
+++ b/scanners/kubeaudit/.helmignore
@@ -7,3 +7,6 @@ parser/
 scanner/
 examples/
 docs/
+integration-tests/
+coverage/
+Makefile
diff --git a/scanners/kubeaudit/Chart.yaml b/scanners/kubeaudit/Chart.yaml
index eb989ba096..dbb3254e1d 100644
--- a/scanners/kubeaudit/Chart.yaml
+++ b/scanners/kubeaudit/Chart.yaml
@@ -7,7 +7,7 @@ name: kubeaudit
 description: A Helm chart for the kubeaudit security scanner that integrates with the secureCodeBox.
 
 type: application
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 appVersion: v0.14.1
 kubeVersion: ">=v1.11.0-0"
 
diff --git a/scanners/ncrack/.helmignore b/scanners/ncrack/.helmignore
index 8684993d8c..64b2887490 100644
--- a/scanners/ncrack/.helmignore
+++ b/scanners/ncrack/.helmignore
@@ -7,4 +7,6 @@ parser/
 scanner/
 examples/
 docs/
-
+integration-tests/
+coverage/
+Makefile
diff --git a/scanners/ncrack/Chart.yaml b/scanners/ncrack/Chart.yaml
index 7fd34818af..9e5fa9dfd7 100644
--- a/scanners/ncrack/Chart.yaml
+++ b/scanners/ncrack/Chart.yaml
@@ -8,7 +8,7 @@ description: A Helm chart for the NCRACK security Scanner that integrates with t
 
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 appVersion: 0.7
 kubeVersion: ">=v1.11.0-0"
 
diff --git a/scanners/nikto/.helmignore b/scanners/nikto/.helmignore
index 9d3dda1b74..64b2887490 100644
--- a/scanners/nikto/.helmignore
+++ b/scanners/nikto/.helmignore
@@ -7,3 +7,6 @@ parser/
 scanner/
 examples/
 docs/
+integration-tests/
+coverage/
+Makefile
diff --git a/scanners/nikto/Chart.yaml b/scanners/nikto/Chart.yaml
index d5413638fd..98ae5f818e 100644
--- a/scanners/nikto/Chart.yaml
+++ b/scanners/nikto/Chart.yaml
@@ -8,7 +8,7 @@ description: A Helm chart for the Nikto security scanner that integrates with th
 
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 # appVersion - Nikto doesn't really version its releases
 appVersion: 2.1.6
 kubeVersion: ">=v1.11.0-0"
diff --git a/scanners/nmap/.helmignore b/scanners/nmap/.helmignore
index 9d3dda1b74..64b2887490 100644
--- a/scanners/nmap/.helmignore
+++ b/scanners/nmap/.helmignore
@@ -7,3 +7,6 @@ parser/
 scanner/
 examples/
 docs/
+integration-tests/
+coverage/
+Makefile
diff --git a/scanners/nmap/Chart.yaml b/scanners/nmap/Chart.yaml
index 934ac0d8a7..c054ad46b6 100644
--- a/scanners/nmap/Chart.yaml
+++ b/scanners/nmap/Chart.yaml
@@ -8,7 +8,7 @@ description: A Helm chart for the NMAP security Scanner that integrates with the
 
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 appVersion: 7.91-r0
 kubeVersion: ">=v1.11.0-0"
 
diff --git a/scanners/screenshooter/.helmignore b/scanners/screenshooter/.helmignore
index 9d3dda1b74..64b2887490 100644
--- a/scanners/screenshooter/.helmignore
+++ b/scanners/screenshooter/.helmignore
@@ -7,3 +7,6 @@ parser/
 scanner/
 examples/
 docs/
+integration-tests/
+coverage/
+Makefile
diff --git a/scanners/screenshooter/Chart.yaml b/scanners/screenshooter/Chart.yaml
index a986cf6b4e..3ebc6d5feb 100644
--- a/scanners/screenshooter/Chart.yaml
+++ b/scanners/screenshooter/Chart.yaml
@@ -8,7 +8,7 @@ description: A Helm chart for the Screenshooter that integrates with the secureC
 
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 appVersion: 1.0
 kubeVersion: ">=v1.11.0-0"
 
diff --git a/scanners/ssh-scan/.helmignore b/scanners/ssh-scan/.helmignore
index 9d3dda1b74..64b2887490 100644
--- a/scanners/ssh-scan/.helmignore
+++ b/scanners/ssh-scan/.helmignore
@@ -7,3 +7,6 @@ parser/
 scanner/
 examples/
 docs/
+integration-tests/
+coverage/
+Makefile
diff --git a/scanners/ssh-scan/Chart.yaml b/scanners/ssh-scan/Chart.yaml
index b78f2846ef..157a17f680 100644
--- a/scanners/ssh-scan/Chart.yaml
+++ b/scanners/ssh-scan/Chart.yaml
@@ -8,7 +8,7 @@ description: A Helm chart for the SSH_Scan security scanner that integrates with
 
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 appVersion: "0.0.44"
 kubeVersion: ">=v1.11.0-0"
 
diff --git a/scanners/sslyze/.helmignore b/scanners/sslyze/.helmignore
index 9d3dda1b74..64b2887490 100644
--- a/scanners/sslyze/.helmignore
+++ b/scanners/sslyze/.helmignore
@@ -7,3 +7,6 @@ parser/
 scanner/
 examples/
 docs/
+integration-tests/
+coverage/
+Makefile
diff --git a/scanners/sslyze/Chart.yaml b/scanners/sslyze/Chart.yaml
index bd61ae2003..fd098a68f2 100644
--- a/scanners/sslyze/Chart.yaml
+++ b/scanners/sslyze/Chart.yaml
@@ -8,7 +8,7 @@ description: A Helm chart for the SSLyze security scanner that integrates with t
 
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 appVersion: v4.0.4
 kubeVersion: ">=v1.11.0-0"
 
diff --git a/scanners/test-scan/.helmignore b/scanners/test-scan/.helmignore
index 9d3dda1b74..64b2887490 100644
--- a/scanners/test-scan/.helmignore
+++ b/scanners/test-scan/.helmignore
@@ -7,3 +7,6 @@ parser/
 scanner/
 examples/
 docs/
+integration-tests/
+coverage/
+Makefile
diff --git a/scanners/test-scan/Chart.yaml b/scanners/test-scan/Chart.yaml
index 3dc7ccce9f..d47bd4d1ea 100644
--- a/scanners/test-scan/Chart.yaml
+++ b/scanners/test-scan/Chart.yaml
@@ -8,7 +8,7 @@ description: A Helm chart to test the secureCodeBox operator
 
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 appVersion: 1.0
 kubeVersion: ">=v1.11.0-0"
 
diff --git a/scanners/trivy/.helmignore b/scanners/trivy/.helmignore
index 9d3dda1b74..64b2887490 100644
--- a/scanners/trivy/.helmignore
+++ b/scanners/trivy/.helmignore
@@ -7,3 +7,6 @@ parser/
 scanner/
 examples/
 docs/
+integration-tests/
+coverage/
+Makefile
diff --git a/scanners/trivy/Chart.yaml b/scanners/trivy/Chart.yaml
index c7e71ddd71..e85dd9011b 100644
--- a/scanners/trivy/Chart.yaml
+++ b/scanners/trivy/Chart.yaml
@@ -8,7 +8,7 @@ description: A Helm chart for the trivy security scanner that integrates with th
 
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 appVersion: "0.18.3"
 kubeVersion: ">=v1.11.0-0"
 
diff --git a/scanners/wpscan/.helmignore b/scanners/wpscan/.helmignore
index 4ebe4ba9a0..e661d8214b 100644
--- a/scanners/wpscan/.helmignore
+++ b/scanners/wpscan/.helmignore
@@ -8,3 +8,6 @@ parser/
 scanner/
 examples/
 docs/
+integration-tests/
+coverage/
+Makefile
diff --git a/scanners/wpscan/Chart.yaml b/scanners/wpscan/Chart.yaml
index 08074f3b86..1049f793f3 100644
--- a/scanners/wpscan/Chart.yaml
+++ b/scanners/wpscan/Chart.yaml
@@ -8,7 +8,7 @@ description: A Helm chart for the WordPress security scanner that integrates wit
 
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 appVersion: 3.8.17
 kubeVersion: ">=v1.11.0-0"
 
diff --git a/scanners/zap-advanced/.helmignore b/scanners/zap-advanced/.helmignore
index 53f932dae4..197df5afa0 100644
--- a/scanners/zap-advanced/.helmignore
+++ b/scanners/zap-advanced/.helmignore
@@ -8,6 +8,8 @@ parser/
 scanner/
 examples/
 docs/
+integration-tests/
+coverage/
+Makefile
 
-README.md.gotmpl
 *.monopic
diff --git a/scanners/zap-advanced/Chart.yaml b/scanners/zap-advanced/Chart.yaml
index 96b4493eb5..2242af29ee 100644
--- a/scanners/zap-advanced/Chart.yaml
+++ b/scanners/zap-advanced/Chart.yaml
@@ -8,7 +8,7 @@ description: A Helm chart for the OWASP ZAP (extended with advanced authenticati
 
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 appVersion: "2.10.0"
 kubeVersion: ">=v1.11.0-0"
 
diff --git a/scanners/zap/.helmignore b/scanners/zap/.helmignore
index 4ebe4ba9a0..e661d8214b 100644
--- a/scanners/zap/.helmignore
+++ b/scanners/zap/.helmignore
@@ -8,3 +8,6 @@ parser/
 scanner/
 examples/
 docs/
+integration-tests/
+coverage/
+Makefile
diff --git a/scanners/zap/Chart.yaml b/scanners/zap/Chart.yaml
index a104aeafd9..58667208ad 100644
--- a/scanners/zap/Chart.yaml
+++ b/scanners/zap/Chart.yaml
@@ -8,7 +8,7 @@ description: A Helm chart for the OWASP ZAP security scanner that integrates wit
 
 type: application
 # version - gets automatically set to the secureCodeBox release version when the helm charts gets published
-version: v2.7.0-alpha1
+version: v3.1.0-alpha1
 appVersion: "2.10.0"
 kubeVersion: ">=v1.11.0-0"