secureCodeBox · nigthknight · Jun 22, 2021 · Jun 22, 2021 · Jun 22, 2021
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -590,8 +590,8 @@ jobs:
           kubectl -n securecodebox-system get pods
           echo "Operator Startup Logs"
           kubectl -n securecodebox-system logs deployment/securecodebox-controller-manager
-      - name: "Create 'demo-apps' namespace"
-        run: "kubectl create namespace demo-apps"
+      - name: "Create 'demo-targets' namespace"
+        run: "kubectl create namespace demo-targets"
 
       # ---- Install Test Dependencies ----
 
@@ -640,7 +640,7 @@ jobs:
             --set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-test-scan" \
             --set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
             --set="scanner.image.tag=sha-$(git rev-parse --short HEAD)"
-          helm -n integration-tests install http-webhook ./demo-apps/http-webhook
+          helm -n integration-tests install http-webhook ./demo-targets/http-webhook
           helm -n integration-tests install ro-hook ./hooks/generic-webhook/ \
             --set="hook.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/hook-generic-webhook" \
             --set="webhookUrl=http://http-webhook/hallo-welt" \
@@ -654,20 +654,20 @@ jobs:
       - name: "Install Demo Apps"
         run: |
           # Install dummy-ssh app
-          helm -n demo-apps install dummy-ssh ./demo-apps/dummy-ssh/ --set="fullnameOverride=dummy-ssh" --wait
+          helm -n demo-targets install dummy-ssh ./demo-targets/dummy-ssh/ --set="fullnameOverride=dummy-ssh" --wait
           # Install unsafe-https app
-          helm -n demo-apps install unsafe-https ./demo-apps/unsafe-https/ --set="fullnameOverride=unsafe-https" --wait
+          helm -n demo-targets install unsafe-https ./demo-targets/unsafe-https/ --set="fullnameOverride=unsafe-https" --wait
           # Install bodgeit app
-          helm -n demo-apps install bodgeit ./demo-apps/bodgeit/ --set="fullnameOverride=bodgeit" --wait
+          helm -n demo-targets install bodgeit ./demo-targets/bodgeit/ --set="fullnameOverride=bodgeit" --wait
           # Install bodgeit app
-          helm -n demo-apps install petstore ./demo-apps/swagger-petstore/ --set="fullnameOverride=petstore" --wait
+          helm -n demo-targets install petstore ./demo-targets/swagger-petstore/ --set="fullnameOverride=petstore" --wait
           # Install old-wordpress app
-          helm -n demo-apps install old-wordpress ./demo-apps/old-wordpress/ --set="fullnameOverride=old-wordpress" --wait
+          helm -n demo-targets install old-wordpress ./demo-targets/old-wordpress/ --set="fullnameOverride=old-wordpress" --wait
           # Install juiceshop app
-          helm -n demo-apps install juiceshop ./demo-apps/juice-shop/ --set="fullnameOverride=juiceshop" --wait
+          helm -n demo-targets install juiceshop ./demo-targets/juice-shop/ --set="fullnameOverride=juiceshop" --wait
           # Install plain nginx server
-          kubectl create deployment --image nginx:alpine nginx --namespace demo-apps
-          kubectl expose deployment nginx --port 80 --namespace demo-apps
+          kubectl create deployment --image nginx:alpine nginx --namespace demo-targets
+          kubectl expose deployment nginx --port 80 --namespace demo-targets
 
       # ---- OWASP Amass Integration Tests ----
 
@@ -710,7 +710,7 @@ jobs:
       - name: "kubeaudit Integration Tests"
         run: |
           kubectl create namespace kubeaudit-tests
-          helm -n kubeaudit-tests install juice-shop ./demo-apps/juice-shop/ --wait
+          helm -n kubeaudit-tests install juice-shop ./demo-targets/juice-shop/ --wait
           helm -n integration-tests install kubeaudit ./scanners/kubeaudit/ \
             --set="scanner.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/scanner-kubeaudit" \
             --set="scanner.image.tag=sha-$(git rev-parse --short HEAD)" \
@@ -769,7 +769,7 @@ jobs:
             --set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-test-scan" \
             --set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
             --set="scanner.image.tag=sha-$(git rev-parse --short HEAD)"
-          helm -n integration-tests install http-webhook ./demo-apps/http-webhook --wait
+          helm -n integration-tests install http-webhook ./demo-targets/http-webhook --wait
 
           helm -n integration-tests install notification-hook ./hooks/notification --values tests/integration/hooks/__testFiles__/notification-values.yaml \
             --set="hook.image.repository=docker.io/${{env.DOCKER_NAMESPACE }}/hook-notification" \
@@ -894,7 +894,7 @@ jobs:
             --set="hook.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/hook-cascading-scans" \
             --set="hook.image.tag=sha-$(git rev-parse --short HEAD)"
           # Install unsafe-https
-          helm upgrade --install unsafe-https ./demo-apps/unsafe-https/ -n cascading-tests --wait
+          helm upgrade --install unsafe-https ./demo-targets/unsafe-https/ -n cascading-tests --wait
           # Install nmap
           helm -n cascading-tests install nmap ./scanners/nmap/ --wait \
             --set="scanner.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/scanner-nmap" \

diff --git a/bin/install.sh b/bin/install.sh
@@ -7,20 +7,20 @@
 # Official installation script for the secureCodeBox
 #
 # Creates namespace, securecodebox-system, and installs the operator.
-# Then installs all possible resources (scanners, demo-apps, hooks).
+# Then installs all possible resources (scanners, demo-targets, hooks).
 #
 # There exist different modes:
 # Call without parameters to install interactively
 # Call with --all to install all available resources automatically
-# Call with --scanners / --demo-apps / --hooks to only install the wanted resources
+# Call with --scanners / --demo-targets / --hooks to only install the wanted resources
 # Call with --help for usage information
 #
 # For more information see https://docs.securecodebox.io/
 
 set -euo pipefail
 shopt -s extglob
 
-USAGE="Usage: $(basename "$0") [--all] [--scanners] [--hooks] [--demo-apps] [--help|-h]"
+USAGE="Usage: $(basename "$0") [--all] [--scanners] [--hooks] [--demo-targets] [--help|-h]"
 
 COLOR_HIGHLIGHT="\e[35m"
 COLOR_OK="\e[32m"
@@ -59,9 +59,9 @@ The installation is interactive if no arguments are provided.
 
 Options
 
-  --all          Install scanners, demo-apps and hooks
+  --all          Install scanners, demo-targets and hooks
   --scanners     Install scanners
-  --demo-apps    Install demo-apps
+  --demo-targets    Install demo-targets
   --hooks        Install hooks
   -h|--help      Show help
 
@@ -185,7 +185,7 @@ function interactiveInstall() {
   installResources "$BASE_DIR/scanners" "default" False
 
   print
-  print "Starting to install demo-apps..."
+  print "Starting to install demo-targets..."
   print "Do you want to install the demo apps in a separate namespace? Otherwise they will be installed into the [default] namespace [y/N]"
   read -r line
   NAMESPACE="default"
@@ -195,7 +195,7 @@ function interactiveInstall() {
     kubectl create namespace "$NAMESPACE" || print "Namespace already exists or could not be created.. "
   fi
 
-  installResources "$BASE_DIR/demo-apps" "$NAMESPACE" False
+  installResources "$BASE_DIR/demo-targets" "$NAMESPACE" False
 
   print
   print "Starting to install hooks..."
@@ -220,8 +220,8 @@ function unattendedInstall() {
   fi
 
   if [[ -n "${INSTALL_DEMO_APPS}" ]]; then
-    print "Starting to install demo-apps..."
-    installResources "$BASE_DIR/demo-apps" "default" True
+    print "Starting to install demo-targets..."
+    installResources "$BASE_DIR/demo-targets" "default" True
   fi
 
   if [[ -n "${INSTALL_HOOKS}" ]]; then
@@ -244,7 +244,7 @@ function parseArguments() {
             INSTALL_SCANNERS='true'
             shift # Pop current argument from array
             ;;
-          --demo-apps)
+          --demo-targets)
             INSTALL_DEMO_APPS='true'
             shift
             ;;

diff --git a/bin/uninstall.sh b/bin/uninstall.sh
@@ -6,7 +6,7 @@
 
 # Official uninstall script for the secureCodeBox
 #
-# Removes all available resources (scanners, demo-apps, hooks, operator) and namespaces
+# Removes all available resources (scanners, demo-targets, hooks, operator) and namespaces
 #
 # For more information see https://docs.securecodebox.io/
 
@@ -39,7 +39,7 @@ function uninstallResources() {
 helm -n securecodebox-system uninstall securecodebox-operator || true
 
 uninstallResources "$BASE_DIR/scanners"
-uninstallResources "$BASE_DIR/demo-apps"
+uninstallResources "$BASE_DIR/demo-targets"
 uninstallResources "$BASE_DIR/hooks"
 
 kubectl delete namespaces securecodebox-system || true
diff --git a/demo-apps/README.md → demo-targets/README.md b/demo-apps/README.md → demo-targets/README.md
diff --git a/demo-apps/bodgeit/.helmignore → demo-targets/bodgeit/.helmignore b/demo-apps/bodgeit/.helmignore → demo-targets/bodgeit/.helmignore
diff --git a/demo-apps/bodgeit/Chart.yaml → demo-targets/bodgeit/Chart.yaml b/demo-apps/bodgeit/Chart.yaml → demo-targets/bodgeit/Chart.yaml
diff --git a/demo-apps/bodgeit/README.md → demo-targets/bodgeit/README.md b/demo-apps/bodgeit/README.md → demo-targets/bodgeit/README.md
@@ -18,7 +18,7 @@ BodgeIt Store is a serverside rendering based html website without any heavy jav
 
 ## Source Code
 
-* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-apps/bodgeit>
+* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-targets/bodgeit>
 * <https://github.com/psiinon/bodgeit>
 
 ## Chart Configuration

diff --git a/demo-apps/bodgeit/README.md.gotmpl → demo-targets/bodgeit/README.md.gotmpl b/demo-apps/bodgeit/README.md.gotmpl → demo-targets/bodgeit/README.md.gotmpl
@@ -23,7 +23,7 @@ BodgeIt Store is a serverside rendering based html website without any heavy jav
 
 ## Source Code
 
-* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-apps/bodgeit>
+* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-targets/bodgeit>
 * <https://github.com/psiinon/bodgeit>
 
 ## Chart Configuration

diff --git a/demo-apps/bodgeit/questions.yml → demo-targets/bodgeit/questions.yml b/demo-apps/bodgeit/questions.yml → demo-targets/bodgeit/questions.yml
diff --git a/demo-apps/bodgeit/templates/NOTES.txt → demo-targets/bodgeit/templates/NOTES.txt b/demo-apps/bodgeit/templates/NOTES.txt → demo-targets/bodgeit/templates/NOTES.txt
diff --git a/demo-apps/bodgeit/templates/_helpers.tpl → demo-targets/bodgeit/templates/_helpers.tpl b/demo-apps/bodgeit/templates/_helpers.tpl → demo-targets/bodgeit/templates/_helpers.tpl
diff --git a/demo-apps/bodgeit/templates/deployment.yaml → ...targets/bodgeit/templates/deployment.yaml b/demo-apps/bodgeit/templates/deployment.yaml → ...targets/bodgeit/templates/deployment.yaml
diff --git a/demo-apps/bodgeit/templates/ingress.yaml → demo-targets/bodgeit/templates/ingress.yaml b/demo-apps/bodgeit/templates/ingress.yaml → demo-targets/bodgeit/templates/ingress.yaml
diff --git a/demo-apps/bodgeit/templates/service.yaml → demo-targets/bodgeit/templates/service.yaml b/demo-apps/bodgeit/templates/service.yaml → demo-targets/bodgeit/templates/service.yaml
diff --git a/...geit/templates/tests/test-connection.yaml → ...geit/templates/tests/test-connection.yaml b/...geit/templates/tests/test-connection.yaml → ...geit/templates/tests/test-connection.yaml
diff --git a/demo-apps/bodgeit/values.yaml → demo-targets/bodgeit/values.yaml b/demo-apps/bodgeit/values.yaml → demo-targets/bodgeit/values.yaml
diff --git a/demo-apps/dummy-ssh/.helmignore → demo-targets/dummy-ssh/.helmignore b/demo-apps/dummy-ssh/.helmignore → demo-targets/dummy-ssh/.helmignore
diff --git a/demo-apps/dummy-ssh/Chart.yaml → demo-targets/dummy-ssh/Chart.yaml b/demo-apps/dummy-ssh/Chart.yaml → demo-targets/dummy-ssh/Chart.yaml
@@ -14,7 +14,7 @@ keywords:
   - vulnerable
   - ssh
 sources:
-  - https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-apps/dummy-ssh
+  - https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-targets/dummy-ssh
 maintainers:
   - name: iteratec GmbH
     email: securecodebox@iteratec.com
diff --git a/demo-apps/dummy-ssh/README.md → demo-targets/dummy-ssh/README.md b/demo-apps/dummy-ssh/README.md → demo-targets/dummy-ssh/README.md
@@ -15,7 +15,7 @@ Port 22: Username root, Password: THEPASSWORDYOUCREATED
 
 ## Source Code
 
-* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-apps/dummy-ssh>
+* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-targets/dummy-ssh>
 
 ## Chart Configuration
 

diff --git a/demo-apps/dummy-ssh/README.md.gotmpl → demo-targets/dummy-ssh/README.md.gotmpl b/demo-apps/dummy-ssh/README.md.gotmpl → demo-targets/dummy-ssh/README.md.gotmpl
@@ -20,7 +20,7 @@ Port 22: Username root, Password: THEPASSWORDYOUCREATED
 
 ## Source Code
 
-* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-apps/dummy-ssh>
+* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-targets/dummy-ssh>
 
 ## Chart Configuration
 

diff --git a/demo-apps/dummy-ssh/questions.yml → demo-targets/dummy-ssh/questions.yml b/demo-apps/dummy-ssh/questions.yml → demo-targets/dummy-ssh/questions.yml
diff --git a/demo-apps/dummy-ssh/templates/NOTES.txt → demo-targets/dummy-ssh/templates/NOTES.txt b/demo-apps/dummy-ssh/templates/NOTES.txt → demo-targets/dummy-ssh/templates/NOTES.txt
diff --git a/demo-apps/dummy-ssh/templates/_helpers.tpl → ...-targets/dummy-ssh/templates/_helpers.tpl b/demo-apps/dummy-ssh/templates/_helpers.tpl → ...-targets/dummy-ssh/templates/_helpers.tpl
diff --git a/...-apps/dummy-ssh/templates/deployment.yaml → ...rgets/dummy-ssh/templates/deployment.yaml b/...-apps/dummy-ssh/templates/deployment.yaml → ...rgets/dummy-ssh/templates/deployment.yaml
diff --git a/demo-apps/dummy-ssh/templates/service.yaml → ...-targets/dummy-ssh/templates/service.yaml b/demo-apps/dummy-ssh/templates/service.yaml → ...-targets/dummy-ssh/templates/service.yaml
diff --git a/demo-apps/dummy-ssh/values.yaml → demo-targets/dummy-ssh/values.yaml b/demo-apps/dummy-ssh/values.yaml → demo-targets/dummy-ssh/values.yaml
diff --git a/demo-apps/http-webhook/.helmignore → demo-targets/http-webhook/.helmignore b/demo-apps/http-webhook/.helmignore → demo-targets/http-webhook/.helmignore
diff --git a/demo-apps/http-webhook/Chart.yaml → demo-targets/http-webhook/Chart.yaml b/demo-apps/http-webhook/Chart.yaml → demo-targets/http-webhook/Chart.yaml
diff --git a/demo-apps/http-webhook/README.md → demo-targets/http-webhook/README.md b/demo-apps/http-webhook/README.md → demo-targets/http-webhook/README.md
@@ -15,7 +15,7 @@ A Dummy webserver to echo HTTP requests in log
 ## Source Code
 
 * <https://github.com/mendhak/docker-http-https-echo>
-* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-apps/http-webhook>
+* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-targets/http-webhook>
 
 ## Chart Configuration
 

diff --git a/demo-apps/http-webhook/README.md.gotmpl → demo-targets/http-webhook/README.md.gotmpl b/demo-apps/http-webhook/README.md.gotmpl → demo-targets/http-webhook/README.md.gotmpl
@@ -20,7 +20,7 @@ A Dummy webserver to echo HTTP requests in log
 ## Source Code
 
 * <https://github.com/mendhak/docker-http-https-echo>
-* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-apps/http-webhook>
+* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-targets/http-webhook>
 
 ## Chart Configuration
 

diff --git a/demo-apps/http-webhook/templates/NOTES.txt → ...-targets/http-webhook/templates/NOTES.txt b/demo-apps/http-webhook/templates/NOTES.txt → ...-targets/http-webhook/templates/NOTES.txt
diff --git a/...-apps/http-webhook/templates/_helpers.tpl → ...rgets/http-webhook/templates/_helpers.tpl b/...-apps/http-webhook/templates/_helpers.tpl → ...rgets/http-webhook/templates/_helpers.tpl
diff --git a/...ps/http-webhook/templates/deployment.yaml → ...ts/http-webhook/templates/deployment.yaml b/...ps/http-webhook/templates/deployment.yaml → ...ts/http-webhook/templates/deployment.yaml
diff --git a/demo-apps/http-webhook/templates/hpa.yaml → demo-targets/http-webhook/templates/hpa.yaml b/demo-apps/http-webhook/templates/hpa.yaml → demo-targets/http-webhook/templates/hpa.yaml
diff --git a/...-apps/http-webhook/templates/ingress.yaml → ...rgets/http-webhook/templates/ingress.yaml b/...-apps/http-webhook/templates/ingress.yaml → ...rgets/http-webhook/templates/ingress.yaml
diff --git a/...-apps/http-webhook/templates/service.yaml → ...rgets/http-webhook/templates/service.yaml b/...-apps/http-webhook/templates/service.yaml → ...rgets/http-webhook/templates/service.yaml
diff --git a/...ttp-webhook/templates/serviceaccount.yaml → ...ttp-webhook/templates/serviceaccount.yaml b/...ttp-webhook/templates/serviceaccount.yaml → ...ttp-webhook/templates/serviceaccount.yaml
diff --git a/...hook/templates/tests/test-connection.yaml → ...hook/templates/tests/test-connection.yaml b/...hook/templates/tests/test-connection.yaml → ...hook/templates/tests/test-connection.yaml
diff --git a/demo-apps/http-webhook/values.yaml → demo-targets/http-webhook/values.yaml b/demo-apps/http-webhook/values.yaml → demo-targets/http-webhook/values.yaml
diff --git a/demo-apps/juice-shop/.helmignore → demo-targets/juice-shop/.helmignore b/demo-apps/juice-shop/.helmignore → demo-targets/juice-shop/.helmignore
diff --git a/demo-apps/juice-shop/Chart.yaml → demo-targets/juice-shop/Chart.yaml b/demo-apps/juice-shop/Chart.yaml → demo-targets/juice-shop/Chart.yaml
@@ -23,7 +23,7 @@ keywords:
   - appsec
   - ctf
 sources:
-  - https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-apps/juice-shop
+  - https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-targets/juice-shop
   - https://github.com/bkimminich/juice-shop
 maintainers:
   - name: iteratec GmbH

diff --git a/demo-apps/juice-shop/README.md → demo-targets/juice-shop/README.md b/demo-apps/juice-shop/README.md → demo-targets/juice-shop/README.md
@@ -14,7 +14,7 @@ OWASP Juice Shop: Probably the most modern and sophisticated insecure web applic
 
 ## Source Code
 
-* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-apps/juice-shop>
+* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-targets/juice-shop>
 * <https://github.com/bkimminich/juice-shop>
 
 ## Chart Configuration

diff --git a/demo-apps/juice-shop/README.md.gotmpl → demo-targets/juice-shop/README.md.gotmpl b/demo-apps/juice-shop/README.md.gotmpl → demo-targets/juice-shop/README.md.gotmpl
@@ -19,7 +19,7 @@ OWASP Juice Shop: Probably the most modern and sophisticated insecure web applic
 
 ## Source Code
 
-* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-apps/juice-shop>
+* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-targets/juice-shop>
 * <https://github.com/bkimminich/juice-shop>
 
 ## Chart Configuration

diff --git a/demo-apps/juice-shop/questions.yml → demo-targets/juice-shop/questions.yml b/demo-apps/juice-shop/questions.yml → demo-targets/juice-shop/questions.yml
diff --git a/demo-apps/juice-shop/templates/NOTES.txt → demo-targets/juice-shop/templates/NOTES.txt b/demo-apps/juice-shop/templates/NOTES.txt → demo-targets/juice-shop/templates/NOTES.txt
diff --git a/demo-apps/juice-shop/templates/_helpers.tpl → ...targets/juice-shop/templates/_helpers.tpl b/demo-apps/juice-shop/templates/_helpers.tpl → ...targets/juice-shop/templates/_helpers.tpl
diff --git a/...apps/juice-shop/templates/deployment.yaml → ...gets/juice-shop/templates/deployment.yaml b/...apps/juice-shop/templates/deployment.yaml → ...gets/juice-shop/templates/deployment.yaml
diff --git a/demo-apps/juice-shop/templates/ingress.yaml → ...targets/juice-shop/templates/ingress.yaml b/demo-apps/juice-shop/templates/ingress.yaml → ...targets/juice-shop/templates/ingress.yaml
diff --git a/demo-apps/juice-shop/templates/service.yaml → ...targets/juice-shop/templates/service.yaml b/demo-apps/juice-shop/templates/service.yaml → ...targets/juice-shop/templates/service.yaml
diff --git a/...shop/templates/tests/test-connection.yaml → ...shop/templates/tests/test-connection.yaml b/...shop/templates/tests/test-connection.yaml → ...shop/templates/tests/test-connection.yaml
diff --git a/demo-apps/juice-shop/values.yaml → demo-targets/juice-shop/values.yaml b/demo-apps/juice-shop/values.yaml → demo-targets/juice-shop/values.yaml
diff --git a/demo-apps/old-wordpress/.helmignore → demo-targets/old-wordpress/.helmignore b/demo-apps/old-wordpress/.helmignore → demo-targets/old-wordpress/.helmignore
diff --git a/demo-apps/old-wordpress/Chart.yaml → demo-targets/old-wordpress/Chart.yaml b/demo-apps/old-wordpress/Chart.yaml → demo-targets/old-wordpress/Chart.yaml
@@ -14,7 +14,7 @@ keywords:
   - vulnerable
   - wordpress
 sources:
-  - https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-apps/old-wordpress
+  - https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-targets/old-wordpress
 maintainers:
   - name: iteratec GmbH
     email: securecodebox@iteratec.com
diff --git a/demo-apps/old-wordpress/README.md → demo-targets/old-wordpress/README.md b/demo-apps/old-wordpress/README.md → demo-targets/old-wordpress/README.md
@@ -14,7 +14,7 @@ Insecure & Outdated WordPress Instance: Never expose it to the internet!
 
 ## Source Code
 
-* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-apps/old-wordpress>
+* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-targets/old-wordpress>
 
 ## Chart Configuration
 

diff --git a/demo-apps/old-wordpress/README.md.gotmpl → demo-targets/old-wordpress/README.md.gotmpl b/demo-apps/old-wordpress/README.md.gotmpl → demo-targets/old-wordpress/README.md.gotmpl
@@ -19,7 +19,7 @@ Insecure & Outdated WordPress Instance: Never expose it to the internet!
 
 ## Source Code
 
-* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-apps/old-wordpress>
+* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-targets/old-wordpress>
 
 ## Chart Configuration
 

diff --git a/demo-apps/old-wordpress/questions.yml → demo-targets/old-wordpress/questions.yml b/demo-apps/old-wordpress/questions.yml → demo-targets/old-wordpress/questions.yml
diff --git a/demo-apps/old-wordpress/templates/NOTES.txt → ...targets/old-wordpress/templates/NOTES.txt b/demo-apps/old-wordpress/templates/NOTES.txt → ...targets/old-wordpress/templates/NOTES.txt
diff --git a/...apps/old-wordpress/templates/_helpers.tpl → ...gets/old-wordpress/templates/_helpers.tpl b/...apps/old-wordpress/templates/_helpers.tpl → ...gets/old-wordpress/templates/_helpers.tpl
diff --git a/...s/old-wordpress/templates/deployment.yaml → ...s/old-wordpress/templates/deployment.yaml b/...s/old-wordpress/templates/deployment.yaml → ...s/old-wordpress/templates/deployment.yaml
diff --git a/...apps/old-wordpress/templates/service.yaml → ...gets/old-wordpress/templates/service.yaml b/...apps/old-wordpress/templates/service.yaml → ...gets/old-wordpress/templates/service.yaml
diff --git a/...ress/templates/tests/test-connection.yaml → ...ress/templates/tests/test-connection.yaml b/...ress/templates/tests/test-connection.yaml → ...ress/templates/tests/test-connection.yaml
diff --git a/demo-apps/old-wordpress/values.yaml → demo-targets/old-wordpress/values.yaml b/demo-apps/old-wordpress/values.yaml → demo-targets/old-wordpress/values.yaml
diff --git a/demo-apps/swagger-petstore/.helmignore → demo-targets/swagger-petstore/.helmignore b/demo-apps/swagger-petstore/.helmignore → demo-targets/swagger-petstore/.helmignore
diff --git a/demo-apps/swagger-petstore/Chart.yaml → demo-targets/swagger-petstore/Chart.yaml b/demo-apps/swagger-petstore/Chart.yaml → demo-targets/swagger-petstore/Chart.yaml
@@ -14,7 +14,7 @@ keywords:
   - swagger
   - openapi
 sources:
-  - https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-apps/swagger-petstore
+  - https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-targets/swagger-petstore
   - https://github.com/swagger-api/swagger-petstore
 maintainers:
   - name: iteratec GmbH

diff --git a/demo-apps/swagger-petstore/README.md → demo-targets/swagger-petstore/README.md b/demo-apps/swagger-petstore/README.md → demo-targets/swagger-petstore/README.md
@@ -14,7 +14,7 @@ This is the sample petstore application with a restful API.
 
 ## Source Code
 
-* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-apps/swagger-petstore>
+* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-targets/swagger-petstore>
 * <https://github.com/swagger-api/swagger-petstore>
 
 ## Chart Configuration
@@ -42,5 +42,5 @@ This is the sample petstore application with a restful API.
 | securityContext | object | `{}` |  |
 | service.port | int | `80` |  |
 | service.type | string | `"ClusterIP"` |  |
-| swaggerHostOverride | string | `"http://swagger-petstore.demo-apps.svc"` |  |
+| swaggerHostOverride | string | `"http://swagger-petstore.demo-targets.svc"` |  |
 | tolerations | list | `[]` |  |
diff --git a/demo-apps/swagger-petstore/README.md.gotmpl → ...targets/swagger-petstore/README.md.gotmpl b/demo-apps/swagger-petstore/README.md.gotmpl → ...targets/swagger-petstore/README.md.gotmpl
@@ -19,7 +19,7 @@ This is the sample petstore application with a restful API.
 
 ## Source Code
 
-* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-apps/swagger-petstore>
+* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-targets/swagger-petstore>
 * <https://github.com/swagger-api/swagger-petstore>
 
 ## Chart Configuration

diff --git a/demo-apps/swagger-petstore/questions.yml → demo-targets/swagger-petstore/questions.yml b/demo-apps/swagger-petstore/questions.yml → demo-targets/swagger-petstore/questions.yml
diff --git a/...apps/swagger-petstore/templates/NOTES.txt → ...gets/swagger-petstore/templates/NOTES.txt b/...apps/swagger-petstore/templates/NOTES.txt → ...gets/swagger-petstore/templates/NOTES.txt
diff --git a/...s/swagger-petstore/templates/_helpers.tpl → ...s/swagger-petstore/templates/_helpers.tpl b/...s/swagger-petstore/templates/_helpers.tpl → ...s/swagger-petstore/templates/_helpers.tpl
diff --git a/...wagger-petstore/templates/deployment.yaml → ...wagger-petstore/templates/deployment.yaml b/...wagger-petstore/templates/deployment.yaml → ...wagger-petstore/templates/deployment.yaml
diff --git a/...s/swagger-petstore/templates/ingress.yaml → ...s/swagger-petstore/templates/ingress.yaml b/...s/swagger-petstore/templates/ingress.yaml → ...s/swagger-petstore/templates/ingress.yaml
diff --git a/...s/swagger-petstore/templates/service.yaml → ...s/swagger-petstore/templates/service.yaml b/...s/swagger-petstore/templates/service.yaml → ...s/swagger-petstore/templates/service.yaml
diff --git a/...tore/templates/tests/test-connection.yaml → ...tore/templates/tests/test-connection.yaml b/...tore/templates/tests/test-connection.yaml → ...tore/templates/tests/test-connection.yaml
diff --git a/demo-apps/swagger-petstore/values.yaml → demo-targets/swagger-petstore/values.yaml b/demo-apps/swagger-petstore/values.yaml → demo-targets/swagger-petstore/values.yaml
@@ -18,7 +18,7 @@ image:
 
 # If you want to expose the petstore under a url different to the default service name address use the override to specify a the full host with protocol
 #swaggerHostOverride: "https://petstore.example.com"
-swaggerHostOverride: "http://swagger-petstore.demo-apps.svc"
+swaggerHostOverride: "http://swagger-petstore.demo-targets.svc"
 
 imagePullSecrets: []
 nameOverride: ""

diff --git a/demo-apps/unsafe-https/.helmignore → demo-targets/unsafe-https/.helmignore b/demo-apps/unsafe-https/.helmignore → demo-targets/unsafe-https/.helmignore
diff --git a/demo-apps/unsafe-https/Chart.yaml → demo-targets/unsafe-https/Chart.yaml b/demo-apps/unsafe-https/Chart.yaml → demo-targets/unsafe-https/Chart.yaml
@@ -14,7 +14,7 @@ keywords:
   - unsafe
   - https
 sources:
-  - https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-apps/unsafe-https
+  - https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-targets/unsafe-https
 maintainers:
   - name: iteratec GmbH
     email: securecodebox@iteratec.com
diff --git a/demo-apps/unsafe-https/README.md → demo-targets/unsafe-https/README.md b/demo-apps/unsafe-https/README.md → demo-targets/unsafe-https/README.md
@@ -16,7 +16,7 @@ which contains both private and public key and is not authorized by a third part
 
 ## Source Code
 
-* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-apps/unsafe-https>
+* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-targets/unsafe-https>
 
 ## Chart Configuration
 

diff --git a/demo-apps/unsafe-https/README.md.gotmpl → demo-targets/unsafe-https/README.md.gotmpl b/demo-apps/unsafe-https/README.md.gotmpl → demo-targets/unsafe-https/README.md.gotmpl
@@ -21,7 +21,7 @@ which contains both private and public key and is not authorized by a third part
 
 ## Source Code
 
-* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-apps/unsafe-https>
+* <https://github.com/secureCodeBox/secureCodeBox/tree/master/demo-targets/unsafe-https>
 
 ## Chart Configuration
 

diff --git a/demo-apps/unsafe-https/questions.yml → demo-targets/unsafe-https/questions.yml b/demo-apps/unsafe-https/questions.yml → demo-targets/unsafe-https/questions.yml
diff --git a/demo-apps/unsafe-https/templates/NOTES.txt → ...-targets/unsafe-https/templates/NOTES.txt b/demo-apps/unsafe-https/templates/NOTES.txt → ...-targets/unsafe-https/templates/NOTES.txt
diff --git a/...-apps/unsafe-https/templates/_helpers.tpl → ...rgets/unsafe-https/templates/_helpers.tpl b/...-apps/unsafe-https/templates/_helpers.tpl → ...rgets/unsafe-https/templates/_helpers.tpl
diff --git a/...ps/unsafe-https/templates/deployment.yaml → ...ts/unsafe-https/templates/deployment.yaml b/...ps/unsafe-https/templates/deployment.yaml → ...ts/unsafe-https/templates/deployment.yaml
diff --git a/...-apps/unsafe-https/templates/service.yaml → ...rgets/unsafe-https/templates/service.yaml b/...-apps/unsafe-https/templates/service.yaml → ...rgets/unsafe-https/templates/service.yaml
diff --git a/demo-apps/unsafe-https/values.yaml → demo-targets/unsafe-https/values.yaml b/demo-apps/unsafe-https/values.yaml → demo-targets/unsafe-https/values.yaml
diff --git a/hooks/persistence-defectdojo/README.md b/hooks/persistence-defectdojo/README.md
@@ -78,7 +78,7 @@ spec:
     scanType: "zap-full-scan"
     parameters:
       - "-t"
-      - "http://juice-shop.demo-apps.svc:3000"
+      - "http://juice-shop.demo-targets.svc:3000"
 ```
 
 ### Complete Example Scan
@@ -110,7 +110,7 @@ spec:
     scanType: "zap-full-scan"
     parameters:
       - "-t"
-      - "http://juice-shop.demo-apps.svc:3000"
+      - "http://juice-shop.demo-targets.svc:3000"
 ```
 
 ## Deployment

diff --git a/hooks/persistence-defectdojo/README.md.gotmpl b/hooks/persistence-defectdojo/README.md.gotmpl
@@ -83,7 +83,7 @@ spec:
     scanType: "zap-full-scan"
     parameters:
       - "-t"
-      - "http://juice-shop.demo-apps.svc:3000"
+      - "http://juice-shop.demo-targets.svc:3000"
 ```
 
 ### Complete Example Scan
@@ -115,7 +115,7 @@ spec:
     scanType: "zap-full-scan"
     parameters:
       - "-t"
-      - "http://juice-shop.demo-apps.svc:3000"
+      - "http://juice-shop.demo-targets.svc:3000"
 ```
 
 ## Deployment

diff --git a/...c/test/java/io/securecodebox/persistence/strategies/VersionedEngagementsStrategyTest.java b/...c/test/java/io/securecodebox/persistence/strategies/VersionedEngagementsStrategyTest.java
@@ -64,7 +64,7 @@ public void setup() throws Exception {
     scan.getMetadata().setNamespace("default");
     scan.setSpec(new V1ScanSpec());
     scan.getSpec().setScanType("zap-baseline-scan");
-    scan.getSpec().setParameters(List.of("-t","http://juice-shop.demo-apps.svc:3000", "-j"));
+    scan.getSpec().setParameters(List.of("-t","http://juice-shop.demo-targets.svc:3000", "-j"));
     scan.setStatus(new V1ScanStatus());
   }