Skip to content
Success

Console Output

Started by user Sébastien Heurtematte
Running as Sébastien Heurtematte
Obtained Jenkinsfile from git https://github.com/eclipse/sw360.website.git
[Pipeline] Start of Pipeline
[Pipeline] echo
[WARNING] label option is deprecated. To use a static pod template, use the 'inheritFrom' option.
[Pipeline] podTemplate
[Pipeline] {
[Pipeline] node
Created Pod: kubernetes sw360/hugo-agent-b8ppp-2fqdr
Still waiting to schedule task
‘hugo-agent-b8ppp-2fqdr’ is offline
Agent hugo-agent-b8ppp-2fqdr is provisioned from template hugo-agent-b8ppp
---
apiVersion: "v1"
kind: "Pod"
metadata:
  annotations:
    buildUrl: "http://jenkins-ui.sw360.svc.cluster.local/sw360/job/sw360.website/169/"
    runUrl: "job/sw360.website/169/"
  labels:
    run: "hugo"
    jenkins: "slave"
    jenkins/label-digest: "7ac110df4066c009b519c7b03c365692b5eeb4d5"
    jenkins/label: "hugo-agent"
  name: "hugo-agent-b8ppp-2fqdr"
  namespace: "sw360"
spec:
  containers:
  - env:
    - name: "JENKINS_SECRET"
      value: "********"
    - name: "JENKINS_TUNNEL"
      value: "jenkins-discovery.sw360.svc.cluster.local:50000"
    - name: "JENKINS_AGENT_NAME"
      value: "hugo-agent-b8ppp-2fqdr"
    - name: "JENKINS_NAME"
      value: "hugo-agent-b8ppp-2fqdr"
    - name: "JENKINS_AGENT_WORKDIR"
      value: "/home/jenkins/agent"
    - name: "JENKINS_URL"
      value: "http://jenkins-ui.sw360.svc.cluster.local/sw360/"
    - name: "HOME"
      value: "/home/jenkins"
    image: "docker.io/eclipsecbi/jiro-agent-basic:remoting-3160.vd76b_9ddd10cc"
    name: "jnlp"
    resources:
      requests:
        memory: "256Mi"
        cpu: "100m"
    volumeMounts:
    - mountPath: "/home/jenkins/.ssh"
      name: "volume-known-hosts"
    - mountPath: "/home/jenkins/agent"
      name: "workspace-volume"
      readOnly: false
  - command:
    - "cat"
    image: "klakegg/hugo:0.111.3-ext-ubuntu"
    name: "hugo"
    tty: true
    volumeMounts:
    - mountPath: "/home/jenkins/agent"
      name: "workspace-volume"
      readOnly: false
  nodeSelector:
    kubernetes.io/os: "linux"
  restartPolicy: "Never"
  volumes:
  - emptyDir:
      medium: ""
    name: "workspace-volume"
  - configMap:
      name: "known-hosts"
    name: "volume-known-hosts"

Running on hugo-agent-b8ppp-2fqdr in /home/jenkins/agent/workspace/sw360.website
[Pipeline] {
[Pipeline] dir
Running in /home/jenkins/agent/workspace/sw360.website/hugo
[Pipeline] {
[Pipeline] stage
[Pipeline] { (Declarative: Checkout SCM)
[Pipeline] checkout
The recommended git tool is: git
No credentials specified
Cloning the remote Git repository
Cloning repository https://github.com/eclipse/sw360.website.git
 > git init /home/jenkins/agent/workspace/sw360.website/hugo # timeout=10
Fetching upstream changes from https://github.com/eclipse/sw360.website.git
 > git --version # timeout=10
 > git --version # 'git version 2.20.1'
 > git fetch --tags --force --progress -- https://github.com/eclipse/sw360.website.git +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/eclipse/sw360.website.git # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
Avoid second fetch
Checking out Revision a23d9ae43e6b90067d8037a44eac9162ee371ecb (origin/main)
 > git rev-parse origin/main^{commit} # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f a23d9ae43e6b90067d8037a44eac9162ee371ecb # timeout=10
Commit message: "feat(content): Rearrange content to avois deployment mistakes"
 > git rev-list --no-walk a23d9ae43e6b90067d8037a44eac9162ee371ecb # timeout=10
[Pipeline] }
[Pipeline] // stage
[Pipeline] }
[Pipeline] // dir
[Pipeline] withEnv
[Pipeline] {
[Pipeline] withEnv
[Pipeline] {
[Pipeline] stage
[Pipeline] { (Checkout www repo)
[Pipeline] dir
Running in /home/jenkins/agent/workspace/sw360.website/www
[Pipeline] {
[Pipeline] sshagent
[ssh-agent] Using credentials sw360-bot (GitHub bot (SSH))
[ssh-agent] Looking for ssh-agent implementation...
[ssh-agent]   Exec ssh-agent (binary ssh-agent on a remote machine)
$ ssh-agent
SSH_AUTH_SOCK=/tmp/ssh-cJnWa0LDlBYM/agent.134
SSH_AGENT_PID=136
Running ssh-add (command line suppressed)
Identity added: /home/jenkins/agent/workspace/sw360.website/www@tmp/private_key_6504357763677064527.key (sw360-bot@eclipse.org)
[ssh-agent] Started.
[Pipeline] {
[Pipeline] sh
+ git clone git@github.com:eclipse-sw360/sw360.website.published.git .
Cloning into '.'...
Checking out files:  46% (229/490)   
Checking out files:  47% (231/490)   
Checking out files:  48% (236/490)   
Checking out files:  49% (241/490)   
Checking out files:  50% (245/490)   
Checking out files:  51% (250/490)   
Checking out files:  52% (255/490)   
Checking out files:  53% (260/490)   
Checking out files:  54% (265/490)   
Checking out files:  55% (270/490)   
Checking out files:  56% (275/490)   
Checking out files:  57% (280/490)   
Checking out files:  58% (285/490)   
Checking out files:  59% (290/490)   
Checking out files:  60% (294/490)   
Checking out files:  61% (299/490)   
Checking out files:  62% (304/490)   
Checking out files:  63% (309/490)   
Checking out files:  64% (314/490)   
Checking out files:  65% (319/490)   
Checking out files:  66% (324/490)   
Checking out files:  67% (329/490)   
Checking out files:  68% (334/490)   
Checking out files:  69% (339/490)   
Checking out files:  70% (343/490)   
Checking out files:  71% (348/490)   
Checking out files:  72% (353/490)   
Checking out files:  73% (358/490)   
Checking out files:  74% (363/490)   
Checking out files:  74% (364/490)   
Checking out files:  75% (368/490)   
Checking out files:  76% (373/490)   
Checking out files:  77% (378/490)   
Checking out files:  78% (383/490)   
Checking out files:  79% (388/490)   
Checking out files:  80% (392/490)   
Checking out files:  81% (397/490)   
Checking out files:  82% (402/490)   
Checking out files:  83% (407/490)   
Checking out files:  83% (410/490)   
Checking out files:  84% (412/490)   
Checking out files:  85% (417/490)   
Checking out files:  86% (422/490)   
Checking out files:  87% (427/490)   
Checking out files:  88% (432/490)   
Checking out files:  89% (437/490)   
Checking out files:  90% (441/490)   
Checking out files:  91% (446/490)   
Checking out files:  92% (451/490)   
Checking out files:  93% (456/490)   
Checking out files:  94% (461/490)   
Checking out files:  95% (466/490)   
Checking out files:  96% (471/490)   
Checking out files:  97% (476/490)   
Checking out files:  98% (481/490)   
Checking out files:  99% (486/490)   
Checking out files: 100% (490/490)   
Checking out files: 100% (490/490), done.
+ git checkout main
Already on 'main'
Your branch is up to date with 'origin/main'.
[Pipeline] }
$ ssh-agent -k
unset SSH_AUTH_SOCK;
unset SSH_AGENT_PID;
echo Agent pid 136 killed;
[ssh-agent] Stopped.
[Pipeline] // sshagent
[Pipeline] }
[Pipeline] // dir
[Pipeline] }
[Pipeline] // stage
[Pipeline] stage
[Pipeline] { (Build main website with Hugo)
[Pipeline] container
[Pipeline] {
[Pipeline] dir
Running in /home/jenkins/agent/workspace/sw360.website/hugo
[Pipeline] {
[Pipeline] sh
+ mkdir -p themes/docsy
[Pipeline] sh
+ hugo -b https://www.eclipse.org/sw360/
hugo: downloading modules …
hugo: collected modules in 51589 ms
Start building sites … 
hugo v0.111.3-5d4eb5154e1fed125ca8e9b5a0315c4180dab192+extended linux/amd64 BuildDate=2023-03-12T11:40:50Z VendorInfo=hugoguru

                   | EN   
-------------------+------
  Pages            | 101  
  Paginator pages  |   0  
  Non-page files   |   0  
  Static files     | 388  
  Processed images |   0  
  Aliases          |   0  
  Sitemaps         |   1  
  Cleaned          |   0  

Total in 71888 ms
[Pipeline] }
[Pipeline] // dir
[Pipeline] }
[Pipeline] // container
[Pipeline] }
[Pipeline] // stage
[Pipeline] stage
[Pipeline] { (Build staging website with Hugo)
Stage "Build staging website with Hugo" skipped due to when conditional
[Pipeline] }
[Pipeline] // stage
[Pipeline] stage
[Pipeline] { (Push www)
[Pipeline] sh
+ rm -rf www/404.html www/about www/css www/docs www/favicons www/img www/index.html www/index.xml www/js www/presentations www/robots.txt www/screenshots www/scss www/sitemap.xml www/webfonts
+ cp -Rvf hugo/public/404.html hugo/public/about hugo/public/css hugo/public/docs hugo/public/favicons hugo/public/img hugo/public/index.html hugo/public/index.xml hugo/public/js hugo/public/presentations hugo/public/robots.txt hugo/public/screenshots hugo/public/scss hugo/public/sitemap.xml hugo/public/webfonts www/
'hugo/public/404.html' -> 'www/404.html'
'hugo/public/about' -> 'www/about'
'hugo/public/about/index.html' -> 'www/about/index.html'
'hugo/public/css' -> 'www/css'
'hugo/public/css/prism.css' -> 'www/css/prism.css'
'hugo/public/css/swagger-ui.css' -> 'www/css/swagger-ui.css'
'hugo/public/docs' -> 'www/docs'
'hugo/public/docs/index.html' -> 'www/docs/index.html'
'hugo/public/docs/index.xml' -> 'www/docs/index.xml'
'hugo/public/docs/deployment' -> 'www/docs/deployment'
'hugo/public/docs/deployment/index.html' -> 'www/docs/deployment/index.html'
'hugo/public/docs/deployment/index.xml' -> 'www/docs/deployment/index.xml'
'hugo/public/docs/deployment/deploy-authorization-concept' -> 'www/docs/deployment/deploy-authorization-concept'
'hugo/public/docs/deployment/deploy-authorization-concept/index.html' -> 'www/docs/deployment/deploy-authorization-concept/index.html'
'hugo/public/docs/deployment/legacy' -> 'www/docs/deployment/legacy'
'hugo/public/docs/deployment/legacy/index.html' -> 'www/docs/deployment/legacy/index.html'
'hugo/public/docs/deployment/legacy/index.xml' -> 'www/docs/deployment/legacy/index.xml'
'hugo/public/docs/deployment/legacy/deploy-natively-11' -> 'www/docs/deployment/legacy/deploy-natively-11'
'hugo/public/docs/deployment/legacy/deploy-natively-11/index.html' -> 'www/docs/deployment/legacy/deploy-natively-11/index.html'
'hugo/public/docs/deployment/legacy/deploy-liferay' -> 'www/docs/deployment/legacy/deploy-liferay'
'hugo/public/docs/deployment/legacy/deploy-liferay/index.html' -> 'www/docs/deployment/legacy/deploy-liferay/index.html'
'hugo/public/docs/deployment/legacy/nativeinstall' -> 'www/docs/deployment/legacy/nativeinstall'
'hugo/public/docs/deployment/legacy/nativeinstall/index.html' -> 'www/docs/deployment/legacy/nativeinstall/index.html'
'hugo/public/docs/deployment/legacy/nativeinstall/index.xml' -> 'www/docs/deployment/legacy/nativeinstall/index.xml'
'hugo/public/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0' -> 'www/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0'
'hugo/public/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/index.html' -> 'www/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/index.html'
'hugo/public/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0' -> 'www/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0'
'hugo/public/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/index.html' -> 'www/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/index.html'
'hugo/public/docs/deployment/legacy/deploy-liferay7.3' -> 'www/docs/deployment/legacy/deploy-liferay7.3'
'hugo/public/docs/deployment/legacy/deploy-liferay7.3/index.html' -> 'www/docs/deployment/legacy/deploy-liferay7.3/index.html'
'hugo/public/docs/deployment/legacy/deploy-liferay7' -> 'www/docs/deployment/legacy/deploy-liferay7'
'hugo/public/docs/deployment/legacy/deploy-liferay7/index.html' -> 'www/docs/deployment/legacy/deploy-liferay7/index.html'
'hugo/public/docs/deployment/deploy-secure-deployment' -> 'www/docs/deployment/deploy-secure-deployment'
'hugo/public/docs/deployment/deploy-secure-deployment/index.html' -> 'www/docs/deployment/deploy-secure-deployment/index.html'
'hugo/public/docs/deployment/deploy-configuration-files' -> 'www/docs/deployment/deploy-configuration-files'
'hugo/public/docs/deployment/deploy-configuration-files/index.html' -> 'www/docs/deployment/deploy-configuration-files/index.html'
'hugo/public/docs/deployment/deploy-cve-search' -> 'www/docs/deployment/deploy-cve-search'
'hugo/public/docs/deployment/deploy-cve-search/index.html' -> 'www/docs/deployment/deploy-cve-search/index.html'
'hugo/public/docs/deployment/deploy-initial-setup18' -> 'www/docs/deployment/deploy-initial-setup18'
'hugo/public/docs/deployment/deploy-initial-setup18/index.html' -> 'www/docs/deployment/deploy-initial-setup18/index.html'
'hugo/public/docs/deployment/deploy-specialdeployment' -> 'www/docs/deployment/deploy-specialdeployment'
'hugo/public/docs/deployment/deploy-specialdeployment/index.html' -> 'www/docs/deployment/deploy-specialdeployment/index.html'
'hugo/public/docs/deployment/baremetal' -> 'www/docs/deployment/baremetal'
'hugo/public/docs/deployment/baremetal/index.html' -> 'www/docs/deployment/baremetal/index.html'
'hugo/public/docs/deployment/baremetal/index.xml' -> 'www/docs/deployment/baremetal/index.xml'
'hugo/public/docs/deployment/baremetal/deploy-natively' -> 'www/docs/deployment/baremetal/deploy-natively'
'hugo/public/docs/deployment/baremetal/deploy-natively/index.html' -> 'www/docs/deployment/baremetal/deploy-natively/index.html'
'hugo/public/docs/deployment/deploy-requirements' -> 'www/docs/deployment/deploy-requirements'
'hugo/public/docs/deployment/deploy-requirements/index.html' -> 'www/docs/deployment/deploy-requirements/index.html'
'hugo/public/docs/deployment/deploy-configuration-country-codes' -> 'www/docs/deployment/deploy-configuration-country-codes'
'hugo/public/docs/deployment/deploy-configuration-country-codes/index.html' -> 'www/docs/deployment/deploy-configuration-country-codes/index.html'
'hugo/public/docs/deployment/upgrading' -> 'www/docs/deployment/upgrading'
'hugo/public/docs/deployment/upgrading/index.html' -> 'www/docs/deployment/upgrading/index.html'
'hugo/public/docs/deployment/upgrading/index.xml' -> 'www/docs/deployment/upgrading/index.xml'
'hugo/public/docs/deployment/upgrading/upgrade-sw360-from-14.0.0-to-15.0.0' -> 'www/docs/deployment/upgrading/upgrade-sw360-from-14.0.0-to-15.0.0'
'hugo/public/docs/deployment/upgrading/upgrade-sw360-from-14.0.0-to-15.0.0/index.html' -> 'www/docs/deployment/upgrading/upgrade-sw360-from-14.0.0-to-15.0.0/index.html'
'hugo/public/docs/deployment/upgrading/upgrade_version_sw360_16_to_17' -> 'www/docs/deployment/upgrading/upgrade_version_sw360_16_to_17'
'hugo/public/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/index.html' -> 'www/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/index.html'
'hugo/public/docs/deployment/upgrading/upgrade_version_sw360_17_to_18' -> 'www/docs/deployment/upgrading/upgrade_version_sw360_17_to_18'
'hugo/public/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/index.html' -> 'www/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/index.html'
'hugo/public/docs/deployment/upgrading/deploy-upgrade-to-liferay-7.3-and-java-11' -> 'www/docs/deployment/upgrading/deploy-upgrade-to-liferay-7.3-and-java-11'
'hugo/public/docs/deployment/upgrading/deploy-upgrade-to-liferay-7.3-and-java-11/index.html' -> 'www/docs/deployment/upgrading/deploy-upgrade-to-liferay-7.3-and-java-11/index.html'
'hugo/public/docs/deployment/upgrading/upgrade_version_sw360_15_to_16' -> 'www/docs/deployment/upgrading/upgrade_version_sw360_15_to_16'
'hugo/public/docs/deployment/upgrading/upgrade_version_sw360_15_to_16/index.html' -> 'www/docs/deployment/upgrading/upgrade_version_sw360_15_to_16/index.html'
'hugo/public/docs/deployment/deploy-export-and-import' -> 'www/docs/deployment/deploy-export-and-import'
'hugo/public/docs/deployment/deploy-export-and-import/index.html' -> 'www/docs/deployment/deploy-export-and-import/index.html'
'hugo/public/docs/administrationguide' -> 'www/docs/administrationguide'
'hugo/public/docs/administrationguide/index.html' -> 'www/docs/administrationguide/index.html'
'hugo/public/docs/administrationguide/index.xml' -> 'www/docs/administrationguide/index.xml'
'hugo/public/docs/administrationguide/vulnerabilitymanagement' -> 'www/docs/administrationguide/vulnerabilitymanagement'
'hugo/public/docs/administrationguide/vulnerabilitymanagement/index.html' -> 'www/docs/administrationguide/vulnerabilitymanagement/index.html'
'hugo/public/docs/administrationguide/vulnerabilitymanagement/index.xml' -> 'www/docs/administrationguide/vulnerabilitymanagement/index.xml'
'hugo/public/docs/administrationguide/vulnerabilitymanagement/vulnerabilities' -> 'www/docs/administrationguide/vulnerabilitymanagement/vulnerabilities'
'hugo/public/docs/administrationguide/vulnerabilitymanagement/vulnerabilities/index.html' -> 'www/docs/administrationguide/vulnerabilitymanagement/vulnerabilities/index.html'
'hugo/public/docs/administrationguide/vulnerabilitymanagement/user-check-vulnerabilities-for-your-project' -> 'www/docs/administrationguide/vulnerabilitymanagement/user-check-vulnerabilities-for-your-project'
'hugo/public/docs/administrationguide/vulnerabilitymanagement/user-check-vulnerabilities-for-your-project/index.html' -> 'www/docs/administrationguide/vulnerabilitymanagement/user-check-vulnerabilities-for-your-project/index.html'
'hugo/public/docs/administrationguide/menu' -> 'www/docs/administrationguide/menu'
'hugo/public/docs/administrationguide/menu/index.html' -> 'www/docs/administrationguide/menu/index.html'
'hugo/public/docs/administrationguide/user-management-roles' -> 'www/docs/administrationguide/user-management-roles'
'hugo/public/docs/administrationguide/user-management-roles/index.html' -> 'www/docs/administrationguide/user-management-roles/index.html'
'hugo/public/docs/administrationguide/user-data-model-enumerations' -> 'www/docs/administrationguide/user-data-model-enumerations'
'hugo/public/docs/administrationguide/user-data-model-enumerations/index.html' -> 'www/docs/administrationguide/user-data-model-enumerations/index.html'
'hugo/public/docs/administrationguide/properties' -> 'www/docs/administrationguide/properties'
'hugo/public/docs/administrationguide/properties/index.html' -> 'www/docs/administrationguide/properties/index.html'
'hugo/public/docs/administrationguide/user-scheduling-cve-search-by-admins' -> 'www/docs/administrationguide/user-scheduling-cve-search-by-admins'
'hugo/public/docs/administrationguide/user-scheduling-cve-search-by-admins/index.html' -> 'www/docs/administrationguide/user-scheduling-cve-search-by-admins/index.html'
'hugo/public/docs/development' -> 'www/docs/development'
'hugo/public/docs/development/index.html' -> 'www/docs/development/index.html'
'hugo/public/docs/development/index.xml' -> 'www/docs/development/index.xml'
'hugo/public/docs/development/dev-branches' -> 'www/docs/development/dev-branches'
'hugo/public/docs/development/dev-branches/index.html' -> 'www/docs/development/dev-branches/index.html'
'hugo/public/docs/development/dev-moderation-requests' -> 'www/docs/development/dev-moderation-requests'
'hugo/public/docs/development/dev-moderation-requests/index.html' -> 'www/docs/development/dev-moderation-requests/index.html'
'hugo/public/docs/development/dev-liferay-friendly-url' -> 'www/docs/development/dev-liferay-friendly-url'
'hugo/public/docs/development/dev-liferay-friendly-url/index.html' -> 'www/docs/development/dev-liferay-friendly-url/index.html'
'hugo/public/docs/development/dev-testing-frameworks' -> 'www/docs/development/dev-testing-frameworks'
'hugo/public/docs/development/dev-testing-frameworks/index.html' -> 'www/docs/development/dev-testing-frameworks/index.html'
'hugo/public/docs/development/dev-dod-and-style' -> 'www/docs/development/dev-dod-and-style'
'hugo/public/docs/development/dev-dod-and-style/index.html' -> 'www/docs/development/dev-dod-and-style/index.html'
'hugo/public/docs/development/dev-adding-a-new-portlet-backend' -> 'www/docs/development/dev-adding-a-new-portlet-backend'
'hugo/public/docs/development/dev-adding-a-new-portlet-backend/index.html' -> 'www/docs/development/dev-adding-a-new-portlet-backend/index.html'
'hugo/public/docs/development/dev-semantic-commits' -> 'www/docs/development/dev-semantic-commits'
'hugo/public/docs/development/dev-semantic-commits/index.html' -> 'www/docs/development/dev-semantic-commits/index.html'
'hugo/public/docs/development/dev-filtering-in-portlets' -> 'www/docs/development/dev-filtering-in-portlets'
'hugo/public/docs/development/dev-filtering-in-portlets/index.html' -> 'www/docs/development/dev-filtering-in-portlets/index.html'
'hugo/public/docs/development/dev-adding-new-fields-to-existing-classes' -> 'www/docs/development/dev-adding-new-fields-to-existing-classes'
'hugo/public/docs/development/dev-adding-new-fields-to-existing-classes/index.html' -> 'www/docs/development/dev-adding-new-fields-to-existing-classes/index.html'
'hugo/public/docs/development/dev-adding-a-new-portlet-frontend' -> 'www/docs/development/dev-adding-a-new-portlet-frontend'
'hugo/public/docs/development/dev-adding-a-new-portlet-frontend/index.html' -> 'www/docs/development/dev-adding-a-new-portlet-frontend/index.html'
'hugo/public/docs/development/dev-releasing-sw360' -> 'www/docs/development/dev-releasing-sw360'
'hugo/public/docs/development/dev-releasing-sw360/index.html' -> 'www/docs/development/dev-releasing-sw360/index.html'
'hugo/public/docs/development/dev-using-requirejs-for-javascript-modules' -> 'www/docs/development/dev-using-requirejs-for-javascript-modules'
'hugo/public/docs/development/dev-using-requirejs-for-javascript-modules/index.html' -> 'www/docs/development/dev-using-requirejs-for-javascript-modules/index.html'
'hugo/public/docs/development/dev-database-migration-using-costco' -> 'www/docs/development/dev-database-migration-using-costco'
'hugo/public/docs/development/dev-database-migration-using-costco/index.html' -> 'www/docs/development/dev-database-migration-using-costco/index.html'
'hugo/public/docs/development/restapi' -> 'www/docs/development/restapi'
'hugo/public/docs/development/restapi/index.html' -> 'www/docs/development/restapi/index.html'
'hugo/public/docs/development/restapi/index.xml' -> 'www/docs/development/restapi/index.xml'
'hugo/public/docs/development/restapi/access' -> 'www/docs/development/restapi/access'
'hugo/public/docs/development/restapi/access/index.html' -> 'www/docs/development/restapi/access/index.html'
'hugo/public/docs/development/restapi/dev-rest-api' -> 'www/docs/development/restapi/dev-rest-api'
'hugo/public/docs/development/restapi/dev-rest-api/index.html' -> 'www/docs/development/restapi/dev-rest-api/index.html'
'hugo/public/docs/development/dev-role-authorisation-model' -> 'www/docs/development/dev-role-authorisation-model'
'hugo/public/docs/development/dev-role-authorisation-model/index.html' -> 'www/docs/development/dev-role-authorisation-model/index.html'
'hugo/public/docs/development/testcases' -> 'www/docs/development/testcases'
'hugo/public/docs/development/testcases/index.html' -> 'www/docs/development/testcases/index.html'
'hugo/public/docs/development/testcases/index.xml' -> 'www/docs/development/testcases/index.xml'
'hugo/public/docs/development/testcases/test-cases-components' -> 'www/docs/development/testcases/test-cases-components'
'hugo/public/docs/development/testcases/test-cases-components/index.html' -> 'www/docs/development/testcases/test-cases-components/index.html'
'hugo/public/docs/development/testcases/test-cases-projects' -> 'www/docs/development/testcases/test-cases-projects'
'hugo/public/docs/development/testcases/test-cases-projects/index.html' -> 'www/docs/development/testcases/test-cases-projects/index.html'
'hugo/public/docs/development/testcases/test-cases-licenses' -> 'www/docs/development/testcases/test-cases-licenses'
'hugo/public/docs/development/testcases/test-cases-licenses/index.html' -> 'www/docs/development/testcases/test-cases-licenses/index.html'
'hugo/public/docs/development/testcases/test-cases-moderations' -> 'www/docs/development/testcases/test-cases-moderations'
'hugo/public/docs/development/testcases/test-cases-moderations/index.html' -> 'www/docs/development/testcases/test-cases-moderations/index.html'
'hugo/public/docs/development/dev-fossology-integration' -> 'www/docs/development/dev-fossology-integration'
'hugo/public/docs/development/dev-fossology-integration/index.html' -> 'www/docs/development/dev-fossology-integration/index.html'
'hugo/public/docs/development/dev-external-documents-with-couchdb' -> 'www/docs/development/dev-external-documents-with-couchdb'
'hugo/public/docs/development/dev-external-documents-with-couchdb/index.html' -> 'www/docs/development/dev-external-documents-with-couchdb/index.html'
'hugo/public/docs/development/dev-troubleshooting' -> 'www/docs/development/dev-troubleshooting'
'hugo/public/docs/development/dev-troubleshooting/index.html' -> 'www/docs/development/dev-troubleshooting/index.html'
'hugo/public/docs/userguide' -> 'www/docs/userguide'
'hugo/public/docs/userguide/index.html' -> 'www/docs/userguide/index.html'
'hugo/public/docs/userguide/index.xml' -> 'www/docs/userguide/index.xml'
'hugo/public/docs/userguide/faq' -> 'www/docs/userguide/faq'
'hugo/public/docs/userguide/faq/index.html' -> 'www/docs/userguide/faq/index.html'
'hugo/public/docs/userguide/search' -> 'www/docs/userguide/search'
'hugo/public/docs/userguide/search/index.html' -> 'www/docs/userguide/search/index.html'
'hugo/public/docs/userguide/components' -> 'www/docs/userguide/components'
'hugo/public/docs/userguide/components/index.html' -> 'www/docs/userguide/components/index.html'
'hugo/public/docs/userguide/bestpractices' -> 'www/docs/userguide/bestpractices'
'hugo/public/docs/userguide/bestpractices/index.html' -> 'www/docs/userguide/bestpractices/index.html'
'hugo/public/docs/userguide/bestpractices/index.xml' -> 'www/docs/userguide/bestpractices/index.xml'
'hugo/public/docs/userguide/bestpractices/component-naming' -> 'www/docs/userguide/bestpractices/component-naming'
'hugo/public/docs/userguide/bestpractices/component-naming/index.html' -> 'www/docs/userguide/bestpractices/component-naming/index.html'
'hugo/public/docs/userguide/bestpractices/good-record-creation-structure' -> 'www/docs/userguide/bestpractices/good-record-creation-structure'
'hugo/public/docs/userguide/bestpractices/good-record-creation-structure/index.html' -> 'www/docs/userguide/bestpractices/good-record-creation-structure/index.html'
'hugo/public/docs/userguide/bestpractices/user-attachment-file-types' -> 'www/docs/userguide/bestpractices/user-attachment-file-types'
'hugo/public/docs/userguide/bestpractices/user-attachment-file-types/index.html' -> 'www/docs/userguide/bestpractices/user-attachment-file-types/index.html'
'hugo/public/docs/userguide/bestpractices/license-naming' -> 'www/docs/userguide/bestpractices/license-naming'
'hugo/public/docs/userguide/bestpractices/license-naming/index.html' -> 'www/docs/userguide/bestpractices/license-naming/index.html'
'hugo/public/docs/userguide/bestpractices/workflows' -> 'www/docs/userguide/bestpractices/workflows'
'hugo/public/docs/userguide/bestpractices/workflows/index.html' -> 'www/docs/userguide/bestpractices/workflows/index.html'
'hugo/public/docs/userguide/dependency_network' -> 'www/docs/userguide/dependency_network'
'hugo/public/docs/userguide/dependency_network/index.html' -> 'www/docs/userguide/dependency_network/index.html'
'hugo/public/docs/userguide/preferrences' -> 'www/docs/userguide/preferrences'
'hugo/public/docs/userguide/preferrences/index.html' -> 'www/docs/userguide/preferrences/index.html'
'hugo/public/docs/userguide/licenses' -> 'www/docs/userguide/licenses'
'hugo/public/docs/userguide/licenses/index.html' -> 'www/docs/userguide/licenses/index.html'
'hugo/public/docs/userguide/login' -> 'www/docs/userguide/login'
'hugo/public/docs/userguide/login/index.html' -> 'www/docs/userguide/login/index.html'
'hugo/public/docs/userguide/requests' -> 'www/docs/userguide/requests'
'hugo/public/docs/userguide/requests/index.html' -> 'www/docs/userguide/requests/index.html'
'hugo/public/docs/userguide/sw360-homepage' -> 'www/docs/userguide/sw360-homepage'
'hugo/public/docs/userguide/sw360-homepage/index.html' -> 'www/docs/userguide/sw360-homepage/index.html'
'hugo/public/docs/userguide/project' -> 'www/docs/userguide/project'
'hugo/public/docs/userguide/project/index.html' -> 'www/docs/userguide/project/index.html'
'hugo/public/docs/userguide/spdx_document' -> 'www/docs/userguide/spdx_document'
'hugo/public/docs/userguide/spdx_document/index.html' -> 'www/docs/userguide/spdx_document/index.html'
'hugo/public/favicons' -> 'www/favicons'
'hugo/public/favicons/android-144x144.png' -> 'www/favicons/android-144x144.png'
'hugo/public/favicons/android-192x192.png' -> 'www/favicons/android-192x192.png'
'hugo/public/favicons/android-36x36.png' -> 'www/favicons/android-36x36.png'
'hugo/public/favicons/android-48x48.png' -> 'www/favicons/android-48x48.png'
'hugo/public/favicons/android-72x72.png' -> 'www/favicons/android-72x72.png'
'hugo/public/favicons/android-96x96.png' -> 'www/favicons/android-96x96.png'
'hugo/public/favicons/android-chrome-192x192.png' -> 'www/favicons/android-chrome-192x192.png'
'hugo/public/favicons/android-chrome-512x512.png' -> 'www/favicons/android-chrome-512x512.png'
'hugo/public/favicons/android-chrome-maskable-192x192.png' -> 'www/favicons/android-chrome-maskable-192x192.png'
'hugo/public/favicons/android-chrome-maskable-512x512.png' -> 'www/favicons/android-chrome-maskable-512x512.png'
'hugo/public/favicons/apple-touch-icon-120x120.png' -> 'www/favicons/apple-touch-icon-120x120.png'
'hugo/public/favicons/apple-touch-icon-152x152.png' -> 'www/favicons/apple-touch-icon-152x152.png'
'hugo/public/favicons/apple-touch-icon-167x167.png' -> 'www/favicons/apple-touch-icon-167x167.png'
'hugo/public/favicons/apple-touch-icon-180x180.png' -> 'www/favicons/apple-touch-icon-180x180.png'
'hugo/public/favicons/apple-touch-icon-60x60.png' -> 'www/favicons/apple-touch-icon-60x60.png'
'hugo/public/favicons/apple-touch-icon-76x76.png' -> 'www/favicons/apple-touch-icon-76x76.png'
'hugo/public/favicons/apple-touch-icon.png' -> 'www/favicons/apple-touch-icon.png'
'hugo/public/favicons/coast-228x228.png' -> 'www/favicons/coast-228x228.png'
'hugo/public/favicons/favicon-1024.png' -> 'www/favicons/favicon-1024.png'
'hugo/public/favicons/favicon-128x128.png' -> 'www/favicons/favicon-128x128.png'
'hugo/public/favicons/favicon-16x16.png' -> 'www/favicons/favicon-16x16.png'
'hugo/public/favicons/favicon-256.png' -> 'www/favicons/favicon-256.png'
'hugo/public/favicons/favicon-256x256.png' -> 'www/favicons/favicon-256x256.png'
'hugo/public/favicons/favicon-32x32.png' -> 'www/favicons/favicon-32x32.png'
'hugo/public/favicons/favicon-48x48.png' -> 'www/favicons/favicon-48x48.png'
'hugo/public/favicons/favicon-64x64.png' -> 'www/favicons/favicon-64x64.png'
'hugo/public/favicons/favicon-96x96.png' -> 'www/favicons/favicon-96x96.png'
'hugo/public/favicons/favicon.ico' -> 'www/favicons/favicon.ico'
'hugo/public/favicons/msapplication-icon-144x144.png' -> 'www/favicons/msapplication-icon-144x144.png'
'hugo/public/favicons/mstile-150x150.png' -> 'www/favicons/mstile-150x150.png'
'hugo/public/favicons/pwa-192x192.png' -> 'www/favicons/pwa-192x192.png'
'hugo/public/favicons/pwa-512x512.png' -> 'www/favicons/pwa-512x512.png'
'hugo/public/favicons/tile150x150.png' -> 'www/favicons/tile150x150.png'
'hugo/public/favicons/tile310x150.png' -> 'www/favicons/tile310x150.png'
'hugo/public/favicons/tile310x310.png' -> 'www/favicons/tile310x310.png'
'hugo/public/favicons/tile70x70.png' -> 'www/favicons/tile70x70.png'
'hugo/public/img' -> 'www/img'
'hugo/public/img/favicon.ico' -> 'www/img/favicon.ico'
'hugo/public/img/featured-background.jpg' -> 'www/img/featured-background.jpg'
'hugo/public/img/ImagesBasic' -> 'www/img/ImagesBasic'
'hugo/public/img/ImagesBasic/create_comp.png' -> 'www/img/ImagesBasic/create_comp.png'
'hugo/public/img/ImagesBasic/create_proj.png' -> 'www/img/ImagesBasic/create_proj.png'
'hugo/public/img/ImagesBasic/create_release_new.png' -> 'www/img/ImagesBasic/create_release_new.png'
'hugo/public/img/ImagesBasic/dual_license.png' -> 'www/img/ImagesBasic/dual_license.png'
'hugo/public/img/ImagesBasic/duo.png' -> 'www/img/ImagesBasic/duo.png'
'hugo/public/img/ImagesBasic/general-search.png' -> 'www/img/ImagesBasic/general-search.png'
'hugo/public/img/ImagesBasic/homepage.png' -> 'www/img/ImagesBasic/homepage.png'
'hugo/public/img/ImagesBasic/navigationbar-search.png' -> 'www/img/ImagesBasic/navigationbar-search.png'
'hugo/public/img/ImagesBasic/new_attachment.png' -> 'www/img/ImagesBasic/new_attachment.png'
'hugo/public/img/ImagesBasic/new_comp.png' -> 'www/img/ImagesBasic/new_comp.png'
'hugo/public/img/ImagesBasic/new_comp_view.png' -> 'www/img/ImagesBasic/new_comp_view.png'
'hugo/public/img/ImagesBasic/new_proj.png' -> 'www/img/ImagesBasic/new_proj.png'
'hugo/public/img/ImagesBasic/proj_pg2.png' -> 'www/img/ImagesBasic/proj_pg2.png'
'hugo/public/img/ImagesBasic/release_list.png' -> 'www/img/ImagesBasic/release_list.png'
'hugo/public/img/ImagesBasic/start_page.png' -> 'www/img/ImagesBasic/start_page.png'
'hugo/public/img/ImagesBasic/sw360_specific_search.png' -> 'www/img/ImagesBasic/sw360_specific_search.png'
'hugo/public/img/ImagesBasic/AddAttachment.png' -> 'www/img/ImagesBasic/AddAttachment.png'
'hugo/public/img/ImagesBasic/AddReleaseButton.png' -> 'www/img/ImagesBasic/AddReleaseButton.png'
'hugo/public/img/ImagesBasic/AddReleaseScreenWithoutData1.png' -> 'www/img/ImagesBasic/AddReleaseScreenWithoutData1.png'
'hugo/public/img/ImagesBasic/AddReleaseScreenWithoutData2.png' -> 'www/img/ImagesBasic/AddReleaseScreenWithoutData2.png'
'hugo/public/img/ImagesBasic/Additional_data_1.png' -> 'www/img/ImagesBasic/Additional_data_1.png'
'hugo/public/img/ImagesBasic/Additional_data_2.png' -> 'www/img/ImagesBasic/Additional_data_2.png'
'hugo/public/img/ImagesBasic/Addproject4.png' -> 'www/img/ImagesBasic/Addproject4.png'
'hugo/public/img/ImagesBasic/Addproject_5.png' -> 'www/img/ImagesBasic/Addproject_5.png'
'hugo/public/img/ImagesBasic/Attachment_2.png' -> 'www/img/ImagesBasic/Attachment_2.png'
'hugo/public/img/ImagesBasic/ClearingRequest.png' -> 'www/img/ImagesBasic/ClearingRequest.png'
'hugo/public/img/ImagesBasic/Clearing_Information.png' -> 'www/img/ImagesBasic/Clearing_Information.png'
'hugo/public/img/ImagesBasic/ComponentList.png' -> 'www/img/ImagesBasic/ComponentList.png'
'hugo/public/img/ImagesBasic/Copy_Duplicate.png' -> 'www/img/ImagesBasic/Copy_Duplicate.png'
'hugo/public/img/ImagesBasic/Create_clearing_request.png' -> 'www/img/ImagesBasic/Create_clearing_request.png'
'hugo/public/img/ImagesBasic/Delete_Trash.png' -> 'www/img/ImagesBasic/Delete_Trash.png'
'hugo/public/img/ImagesBasic/Deleteproject1.png' -> 'www/img/ImagesBasic/Deleteproject1.png'
'hugo/public/img/ImagesBasic/EditProject_Attachments.png' -> 'www/img/ImagesBasic/EditProject_Attachments.png'
'hugo/public/img/ImagesBasic/Edit_Pen.png' -> 'www/img/ImagesBasic/Edit_Pen.png'
'hugo/public/img/ImagesBasic/Export-Spreadsheet.png' -> 'www/img/ImagesBasic/Export-Spreadsheet.png'
'hugo/public/img/ImagesBasic/Export_spreadsheet.png' -> 'www/img/ImagesBasic/Export_spreadsheet.png'
'hugo/public/img/ImagesBasic/Generate_license_info.png' -> 'www/img/ImagesBasic/Generate_license_info.png'
'hugo/public/img/ImagesBasic/Generate_license_info_2 .png' -> 'www/img/ImagesBasic/Generate_license_info_2 .png'
'hugo/public/img/ImagesBasic/Generate_license_info_3.png' -> 'www/img/ImagesBasic/Generate_license_info_3.png'
'hugo/public/img/ImagesBasic/Home_Page.png' -> 'www/img/ImagesBasic/Home_Page.png'
'hugo/public/img/ImagesBasic/ImportSBOM.png' -> 'www/img/ImagesBasic/ImportSBOM.png'
'hugo/public/img/ImagesBasic/LicenseClearing_1.png' -> 'www/img/ImagesBasic/LicenseClearing_1.png'
'hugo/public/img/ImagesBasic/License_Clearing_request.png' -> 'www/img/ImagesBasic/License_Clearing_request.png'
'hugo/public/img/ImagesBasic/Link_release_1.png' -> 'www/img/ImagesBasic/Link_release_1.png'
'hugo/public/img/ImagesBasic/Link_release_2.png' -> 'www/img/ImagesBasic/Link_release_2.png'
'hugo/public/img/ImagesBasic/Link_release_3.png' -> 'www/img/ImagesBasic/Link_release_3.png'
'hugo/public/img/ImagesBasic/Linked-projects_1.png' -> 'www/img/ImagesBasic/Linked-projects_1.png'
'hugo/public/img/ImagesBasic/Linked-projects_2.png' -> 'www/img/ImagesBasic/Linked-projects_2.png'
'hugo/public/img/ImagesBasic/Linked-projects_3.png' -> 'www/img/ImagesBasic/Linked-projects_3.png'
'hugo/public/img/ImagesBasic/Linking_project.png' -> 'www/img/ImagesBasic/Linking_project.png'
'hugo/public/img/ImagesBasic/Loginpage.png' -> 'www/img/ImagesBasic/Loginpage.png'
'hugo/public/img/ImagesBasic/ProjectAdministration.png' -> 'www/img/ImagesBasic/ProjectAdministration.png'
'hugo/public/img/ImagesBasic/ProjectExternalURL1.png' -> 'www/img/ImagesBasic/ProjectExternalURL1.png'
'hugo/public/img/ImagesBasic/ProjectExternalURL2.png' -> 'www/img/ImagesBasic/ProjectExternalURL2.png'
'hugo/public/img/ImagesBasic/ProjectGeneralInfo (1).png' -> 'www/img/ImagesBasic/ProjectGeneralInfo (1).png'
'hugo/public/img/ImagesBasic/ProjectLifecycle.png' -> 'www/img/ImagesBasic/ProjectLifecycle.png'
'hugo/public/img/ImagesBasic/ProjectLinkedreleasesandprojects.png' -> 'www/img/ImagesBasic/ProjectLinkedreleasesandprojects.png'
'hugo/public/img/ImagesBasic/ProjectRoles.png' -> 'www/img/ImagesBasic/ProjectRoles.png'
'hugo/public/img/ImagesBasic/Project_external_ID_1.png' -> 'www/img/ImagesBasic/Project_external_ID_1.png'
'hugo/public/img/ImagesBasic/Project_external_ID_2.png' -> 'www/img/ImagesBasic/Project_external_ID_2.png'
'hugo/public/img/ImagesBasic/Projectpage.png' -> 'www/img/ImagesBasic/Projectpage.png'
'hugo/public/img/ImagesBasic/ReleaseClearingDetails.png' -> 'www/img/ImagesBasic/ReleaseClearingDetails.png'
'hugo/public/img/ImagesBasic/SVM_Tracking.png' -> 'www/img/ImagesBasic/SVM_Tracking.png'
'hugo/public/img/ImagesBasic/SVM_Tracking_2.png' -> 'www/img/ImagesBasic/SVM_Tracking_2.png'
'hugo/public/img/ImagesBasic/SearchVendor.png' -> 'www/img/ImagesBasic/SearchVendor.png'
'hugo/public/img/ImagesBasic/Search_Page.png' -> 'www/img/ImagesBasic/Search_Page.png'
'hugo/public/img/ImagesBasic/SignIn.png' -> 'www/img/ImagesBasic/SignIn.png'
'hugo/public/img/ImagesBasic/SortIcon.png' -> 'www/img/ImagesBasic/SortIcon.png'
'hugo/public/img/ImagesBasic/Source_code_1.png' -> 'www/img/ImagesBasic/Source_code_1.png'
'hugo/public/img/ImagesBasic/Source_code_2.png' -> 'www/img/ImagesBasic/Source_code_2.png'
'hugo/public/img/ImagesBasic/ViewComponent.png' -> 'www/img/ImagesBasic/ViewComponent.png'
'hugo/public/img/ImagesBasic/View_Clearing_Request_2.png' -> 'www/img/ImagesBasic/View_Clearing_Request_2.png'
'hugo/public/img/ImagesBasic/View_Clearing_request.png' -> 'www/img/ImagesBasic/View_Clearing_request.png'
'hugo/public/img/ImagesBasic/add_release.png' -> 'www/img/ImagesBasic/add_release.png'
'hugo/public/img/ImagesBasic/additionalroles1.png' -> 'www/img/ImagesBasic/additionalroles1.png'
'hugo/public/img/ImagesBasic/additionalroles2.png' -> 'www/img/ImagesBasic/additionalroles2.png'
'hugo/public/img/ImagesBasic/admin_menu.png' -> 'www/img/ImagesBasic/admin_menu.png'
'hugo/public/img/ImagesBasic/clearing_detail.png' -> 'www/img/ImagesBasic/clearing_detail.png'
'hugo/public/img/ImagesBasic/comp_pg2.png' -> 'www/img/ImagesBasic/comp_pg2.png'
'hugo/public/img/ImagesBasic/comp_view.png' -> 'www/img/ImagesBasic/comp_view.png'
'hugo/public/img/ImagesBasic/Componentpage' -> 'www/img/ImagesBasic/Componentpage'
'hugo/public/img/ImagesBasic/Componentpage/Assesment_Summary_Info.png' -> 'www/img/ImagesBasic/Componentpage/Assesment_Summary_Info.png'
'hugo/public/img/ImagesBasic/Componentpage/Changelog1.png' -> 'www/img/ImagesBasic/Componentpage/Changelog1.png'
'hugo/public/img/ImagesBasic/Componentpage/Changelog2.png' -> 'www/img/ImagesBasic/Componentpage/Changelog2.png'
'hugo/public/img/ImagesBasic/Componentpage/ComponentAdditionalroles.png' -> 'www/img/ImagesBasic/Componentpage/ComponentAdditionalroles.png'
'hugo/public/img/ImagesBasic/Componentpage/ComponentExternalIds.png' -> 'www/img/ImagesBasic/Componentpage/ComponentExternalIds.png'
'hugo/public/img/ImagesBasic/Componentpage/ComponentPage.png' -> 'www/img/ImagesBasic/Componentpage/ComponentPage.png'
'hugo/public/img/ImagesBasic/Componentpage/ComponentSPDXattachment.png' -> 'www/img/ImagesBasic/Componentpage/ComponentSPDXattachment.png'
'hugo/public/img/ImagesBasic/Componentpage/ComponentSPDXattachment2.png' -> 'www/img/ImagesBasic/Componentpage/ComponentSPDXattachment2.png'
'hugo/public/img/ImagesBasic/Componentpage/Component_Additional_Role2.png' -> 'www/img/ImagesBasic/Componentpage/Component_Additional_Role2.png'
'hugo/public/img/ImagesBasic/Componentpage/Component_Assesment_summary_info1.png' -> 'www/img/ImagesBasic/Componentpage/Component_Assesment_summary_info1.png'
'hugo/public/img/ImagesBasic/Componentpage/Component_Attachments.png' -> 'www/img/ImagesBasic/Componentpage/Component_Attachments.png'
'hugo/public/img/ImagesBasic/Componentpage/Component_ChangeLog.png' -> 'www/img/ImagesBasic/Componentpage/Component_ChangeLog.png'
'hugo/public/img/ImagesBasic/Componentpage/Component_General_Info.png' -> 'www/img/ImagesBasic/Componentpage/Component_General_Info.png'
'hugo/public/img/ImagesBasic/Componentpage/Component_Roles.png' -> 'www/img/ImagesBasic/Componentpage/Component_Roles.png'
'hugo/public/img/ImagesBasic/Componentpage/Component_SPDX_Attachments_1.png' -> 'www/img/ImagesBasic/Componentpage/Component_SPDX_Attachments_1.png'
'hugo/public/img/ImagesBasic/Componentpage/Component_SPDX_Attachments_2.png' -> 'www/img/ImagesBasic/Componentpage/Component_SPDX_Attachments_2.png'
'hugo/public/img/ImagesBasic/Componentpage/Component_Vulnerability.png' -> 'www/img/ImagesBasic/Componentpage/Component_Vulnerability.png'
'hugo/public/img/ImagesBasic/Componentpage/Component_release_vulnerability.png' -> 'www/img/ImagesBasic/Componentpage/Component_release_vulnerability.png'
'hugo/public/img/ImagesBasic/Componentpage/Componentadditionaldata.png' -> 'www/img/ImagesBasic/Componentpage/Componentadditionaldata.png'
'hugo/public/img/ImagesBasic/Componentpage/Componentreleases.png' -> 'www/img/ImagesBasic/Componentpage/Componentreleases.png'
'hugo/public/img/ImagesBasic/Componentpage/Componentreleasesummary.png' -> 'www/img/ImagesBasic/Componentpage/Componentreleasesummary.png'
'hugo/public/img/ImagesBasic/Componentpage/Create_Release1.png' -> 'www/img/ImagesBasic/Componentpage/Create_Release1.png'
'hugo/public/img/ImagesBasic/Componentpage/Create_Release2.png' -> 'www/img/ImagesBasic/Componentpage/Create_Release2.png'
'hugo/public/img/ImagesBasic/Componentpage/Create_Release3.png' -> 'www/img/ImagesBasic/Componentpage/Create_Release3.png'
'hugo/public/img/ImagesBasic/Componentpage/Editcomponent.png' -> 'www/img/ImagesBasic/Componentpage/Editcomponent.png'
'hugo/public/img/ImagesBasic/Componentpage/Merge_1.png' -> 'www/img/ImagesBasic/Componentpage/Merge_1.png'
'hugo/public/img/ImagesBasic/Componentpage/Merge_2.png' -> 'www/img/ImagesBasic/Componentpage/Merge_2.png'
'hugo/public/img/ImagesBasic/Componentpage/Merge_Icon_1.png' -> 'www/img/ImagesBasic/Componentpage/Merge_Icon_1.png'
'hugo/public/img/ImagesBasic/Componentpage/Merge_Icon_2.png' -> 'www/img/ImagesBasic/Componentpage/Merge_Icon_2.png'
'hugo/public/img/ImagesBasic/Componentpage/Merge_Icon_3.png' -> 'www/img/ImagesBasic/Componentpage/Merge_Icon_3.png'
'hugo/public/img/ImagesBasic/Componentpage/Release_Clearing_Details.png' -> 'www/img/ImagesBasic/Componentpage/Release_Clearing_Details.png'
'hugo/public/img/ImagesBasic/Componentpage/Release_Clearing_Details2.png' -> 'www/img/ImagesBasic/Componentpage/Release_Clearing_Details2.png'
'hugo/public/img/ImagesBasic/Componentpage/Release_Clearing_Details3.png' -> 'www/img/ImagesBasic/Componentpage/Release_Clearing_Details3.png'
'hugo/public/img/ImagesBasic/Componentpage/Release_ECC_Details.png' -> 'www/img/ImagesBasic/Componentpage/Release_ECC_Details.png'
'hugo/public/img/ImagesBasic/Componentpage/Releaserepository.png' -> 'www/img/ImagesBasic/Componentpage/Releaserepository.png'
'hugo/public/img/ImagesBasic/Componentpage/Split_1.png' -> 'www/img/ImagesBasic/Componentpage/Split_1.png'
'hugo/public/img/ImagesBasic/Componentpage/Split_2.png' -> 'www/img/ImagesBasic/Componentpage/Split_2.png'
'hugo/public/img/ImagesBasic/Componentpage/Split_Icon_1.png' -> 'www/img/ImagesBasic/Componentpage/Split_Icon_1.png'
'hugo/public/img/ImagesBasic/Componentpage/View_Component.png' -> 'www/img/ImagesBasic/Componentpage/View_Component.png'
'hugo/public/img/ImagesBasic/LicensePage' -> 'www/img/ImagesBasic/LicensePage'
'hugo/public/img/ImagesBasic/LicensePage/Checked.png' -> 'www/img/ImagesBasic/LicensePage/Checked.png'
'hugo/public/img/ImagesBasic/LicensePage/Create_License.png' -> 'www/img/ImagesBasic/LicensePage/Create_License.png'
'hugo/public/img/ImagesBasic/LicensePage/Edit_License.png' -> 'www/img/ImagesBasic/LicensePage/Edit_License.png'
'hugo/public/img/ImagesBasic/LicensePage/License_Page.png' -> 'www/img/ImagesBasic/LicensePage/License_Page.png'
'hugo/public/img/ImagesBasic/LicensePage/Linked_Obligations.png' -> 'www/img/ImagesBasic/LicensePage/Linked_Obligations.png'
'hugo/public/img/ImagesBasic/LicensePage/Linked_Obligations_2.png' -> 'www/img/ImagesBasic/LicensePage/Linked_Obligations_2.png'
'hugo/public/img/ImagesBasic/LicensePage/Unchecked.png' -> 'www/img/ImagesBasic/LicensePage/Unchecked.png'
'hugo/public/img/ImagesBasic/LicensePage/View_License.png' -> 'www/img/ImagesBasic/LicensePage/View_License.png'
'hugo/public/img/ImagesBasic/Preferences Page' -> 'www/img/ImagesBasic/Preferences Page'
'hugo/public/img/ImagesBasic/Preferences Page/Edit_email_preferences.png' -> 'www/img/ImagesBasic/Preferences Page/Edit_email_preferences.png'
'hugo/public/img/ImagesBasic/Preferences Page/Preferences_Page.png' -> 'www/img/ImagesBasic/Preferences Page/Preferences_Page.png'
'hugo/public/img/ImagesBasic/Preferences Page/REST_API_TOKENS.png' -> 'www/img/ImagesBasic/Preferences Page/REST_API_TOKENS.png'
'hugo/public/img/ImagesBasic/Project_Page' -> 'www/img/ImagesBasic/Project_Page'
'hugo/public/img/ImagesBasic/Project_Page/Additional_data_1.png' -> 'www/img/ImagesBasic/Project_Page/Additional_data_1.png'
'hugo/public/img/ImagesBasic/Project_Page/Additional_data_2.png' -> 'www/img/ImagesBasic/Project_Page/Additional_data_2.png'
'hugo/public/img/ImagesBasic/Project_Page/Addproject4.png' -> 'www/img/ImagesBasic/Project_Page/Addproject4.png'
'hugo/public/img/ImagesBasic/Project_Page/Addproject_5.png' -> 'www/img/ImagesBasic/Project_Page/Addproject_5.png'
'hugo/public/img/ImagesBasic/Project_Page/Attachment_2.png' -> 'www/img/ImagesBasic/Project_Page/Attachment_2.png'
'hugo/public/img/ImagesBasic/Project_Page/ClearingRequest.png' -> 'www/img/ImagesBasic/Project_Page/ClearingRequest.png'
'hugo/public/img/ImagesBasic/Project_Page/Clearing_Information.png' -> 'www/img/ImagesBasic/Project_Page/Clearing_Information.png'
'hugo/public/img/ImagesBasic/Project_Page/Copy_Duplicate.png' -> 'www/img/ImagesBasic/Project_Page/Copy_Duplicate.png'
'hugo/public/img/ImagesBasic/Project_Page/Create_clearing_request.png' -> 'www/img/ImagesBasic/Project_Page/Create_clearing_request.png'
'hugo/public/img/ImagesBasic/Project_Page/Delete_Trash.png' -> 'www/img/ImagesBasic/Project_Page/Delete_Trash.png'
'hugo/public/img/ImagesBasic/Project_Page/Deleteproject1.png' -> 'www/img/ImagesBasic/Project_Page/Deleteproject1.png'
'hugo/public/img/ImagesBasic/Project_Page/EditProject_Attachments.png' -> 'www/img/ImagesBasic/Project_Page/EditProject_Attachments.png'
'hugo/public/img/ImagesBasic/Project_Page/Edit_Pen.png' -> 'www/img/ImagesBasic/Project_Page/Edit_Pen.png'
'hugo/public/img/ImagesBasic/Project_Page/Export_spreadsheet.png' -> 'www/img/ImagesBasic/Project_Page/Export_spreadsheet.png'
'hugo/public/img/ImagesBasic/Project_Page/Generate_license_info.png' -> 'www/img/ImagesBasic/Project_Page/Generate_license_info.png'
'hugo/public/img/ImagesBasic/Project_Page/Generate_license_info_2 .png' -> 'www/img/ImagesBasic/Project_Page/Generate_license_info_2 .png'
'hugo/public/img/ImagesBasic/Project_Page/Generate_license_info_3.png' -> 'www/img/ImagesBasic/Project_Page/Generate_license_info_3.png'
'hugo/public/img/ImagesBasic/Project_Page/ImportSBOM.png' -> 'www/img/ImagesBasic/Project_Page/ImportSBOM.png'
'hugo/public/img/ImagesBasic/Project_Page/LicenseClearing_1.png' -> 'www/img/ImagesBasic/Project_Page/LicenseClearing_1.png'
'hugo/public/img/ImagesBasic/Project_Page/License_Clearing_request.png' -> 'www/img/ImagesBasic/Project_Page/License_Clearing_request.png'
'hugo/public/img/ImagesBasic/Project_Page/Link_release_1.png' -> 'www/img/ImagesBasic/Project_Page/Link_release_1.png'
'hugo/public/img/ImagesBasic/Project_Page/Link_release_2.png' -> 'www/img/ImagesBasic/Project_Page/Link_release_2.png'
'hugo/public/img/ImagesBasic/Project_Page/Link_release_3.png' -> 'www/img/ImagesBasic/Project_Page/Link_release_3.png'
'hugo/public/img/ImagesBasic/Project_Page/Linked-projects_1.png' -> 'www/img/ImagesBasic/Project_Page/Linked-projects_1.png'
'hugo/public/img/ImagesBasic/Project_Page/Linked-projects_2.png' -> 'www/img/ImagesBasic/Project_Page/Linked-projects_2.png'
'hugo/public/img/ImagesBasic/Project_Page/Linked-projects_3.png' -> 'www/img/ImagesBasic/Project_Page/Linked-projects_3.png'
'hugo/public/img/ImagesBasic/Project_Page/Linking_project.png' -> 'www/img/ImagesBasic/Project_Page/Linking_project.png'
'hugo/public/img/ImagesBasic/Project_Page/ProjectAdministration.png' -> 'www/img/ImagesBasic/Project_Page/ProjectAdministration.png'
'hugo/public/img/ImagesBasic/Project_Page/ProjectExternalURL1.png' -> 'www/img/ImagesBasic/Project_Page/ProjectExternalURL1.png'
'hugo/public/img/ImagesBasic/Project_Page/ProjectExternalURL2.png' -> 'www/img/ImagesBasic/Project_Page/ProjectExternalURL2.png'
'hugo/public/img/ImagesBasic/Project_Page/ProjectGeneralInfo (1).png' -> 'www/img/ImagesBasic/Project_Page/ProjectGeneralInfo (1).png'
'hugo/public/img/ImagesBasic/Project_Page/ProjectLifecycle.png' -> 'www/img/ImagesBasic/Project_Page/ProjectLifecycle.png'
'hugo/public/img/ImagesBasic/Project_Page/ProjectLinkedreleasesandprojects.png' -> 'www/img/ImagesBasic/Project_Page/ProjectLinkedreleasesandprojects.png'
'hugo/public/img/ImagesBasic/Project_Page/ProjectRoles.png' -> 'www/img/ImagesBasic/Project_Page/ProjectRoles.png'
'hugo/public/img/ImagesBasic/Project_Page/Project_external_ID_1.png' -> 'www/img/ImagesBasic/Project_Page/Project_external_ID_1.png'
'hugo/public/img/ImagesBasic/Project_Page/Project_external_ID_2.png' -> 'www/img/ImagesBasic/Project_Page/Project_external_ID_2.png'
'hugo/public/img/ImagesBasic/Project_Page/Projectpage.png' -> 'www/img/ImagesBasic/Project_Page/Projectpage.png'
'hugo/public/img/ImagesBasic/Project_Page/SVM_Tracking.png' -> 'www/img/ImagesBasic/Project_Page/SVM_Tracking.png'
'hugo/public/img/ImagesBasic/Project_Page/SVM_Tracking_2.png' -> 'www/img/ImagesBasic/Project_Page/SVM_Tracking_2.png'
'hugo/public/img/ImagesBasic/Project_Page/SortIcon.png' -> 'www/img/ImagesBasic/Project_Page/SortIcon.png'
'hugo/public/img/ImagesBasic/Project_Page/Source_code_1.png' -> 'www/img/ImagesBasic/Project_Page/Source_code_1.png'
'hugo/public/img/ImagesBasic/Project_Page/Source_code_2.png' -> 'www/img/ImagesBasic/Project_Page/Source_code_2.png'
'hugo/public/img/ImagesBasic/Project_Page/View_Clearing_Request_2.png' -> 'www/img/ImagesBasic/Project_Page/View_Clearing_Request_2.png'
'hugo/public/img/ImagesBasic/Project_Page/View_Clearing_request.png' -> 'www/img/ImagesBasic/Project_Page/View_Clearing_request.png'
'hugo/public/img/ImagesBasic/Project_Page/additionalroles1.png' -> 'www/img/ImagesBasic/Project_Page/additionalroles1.png'
'hugo/public/img/ImagesBasic/Project_Page/additionalroles2.png' -> 'www/img/ImagesBasic/Project_Page/additionalroles2.png'
'hugo/public/img/ImagesBasic/Request_Page' -> 'www/img/ImagesBasic/Request_Page'
'hugo/public/img/ImagesBasic/Request_Page/Clearing_Requests.png' -> 'www/img/ImagesBasic/Request_Page/Clearing_Requests.png'
'hugo/public/img/ImagesBasic/Request_Page/Edit_clearing_request_1.png' -> 'www/img/ImagesBasic/Request_Page/Edit_clearing_request_1.png'
'hugo/public/img/ImagesBasic/Request_Page/Edit_clearing_request_2.png' -> 'www/img/ImagesBasic/Request_Page/Edit_clearing_request_2.png'
'hugo/public/img/ImagesBasic/Request_Page/Edit_clearing_request_3.png' -> 'www/img/ImagesBasic/Request_Page/Edit_clearing_request_3.png'
'hugo/public/img/ImagesBasic/Request_Page/Edit_moderation_request.png' -> 'www/img/ImagesBasic/Request_Page/Edit_moderation_request.png'
'hugo/public/img/ImagesBasic/Request_Page/Edit_moderation_request_2.png' -> 'www/img/ImagesBasic/Request_Page/Edit_moderation_request_2.png'
'hugo/public/img/ImagesBasic/Request_Page/Edit_moderation_request_3.png' -> 'www/img/ImagesBasic/Request_Page/Edit_moderation_request_3.png'
'hugo/public/img/ImagesBasic/Request_Page/Moderation_Requests.png' -> 'www/img/ImagesBasic/Request_Page/Moderation_Requests.png'
'hugo/public/img/ImagesBasic/Request_Page/Request_Page.png' -> 'www/img/ImagesBasic/Request_Page/Request_Page.png'
'hugo/public/img/ImagesBasic/VulnerabiblitiesPage' -> 'www/img/ImagesBasic/VulnerabiblitiesPage'
'hugo/public/img/ImagesBasic/VulnerabiblitiesPage/Vulnerabilities_Page.png' -> 'www/img/ImagesBasic/VulnerabiblitiesPage/Vulnerabilities_Page.png'
'hugo/public/img/ImagesBasic/VulnerabiblitiesPage/Vulnerability_References.png' -> 'www/img/ImagesBasic/VulnerabiblitiesPage/Vulnerability_References.png'
'hugo/public/img/ImagesBasic/VulnerabiblitiesPage/Vulnerability_Summary.png' -> 'www/img/ImagesBasic/VulnerabiblitiesPage/Vulnerability_Summary.png'
'hugo/public/img/SW360RESTfulAPIImages' -> 'www/img/SW360RESTfulAPIImages'
'hugo/public/img/SW360RESTfulAPIImages/Preferences-AccessToke.png' -> 'www/img/SW360RESTfulAPIImages/Preferences-AccessToke.png'
'hugo/public/img/SW360RESTfulAPIImages/Preferences-AccessToke1.png' -> 'www/img/SW360RESTfulAPIImages/Preferences-AccessToke1.png'
'hugo/public/img/SW360RESTfulAPIImages/techtokenreadexample.png' -> 'www/img/SW360RESTfulAPIImages/techtokenreadexample.png'
'hugo/public/img/SW360RESTfulAPIImages/techtokenreadwriteexample.png' -> 'www/img/SW360RESTfulAPIImages/techtokenreadwriteexample.png'
'hugo/public/img/banners' -> 'www/img/banners'
'hugo/public/img/banners/banner-1.jpg' -> 'www/img/banners/banner-1.jpg'
'hugo/public/img/carousel' -> 'www/img/carousel'
'hugo/public/img/carousel/sw360-slide-01.jpg' -> 'www/img/carousel/sw360-slide-01.jpg'
'hugo/public/img/carousel/sw360-slide-02.jpg' -> 'www/img/carousel/sw360-slide-02.jpg'
'hugo/public/img/carousel/sw360-slide-03.jpg' -> 'www/img/carousel/sw360-slide-03.jpg'
'hugo/public/img/clients' -> 'www/img/clients'
'hugo/public/img/clients/BoschSI.png' -> 'www/img/clients/BoschSI.png'
'hugo/public/img/clients/Cariad.png' -> 'www/img/clients/Cariad.png'
'hugo/public/img/clients/Eclipse.png' -> 'www/img/clients/Eclipse.png'
'hugo/public/img/clients/Siemens.png' -> 'www/img/clients/Siemens.png'
'hugo/public/img/clients/Toshiba.png' -> 'www/img/clients/Toshiba.png'
'hugo/public/img/clients/Verifa.png' -> 'www/img/clients/Verifa.png'
'hugo/public/img/couchdb' -> 'www/img/couchdb'
'hugo/public/img/couchdb/ConfigDomainCouchdb.jpg' -> 'www/img/couchdb/ConfigDomainCouchdb.jpg'
'hugo/public/img/couchdb/ConfigIPCouchdb.jpg' -> 'www/img/couchdb/ConfigIPCouchdb.jpg'
'hugo/public/img/couchdb/ConfigTypeCouchdb.jpg' -> 'www/img/couchdb/ConfigTypeCouchdb.jpg'
'hugo/public/img/couchdb/RepeatPassword.jpg' -> 'www/img/couchdb/RepeatPassword.jpg'
'hugo/public/img/couchdb/SetupMagicCookie.jpg' -> 'www/img/couchdb/SetupMagicCookie.jpg'
'hugo/public/img/couchdb/SetupPassword.jpg' -> 'www/img/couchdb/SetupPassword.jpg'
'hugo/public/img/couchdb/StatusStartCouchdb.jpg' -> 'www/img/couchdb/StatusStartCouchdb.jpg'
'hugo/public/img/couchdb/StatusStopCouchdb.jpg' -> 'www/img/couchdb/StatusStopCouchdb.jpg'
'hugo/public/img/logos' -> 'www/img/logos'
'hugo/public/img/logos/logo_full.svg' -> 'www/img/logos/logo_full.svg'
'hugo/public/img/sw360screenshots' -> 'www/img/sw360screenshots'
'hugo/public/img/sw360screenshots/ReIndexSearch.png' -> 'www/img/sw360screenshots/ReIndexSearch.png'
'hugo/public/img/sw360screenshots/sw360screenshot-components01.png' -> 'www/img/sw360screenshots/sw360screenshot-components01.png'
'hugo/public/img/sw360screenshots/sw360screenshot-components02.png' -> 'www/img/sw360screenshots/sw360screenshot-components02.png'
'hugo/public/img/sw360screenshots/sw360screenshot-components03.png' -> 'www/img/sw360screenshots/sw360screenshot-components03.png'
'hugo/public/img/sw360screenshots/sw360screenshot-components04.png' -> 'www/img/sw360screenshots/sw360screenshot-components04.png'
'hugo/public/img/sw360screenshots/sw360screenshot-ecc.png' -> 'www/img/sw360screenshots/sw360screenshot-ecc.png'
'hugo/public/img/sw360screenshots/sw360screenshot-home.png' -> 'www/img/sw360screenshots/sw360screenshot-home.png'
'hugo/public/img/sw360screenshots/sw360screenshot-preferences01.png' -> 'www/img/sw360screenshots/sw360screenshot-preferences01.png'
'hugo/public/img/sw360screenshots/sw360screenshot-preferences02.png' -> 'www/img/sw360screenshots/sw360screenshot-preferences02.png'
'hugo/public/img/sw360screenshots/sw360screenshot-projectlist.png' -> 'www/img/sw360screenshots/sw360screenshot-projectlist.png'
'hugo/public/img/sw360screenshots/sw360screenshot-projects01.png' -> 'www/img/sw360screenshots/sw360screenshot-projects01.png'
'hugo/public/img/sw360screenshots/sw360screenshot-projects02.png' -> 'www/img/sw360screenshots/sw360screenshot-projects02.png'
'hugo/public/img/sw360screenshots/sw360screenshot-projects03.png' -> 'www/img/sw360screenshots/sw360screenshot-projects03.png'
'hugo/public/img/sw360screenshots/sw360screenshot-projects04.png' -> 'www/img/sw360screenshots/sw360screenshot-projects04.png'
'hugo/public/img/sw360screenshots/sw360screenshot-search.png' -> 'www/img/sw360screenshots/sw360screenshot-search.png'
'hugo/public/img/sw360screenshots/dependency_network' -> 'www/img/sw360screenshots/dependency_network'
'hugo/public/img/sw360screenshots/dependency_network/Add_root_release_button.png' -> 'www/img/sw360screenshots/dependency_network/Add_root_release_button.png'
'hugo/public/img/sw360screenshots/dependency_network/Add_transitive_releases_buttons.png' -> 'www/img/sw360screenshots/dependency_network/Add_transitive_releases_buttons.png'
'hugo/public/img/sw360screenshots/dependency_network/Check_diff_button.png' -> 'www/img/sw360screenshots/dependency_network/Check_diff_button.png'
'hugo/public/img/sw360screenshots/dependency_network/Load_default_network_from_releases.png' -> 'www/img/sw360screenshots/dependency_network/Load_default_network_from_releases.png'
'hugo/public/img/sw360screenshots/dependency_network/Select_version_box.png' -> 'www/img/sw360screenshots/dependency_network/Select_version_box.png'
'hugo/public/img/sw360screenshots/dependency_network/new_edit_GUI.png' -> 'www/img/sw360screenshots/dependency_network/new_edit_GUI.png'
'hugo/public/img/sw360screenshots/deploy73' -> 'www/img/sw360screenshots/deploy73'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.09.53.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.09.53.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.09.59.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.09.59.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.10.17.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.10.17.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.10.30.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.10.30.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.10.50.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.10.50.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.11.20.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.11.20.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.11.25.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.11.25.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.23.15.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.23.15.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.23.26.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.23.26.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.23.37.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.23.37.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.23.48.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.23.48.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.23.53.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.23.53.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.24.01.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.24.01.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.24.18.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.24.18.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.24.21.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.24.21.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.24.31.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.24.31.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.24.48.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.24.48.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.24.53.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.24.53.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.24.58.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.24.58.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.25.07.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.25.07.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.27.08.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.27.08.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.27.13.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.27.13.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.27.32.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.27.32.png'
'hugo/public/img/sw360screenshots/deploy73/2021-06-20_21.40.27.png' -> 'www/img/sw360screenshots/deploy73/2021-06-20_21.40.27.png'
'hugo/public/img/sw360screenshots/deploy73/2021-06-20_21.41.14.png' -> 'www/img/sw360screenshots/deploy73/2021-06-20_21.41.14.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.38.53.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.38.53.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.39.06.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.39.06.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.39.14.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.39.14.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.39.56.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.39.56.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.43.32.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.43.32.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.46.49.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.46.49.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.47.03.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.47.03.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.49.41.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.49.41.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.51.10.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.51.10.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.51.21.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.51.21.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.52.14.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.52.14.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.52.23.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.52.23.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.52.36.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.52.36.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.52.58.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.52.58.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.53.01.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.53.01.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.53.04.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.53.04.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.54.14.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.54.14.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.54.38.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.54.38.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.54.55.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.54.55.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.55.00.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.55.00.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.55.12.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.55.12.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.55.38.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.55.38.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.55.59.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.55.59.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.56.06.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.56.06.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.56.16.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.56.16.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.56.33.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.56.33.png'
'hugo/public/img/sw360screenshots/deploy73/2020-01-24_14.57.08.png' -> 'www/img/sw360screenshots/deploy73/2020-01-24_14.57.08.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.07.32.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.07.32.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.09.12.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.09.12.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.09.26.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.09.26.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.09.33.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.09.33.png'
'hugo/public/img/sw360screenshots/deploy73/2020-08-13_20.09.41.png' -> 'www/img/sw360screenshots/deploy73/2020-08-13_20.09.41.png'
'hugo/public/img/sw360screenshots/deploy74' -> 'www/img/sw360screenshots/deploy74'
'hugo/public/img/sw360screenshots/deploy74/1.png' -> 'www/img/sw360screenshots/deploy74/1.png'
'hugo/public/img/sw360screenshots/deploy74/10.png' -> 'www/img/sw360screenshots/deploy74/10.png'
'hugo/public/img/sw360screenshots/deploy74/11.png' -> 'www/img/sw360screenshots/deploy74/11.png'
'hugo/public/img/sw360screenshots/deploy74/12.png' -> 'www/img/sw360screenshots/deploy74/12.png'
'hugo/public/img/sw360screenshots/deploy74/13.png' -> 'www/img/sw360screenshots/deploy74/13.png'
'hugo/public/img/sw360screenshots/deploy74/14.png' -> 'www/img/sw360screenshots/deploy74/14.png'
'hugo/public/img/sw360screenshots/deploy74/15.png' -> 'www/img/sw360screenshots/deploy74/15.png'
'hugo/public/img/sw360screenshots/deploy74/16.png' -> 'www/img/sw360screenshots/deploy74/16.png'
'hugo/public/img/sw360screenshots/deploy74/17.png' -> 'www/img/sw360screenshots/deploy74/17.png'
'hugo/public/img/sw360screenshots/deploy74/18.png' -> 'www/img/sw360screenshots/deploy74/18.png'
'hugo/public/img/sw360screenshots/deploy74/19.png' -> 'www/img/sw360screenshots/deploy74/19.png'
'hugo/public/img/sw360screenshots/deploy74/2.png' -> 'www/img/sw360screenshots/deploy74/2.png'
'hugo/public/img/sw360screenshots/deploy74/20.png' -> 'www/img/sw360screenshots/deploy74/20.png'
'hugo/public/img/sw360screenshots/deploy74/21.png' -> 'www/img/sw360screenshots/deploy74/21.png'
'hugo/public/img/sw360screenshots/deploy74/22.png' -> 'www/img/sw360screenshots/deploy74/22.png'
'hugo/public/img/sw360screenshots/deploy74/23.png' -> 'www/img/sw360screenshots/deploy74/23.png'
'hugo/public/img/sw360screenshots/deploy74/24.png' -> 'www/img/sw360screenshots/deploy74/24.png'
'hugo/public/img/sw360screenshots/deploy74/25.png' -> 'www/img/sw360screenshots/deploy74/25.png'
'hugo/public/img/sw360screenshots/deploy74/26.png' -> 'www/img/sw360screenshots/deploy74/26.png'
'hugo/public/img/sw360screenshots/deploy74/3.png' -> 'www/img/sw360screenshots/deploy74/3.png'
'hugo/public/img/sw360screenshots/deploy74/4.png' -> 'www/img/sw360screenshots/deploy74/4.png'
'hugo/public/img/sw360screenshots/deploy74/5.png' -> 'www/img/sw360screenshots/deploy74/5.png'
'hugo/public/img/sw360screenshots/deploy74/6.png' -> 'www/img/sw360screenshots/deploy74/6.png'
'hugo/public/img/sw360screenshots/deploy74/7.png' -> 'www/img/sw360screenshots/deploy74/7.png'
'hugo/public/img/sw360screenshots/deploy74/8.png' -> 'www/img/sw360screenshots/deploy74/8.png'
'hugo/public/img/sw360screenshots/deploy74/9.png' -> 'www/img/sw360screenshots/deploy74/9.png'
'hugo/public/img/sw360screenshots/spdx_document' -> 'www/img/sw360screenshots/spdx_document'
'hugo/public/img/sw360screenshots/spdx_document/Add_tab_SPDX_Document.png' -> 'www/img/sw360screenshots/spdx_document/Add_tab_SPDX_Document.png'
'hugo/public/img/sw360screenshots/spdx_document/Edit_tab_SPDX_Document_Full_Page.png' -> 'www/img/sw360screenshots/spdx_document/Edit_tab_SPDX_Document_Full_Page.png'
'hugo/public/img/sw360screenshots/spdx_document/Edit_tab_SPDX_Document_Lite_Page.png' -> 'www/img/sw360screenshots/spdx_document/Edit_tab_SPDX_Document_Lite_Page.png'
'hugo/public/img/sw360screenshots/spdx_document/Full_Page_of_Release_Glibc.png' -> 'www/img/sw360screenshots/spdx_document/Full_Page_of_Release_Glibc.png'
'hugo/public/img/sw360screenshots/spdx_document/Full_Page_of_Release_Jena_(3.12.0).png' -> 'www/img/sw360screenshots/spdx_document/Full_Page_of_Release_Jena_(3.12.0).png'
'hugo/public/img/sw360screenshots/spdx_document/Full_Page_of_Release_Saxon_(8.8).png' -> 'www/img/sw360screenshots/spdx_document/Full_Page_of_Release_Saxon_(8.8).png'
'hugo/public/img/sw360screenshots/spdx_document/Lite_Page_of_Release_Glibc(2.11.1).png' -> 'www/img/sw360screenshots/spdx_document/Lite_Page_of_Release_Glibc(2.11.1).png'
'hugo/public/img/sw360screenshots/spdx_document/Lite_Page_of_Release_Jena_(3.12.0).png' -> 'www/img/sw360screenshots/spdx_document/Lite_Page_of_Release_Jena_(3.12.0).png'
'hugo/public/img/sw360screenshots/spdx_document/Lite_Page_of_Release_Saxon_(8.8).png' -> 'www/img/sw360screenshots/spdx_document/Lite_Page_of_Release_Saxon_(8.8).png'
'hugo/public/img/workflow' -> 'www/img/workflow'
'hugo/public/img/workflow/workflow-add-project.png' -> 'www/img/workflow/workflow-add-project.png'
'hugo/public/img/workflow/workflow-clearing.png' -> 'www/img/workflow/workflow-clearing.png'
'hugo/public/img/workflow/workflow-moderation.png' -> 'www/img/workflow/workflow-moderation.png'
'hugo/public/img/workflow/worklfow-adding-component-and-release-to-a-project.png' -> 'www/img/workflow/worklfow-adding-component-and-release-to-a-project.png'
'hugo/public/index.html' -> 'www/index.html'
'hugo/public/index.xml' -> 'www/index.xml'
'hugo/public/js' -> 'www/js'
'hugo/public/js/deflate.js' -> 'www/js/deflate.js'
'hugo/public/js/prism.js' -> 'www/js/prism.js'
'hugo/public/js/swagger-ui-bundle.js' -> 'www/js/swagger-ui-bundle.js'
'hugo/public/js/swagger-ui-standalone-preset.js' -> 'www/js/swagger-ui-standalone-preset.js'
'hugo/public/js/tabpane-persist.js' -> 'www/js/tabpane-persist.js'
'hugo/public/js/main.js' -> 'www/js/main.js'
'hugo/public/presentations' -> 'www/presentations'
'hugo/public/presentations/index.html' -> 'www/presentations/index.html'
'hugo/public/presentations/index.xml' -> 'www/presentations/index.xml'
'hugo/public/robots.txt' -> 'www/robots.txt'
'hugo/public/screenshots' -> 'www/screenshots'
'hugo/public/screenshots/index.html' -> 'www/screenshots/index.html'
'hugo/public/scss' -> 'www/scss'
'hugo/public/scss/main.css.map' -> 'www/scss/main.css.map'
'hugo/public/scss/main.css' -> 'www/scss/main.css'
'hugo/public/sitemap.xml' -> 'www/sitemap.xml'
'hugo/public/webfonts' -> 'www/webfonts'
'hugo/public/webfonts/fa-brands-400.eot' -> 'www/webfonts/fa-brands-400.eot'
'hugo/public/webfonts/fa-brands-400.svg' -> 'www/webfonts/fa-brands-400.svg'
'hugo/public/webfonts/fa-brands-400.ttf' -> 'www/webfonts/fa-brands-400.ttf'
'hugo/public/webfonts/fa-brands-400.woff' -> 'www/webfonts/fa-brands-400.woff'
'hugo/public/webfonts/fa-brands-400.woff2' -> 'www/webfonts/fa-brands-400.woff2'
'hugo/public/webfonts/fa-regular-400.eot' -> 'www/webfonts/fa-regular-400.eot'
'hugo/public/webfonts/fa-regular-400.svg' -> 'www/webfonts/fa-regular-400.svg'
'hugo/public/webfonts/fa-regular-400.ttf' -> 'www/webfonts/fa-regular-400.ttf'
'hugo/public/webfonts/fa-regular-400.woff' -> 'www/webfonts/fa-regular-400.woff'
'hugo/public/webfonts/fa-regular-400.woff2' -> 'www/webfonts/fa-regular-400.woff2'
'hugo/public/webfonts/fa-solid-900.eot' -> 'www/webfonts/fa-solid-900.eot'
'hugo/public/webfonts/fa-solid-900.svg' -> 'www/webfonts/fa-solid-900.svg'
'hugo/public/webfonts/fa-solid-900.ttf' -> 'www/webfonts/fa-solid-900.ttf'
'hugo/public/webfonts/fa-solid-900.woff' -> 'www/webfonts/fa-solid-900.woff'
'hugo/public/webfonts/fa-solid-900.woff2' -> 'www/webfonts/fa-solid-900.woff2'
[Pipeline] dir
Running in /home/jenkins/agent/workspace/sw360.website/www
[Pipeline] {
[Pipeline] sshagent
[ssh-agent] Using credentials sw360-bot (GitHub bot (SSH))
[ssh-agent] Looking for ssh-agent implementation...
[ssh-agent]   Exec ssh-agent (binary ssh-agent on a remote machine)
$ ssh-agent
SSH_AUTH_SOCK=/tmp/ssh-wmLAEC6hayxd/agent.187
SSH_AGENT_PID=189
Running ssh-add (command line suppressed)
Identity added: /home/jenkins/agent/workspace/sw360.website/www@tmp/private_key_1090704161004579768.key (sw360-bot@eclipse.org)
[ssh-agent] Started.
[Pipeline] {
[Pipeline] sh
+ git add -A
+ git diff --cached --exit-code
diff --git a/404.html b/404.html
index c6d3d2f..7d76970 100644
--- a/404.html
+++ b/404.html
@@ -175,24 +175,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/about/index.html b/about/index.html
index 7d90e7b..07f5cfb 100644
--- a/about/index.html
+++ b/about/index.html
@@ -255,24 +255,24 @@ Verifying various aspects of compliance when using third-party software componen
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/administrationguide/index.html b/docs/administrationguide/index.html
index 1cedbff..6a03417 100644
--- a/docs/administrationguide/index.html
+++ b/docs/administrationguide/index.html
@@ -298,6 +298,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -305,7 +309,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -317,29 +336,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -358,10 +358,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -374,6 +370,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -684,24 +684,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/administrationguide/menu/index.html b/docs/administrationguide/menu/index.html
index 60e990e..7870e8e 100644
--- a/docs/administrationguide/menu/index.html
+++ b/docs/administrationguide/menu/index.html
@@ -322,6 +322,10 @@ Licenses: Functions such as Download License Archive, Upload License Archive, Im
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -329,7 +333,22 @@ Licenses: Functions such as Download License Archive, Upload License Archive, Im
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -341,29 +360,10 @@ Licenses: Functions such as Download License Archive, Upload License Archive, Im
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -382,10 +382,6 @@ Licenses: Functions such as Download License Archive, Upload License Archive, Im
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -398,6 +394,10 @@ Licenses: Functions such as Download License Archive, Upload License Archive, Im
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -687,24 +687,24 @@ Licenses: Functions such as Download License Archive, Upload License Archive, Im
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/administrationguide/properties/index.html b/docs/administrationguide/properties/index.html
index a21a9f4..1af46b6 100644
--- a/docs/administrationguide/properties/index.html
+++ b/docs/administrationguide/properties/index.html
@@ -328,6 +328,10 @@ Backend Properties: This, sw360.properties file contains the sw360 backend prope
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -335,7 +339,22 @@ Backend Properties: This, sw360.properties file contains the sw360 backend prope
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -347,29 +366,10 @@ Backend Properties: This, sw360.properties file contains the sw360 backend prope
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -388,10 +388,6 @@ Backend Properties: This, sw360.properties file contains the sw360 backend prope
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -404,6 +400,10 @@ Backend Properties: This, sw360.properties file contains the sw360 backend prope
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -677,24 +677,24 @@ For example;
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/administrationguide/user-data-model-enumerations/index.html b/docs/administrationguide/user-data-model-enumerations/index.html
index 9eaac95..4ed9d49 100644
--- a/docs/administrationguide/user-data-model-enumerations/index.html
+++ b/docs/administrationguide/user-data-model-enumerations/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -1255,24 +1255,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/administrationguide/user-management-roles/index.html b/docs/administrationguide/user-management-roles/index.html
index eb21f78..2445f05 100644
--- a/docs/administrationguide/user-management-roles/index.html
+++ b/docs/administrationguide/user-management-roles/index.html
@@ -305,6 +305,10 @@ The creator of the record The moderators for a record The clearing admins of the
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -312,7 +316,22 @@ The creator of the record The moderators for a record The clearing admins of the
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -324,29 +343,10 @@ The creator of the record The moderators for a record The clearing admins of the
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -365,10 +365,6 @@ The creator of the record The moderators for a record The clearing admins of the
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -381,6 +377,10 @@ The creator of the record The moderators for a record The clearing admins of the
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -659,24 +659,24 @@ The creator of the record The moderators for a record The clearing admins of the
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/administrationguide/user-scheduling-cve-search-by-admins/index.html b/docs/administrationguide/user-scheduling-cve-search-by-admins/index.html
index ea509c1..a9057ae 100644
--- a/docs/administrationguide/user-scheduling-cve-search-by-admins/index.html
+++ b/docs/administrationguide/user-scheduling-cve-search-by-admins/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -653,24 +653,24 @@ The accompanying project sw360-chores contains a Dockerfile that can easily setu
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/administrationguide/vulnerabilitymanagement/index.html b/docs/administrationguide/vulnerabilitymanagement/index.html
index db5e865..a874485 100644
--- a/docs/administrationguide/vulnerabilitymanagement/index.html
+++ b/docs/administrationguide/vulnerabilitymanagement/index.html
@@ -298,6 +298,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -305,7 +309,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -317,29 +336,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -358,10 +358,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -374,6 +370,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -766,24 +766,24 @@ cvesearch.default.cutoff=6
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/administrationguide/vulnerabilitymanagement/user-check-vulnerabilities-for-your-project/index.html b/docs/administrationguide/vulnerabilitymanagement/user-check-vulnerabilities-for-your-project/index.html
index 868e2ed..c6a344b 100644
--- a/docs/administrationguide/vulnerabilitymanagement/user-check-vulnerabilities-for-your-project/index.html
+++ b/docs/administrationguide/vulnerabilitymanagement/user-check-vulnerabilities-for-your-project/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -673,24 +673,24 @@ Vulnerabilities that have been classified as <code>INCORRECT</code> by an <code>
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/administrationguide/vulnerabilitymanagement/vulnerabilities/index.html b/docs/administrationguide/vulnerabilitymanagement/vulnerabilities/index.html
index 7a8d455..c1da067 100644
--- a/docs/administrationguide/vulnerabilitymanagement/vulnerabilities/index.html
+++ b/docs/administrationguide/vulnerabilitymanagement/vulnerabilities/index.html
@@ -309,6 +309,10 @@ Sl.No. Description 1 Quick Filter 2 Advanced Filter 3 Vulnerabilities List 5."/>
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -316,7 +320,22 @@ Sl.No. Description 1 Quick Filter 2 Advanced Filter 3 Vulnerabilities List 5."/>
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -328,29 +347,10 @@ Sl.No. Description 1 Quick Filter 2 Advanced Filter 3 Vulnerabilities List 5."/>
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -369,10 +369,6 @@ Sl.No. Description 1 Quick Filter 2 Advanced Filter 3 Vulnerabilities List 5."/>
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -385,6 +381,10 @@ Sl.No. Description 1 Quick Filter 2 Advanced Filter 3 Vulnerabilities List 5."/>
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -738,24 +738,24 @@ This page lists all referenced websites.</p>
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/baremetal/deploy-natively/index.html b/docs/deployment/baremetal/deploy-natively/index.html
index 5bf5c1e..cca4873 100644
--- a/docs/deployment/baremetal/deploy-natively/index.html
+++ b/docs/deployment/baremetal/deploy-natively/index.html
@@ -25,11 +25,11 @@
 <meta property="og:type" content="article" />
 <meta property="og:url" content="https://www.eclipse.org/sw360/docs/deployment/baremetal/deploy-natively/" /><meta property="article:section" content="docs" />
 
-<meta property="article:modified_time" content="2022-11-24T16:37:26+01:00" /><meta property="og:site_name" content="Eclipse SW360" />
+<meta property="article:modified_time" content="2024-04-09T18:22:28+02:00" /><meta property="og:site_name" content="Eclipse SW360" />
 <meta itemprop="name" content="Ubuntu 22.04 / Debian 11">
 <meta itemprop="description" content="Bare metal deployment with Debian based Linux">
-<meta itemprop="dateModified" content="2022-11-24T16:37:26+01:00" />
-<meta itemprop="wordCount" content="657">
+<meta itemprop="dateModified" content="2024-04-09T18:22:28+02:00" />
+<meta itemprop="wordCount" content="655">
 <meta itemprop="keywords" content="" /><meta name="twitter:card" content="summary"/>
 <meta name="twitter:title" content="Ubuntu 22.04 / Debian 11"/>
 <meta name="twitter:description" content="Bare metal deployment with Debian based Linux"/>
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -599,10 +599,9 @@
 <p>The installation consists of quite some tasks, as an overview:</p>
 <ul>
 <li>Java 11</li>
-<li>Postgresql &gt;= 9.x</li>
-<li>CouchDB &gt;= 3.x</li>
-<li>CouchDB-Lucene 2.1</li>
-<li>Thrift 0.16</li>
+<li>Postgresql &gt;= 15.x</li>
+<li>CouchDB &gt;= 3.2.x</li>
+<li>Thrift 0.18.1</li>
 <li>Liferay CE 7.4.3 GA18</li>
 </ul>
 <h2 id="initial-steps">Initial steps</h2>
@@ -673,7 +672,7 @@
 	
 	
 	<div class="text-muted mt-5 pt-3 border-top">
-  Last modified November 24, 2022: <a href="https://github.com/eclipse/sw360.website/commit/d886cf17f4fdf23948c2b8b04b1580ab07f5ae40">upd: New base bare metal guide. (d886cf1)</a>
+  Last modified April 9, 2024: <a href="https://github.com/eclipse/sw360.website/commit/a23d9ae43e6b90067d8037a44eac9162ee371ecb">feat(content): Rearrange content to avois deployment mistakes (a23d9ae)</a>
 </div>
 
 </div>
@@ -722,24 +721,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/baremetal/index.html b/docs/deployment/baremetal/index.html
index e3c09e9..8281403 100644
--- a/docs/deployment/baremetal/index.html
+++ b/docs/deployment/baremetal/index.html
@@ -298,6 +298,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -305,7 +309,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -317,29 +336,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -358,10 +358,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -374,6 +370,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -646,24 +646,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/baremetal/index.xml b/docs/deployment/baremetal/index.xml
index f17047a..62af28f 100644
--- a/docs/deployment/baremetal/index.xml
+++ b/docs/deployment/baremetal/index.xml
@@ -28,10 +28,9 @@
 &lt;p&gt;The installation consists of quite some tasks, as an overview:&lt;/p&gt;
 &lt;ul&gt;
 &lt;li&gt;Java 11&lt;/li&gt;
-&lt;li&gt;Postgresql &amp;gt;= 9.x&lt;/li&gt;
-&lt;li&gt;CouchDB &amp;gt;= 3.x&lt;/li&gt;
-&lt;li&gt;CouchDB-Lucene 2.1&lt;/li&gt;
-&lt;li&gt;Thrift 0.16&lt;/li&gt;
+&lt;li&gt;Postgresql &amp;gt;= 15.x&lt;/li&gt;
+&lt;li&gt;CouchDB &amp;gt;= 3.2.x&lt;/li&gt;
+&lt;li&gt;Thrift 0.18.1&lt;/li&gt;
 &lt;li&gt;Liferay CE 7.4.3 GA18&lt;/li&gt;
 &lt;/ul&gt;
 &lt;h2 id=&#34;initial-steps&#34;&gt;Initial steps&lt;/h2&gt;
diff --git a/docs/deployment/deploy-authorization-concept/index.html b/docs/deployment/deploy-authorization-concept/index.html
index faf1c3a..b9c36e7 100644
--- a/docs/deployment/deploy-authorization-concept/index.html
+++ b/docs/deployment/deploy-authorization-concept/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -665,24 +665,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/deploy-configuration-country-codes/index.html b/docs/deployment/deploy-configuration-country-codes/index.html
index 60444d8..0b6d59d 100644
--- a/docs/deployment/deploy-configuration-country-codes/index.html
+++ b/docs/deployment/deploy-configuration-country-codes/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -653,24 +653,24 @@ You can configure them by using the sw360.properties.</p>
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/deploy-configuration-files/index.html b/docs/deployment/deploy-configuration-files/index.html
index 1a46dc0..6c566f1 100644
--- a/docs/deployment/deploy-configuration-files/index.html
+++ b/docs/deployment/deploy-configuration-files/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -1114,24 +1114,24 @@ allowLeadingWildcard=true</p>
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/deploy-cve-search/index.html b/docs/deployment/deploy-cve-search/index.html
index 748343f..635a4ac 100644
--- a/docs/deployment/deploy-cve-search/index.html
+++ b/docs/deployment/deploy-cve-search/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  active td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="td-sidebar-nav-active-item">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -745,24 +745,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/deploy-export-and-import/index.html b/docs/deployment/deploy-export-and-import/index.html
index 72672e8..2bf6f3d 100644
--- a/docs/deployment/deploy-export-and-import/index.html
+++ b/docs/deployment/deploy-export-and-import/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  active td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="td-sidebar-nav-active-item">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -765,24 +765,24 @@ Nevertheless this scenario is not intended and maybe there are unforeseen side e
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/legacy/deploy-liferay7.4/index.html b/docs/deployment/deploy-initial-setup18/index.html
similarity index 90%
rename from docs/deployment/legacy/deploy-liferay7.4/index.html
rename to docs/deployment/deploy-initial-setup18/index.html
index 908d34c..bfeb9b9 100644
--- a/docs/deployment/legacy/deploy-liferay7.4/index.html
+++ b/docs/deployment/deploy-initial-setup18/index.html
@@ -18,7 +18,7 @@
 <link rel="icon" type="image/png" href="/sw360/favicons/android-144x144.png" sizes="144x144">
 <link rel="icon" type="image/png" href="/sw360/favicons/android-192x192.png" sizes="192x192">
 
-<title>Initial Setup of Liferay 7.4 and sw360 | Eclipse SW360</title>
+<title>SW360 18.x.x Series Initial Setup | Eclipse SW360</title>
 <meta name="description" content="After successful , Then if you open the server with the URL https://localhost:8080/ the following screen should appear:
 
 
@@ -26,22 +26,22 @@
 
 
 Note that the actual …">
-<meta property="og:title" content="Initial Setup of Liferay 7.4 and sw360" />
+<meta property="og:title" content="SW360 18.x.x Series Initial Setup" />
 <meta property="og:description" content="After successful , Then if you open the server with the URL https://localhost:8080/ the following screen should appear:
 Note that the actual image changes with every liferay version. If there is weird html output without images and plain text, then likely some port settings did not work and the pages generated have wrong URLs inside.
 After login the sw360 is not setup, thus the server does not display much, but a screen like the following:" />
 <meta property="og:type" content="article" />
-<meta property="og:url" content="https://www.eclipse.org/sw360/docs/deployment/legacy/deploy-liferay7.4/" /><meta property="article:section" content="docs" />
+<meta property="og:url" content="https://www.eclipse.org/sw360/docs/deployment/deploy-initial-setup18/" /><meta property="article:section" content="docs" />
 
-<meta property="article:modified_time" content="2023-01-13T17:23:07+07:00" /><meta property="og:site_name" content="Eclipse SW360" />
-<meta itemprop="name" content="Initial Setup of Liferay 7.4 and sw360">
+<meta property="article:modified_time" content="2024-04-09T18:22:28+02:00" /><meta property="og:site_name" content="Eclipse SW360" />
+<meta itemprop="name" content="SW360 18.x.x Series Initial Setup">
 <meta itemprop="description" content="After successful , Then if you open the server with the URL https://localhost:8080/ the following screen should appear:
 Note that the actual image changes with every liferay version. If there is weird html output without images and plain text, then likely some port settings did not work and the pages generated have wrong URLs inside.
 After login the sw360 is not setup, thus the server does not display much, but a screen like the following:">
-<meta itemprop="dateModified" content="2023-01-13T17:23:07+07:00" />
-<meta itemprop="wordCount" content="762">
+<meta itemprop="dateModified" content="2024-04-09T18:22:28+02:00" />
+<meta itemprop="wordCount" content="688">
 <meta itemprop="keywords" content="" /><meta name="twitter:card" content="summary"/>
-<meta name="twitter:title" content="Initial Setup of Liferay 7.4 and sw360"/>
+<meta name="twitter:title" content="SW360 18.x.x Series Initial Setup"/>
 <meta name="twitter:description" content="After successful , Then if you open the server with the URL https://localhost:8080/ the following screen should appear:
 Note that the actual image changes with every liferay version. If there is weird html output without images and plain text, then likely some port settings did not work and the pages generated have wrong URLs inside.
 After login the sw360 is not setup, thus the server does not display much, but a screen like the following:"/>
@@ -314,14 +314,33 @@ After login the sw360 is not setup, thus the server does not display much, but a
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child active-path" id="m-sw360docsdeploymentlegacy-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacy-check" checked/>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacy-check"/>
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -333,29 +352,10 @@ After login the sw360 is not setup, thus the server does not display much, but a
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  active td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="td-sidebar-nav-active-item">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -374,10 +374,6 @@ After login the sw360 is not setup, thus the server does not display much, but a
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -390,6 +386,10 @@ After login the sw360 is not setup, thus the server does not display much, but a
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  active td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="td-sidebar-nav-active-item">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -520,10 +520,10 @@ After login the sw360 is not setup, thus the server does not display much, but a
           <aside class="d-none d-xl-block col-xl-2 td-sidebar-toc d-print-none">
             
 <div class="td-page-meta ml-2 pb-1 pt-2 mb-0">
-<a href="https://github.com/eclipse/sw360.website/tree/main/content/en/docs/Deployment/Legacy/Deploy-Liferay7.4.md" class="td-page-meta--view" target="_blank" rel="noopener"><i class="fa fa-file-alt fa-fw"></i> View page source</a>
-  <a href="https://github.com/eclipse/sw360.website/edit/main/content/en/docs/Deployment/Legacy/Deploy-Liferay7.4.md" class="td-page-meta--edit" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> Edit this page</a>
-  <a href="https://github.com/eclipse/sw360.website/new/main/content/en/docs/Deployment/Legacy/Deploy-Liferay7.4.md?filename=change-me.md&amp;value=---%0Atitle%3A&#43;%22Long&#43;Page&#43;Title%22%0AlinkTitle%3A&#43;%22Short&#43;Nav&#43;Title%22%0Aweight%3A&#43;100%0Adescription%3A&#43;%3E-%0A&#43;&#43;&#43;&#43;&#43;Page&#43;description&#43;for&#43;heading&#43;and&#43;indexes.%0A---%0A%0A%23%23&#43;Heading%0A%0AEdit&#43;this&#43;template&#43;to&#43;create&#43;your&#43;new&#43;page.%0A%0A%2A&#43;Give&#43;it&#43;a&#43;good&#43;name%2C&#43;ending&#43;in&#43;%60.md%60&#43;-&#43;e.g.&#43;%60getting-started.md%60%0A%2A&#43;Edit&#43;the&#43;%22front&#43;matter%22&#43;section&#43;at&#43;the&#43;top&#43;of&#43;the&#43;page&#43;%28weight&#43;controls&#43;how&#43;its&#43;ordered&#43;amongst&#43;other&#43;pages&#43;in&#43;the&#43;same&#43;directory%3B&#43;lowest&#43;number&#43;first%29.%0A%2A&#43;Add&#43;a&#43;good&#43;commit&#43;message&#43;at&#43;the&#43;bottom&#43;of&#43;the&#43;page&#43;%28%3C80&#43;characters%3B&#43;use&#43;the&#43;extended&#43;description&#43;field&#43;for&#43;more&#43;detail%29.%0A%2A&#43;Create&#43;a&#43;new&#43;branch&#43;so&#43;you&#43;can&#43;preview&#43;your&#43;new&#43;file&#43;and&#43;request&#43;a&#43;review&#43;via&#43;Pull&#43;Request.%0A" class="td-page-meta--child" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> Create child page</a>
-  <a href="https://github.com/eclipse/sw360.website/issues/new?title=Initial%20Setup%20of%20Liferay%207.4%20and%20sw360" class="td-page-meta--issue" target="_blank" rel="noopener"><i class="fas fa-tasks fa-fw"></i> Create documentation issue</a>
+<a href="https://github.com/eclipse/sw360.website/tree/main/content/en/docs/Deployment/Deploy-Initial-Setup18.md" class="td-page-meta--view" target="_blank" rel="noopener"><i class="fa fa-file-alt fa-fw"></i> View page source</a>
+  <a href="https://github.com/eclipse/sw360.website/edit/main/content/en/docs/Deployment/Deploy-Initial-Setup18.md" class="td-page-meta--edit" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> Edit this page</a>
+  <a href="https://github.com/eclipse/sw360.website/new/main/content/en/docs/Deployment/Deploy-Initial-Setup18.md?filename=change-me.md&amp;value=---%0Atitle%3A&#43;%22Long&#43;Page&#43;Title%22%0AlinkTitle%3A&#43;%22Short&#43;Nav&#43;Title%22%0Aweight%3A&#43;100%0Adescription%3A&#43;%3E-%0A&#43;&#43;&#43;&#43;&#43;Page&#43;description&#43;for&#43;heading&#43;and&#43;indexes.%0A---%0A%0A%23%23&#43;Heading%0A%0AEdit&#43;this&#43;template&#43;to&#43;create&#43;your&#43;new&#43;page.%0A%0A%2A&#43;Give&#43;it&#43;a&#43;good&#43;name%2C&#43;ending&#43;in&#43;%60.md%60&#43;-&#43;e.g.&#43;%60getting-started.md%60%0A%2A&#43;Edit&#43;the&#43;%22front&#43;matter%22&#43;section&#43;at&#43;the&#43;top&#43;of&#43;the&#43;page&#43;%28weight&#43;controls&#43;how&#43;its&#43;ordered&#43;amongst&#43;other&#43;pages&#43;in&#43;the&#43;same&#43;directory%3B&#43;lowest&#43;number&#43;first%29.%0A%2A&#43;Add&#43;a&#43;good&#43;commit&#43;message&#43;at&#43;the&#43;bottom&#43;of&#43;the&#43;page&#43;%28%3C80&#43;characters%3B&#43;use&#43;the&#43;extended&#43;description&#43;field&#43;for&#43;more&#43;detail%29.%0A%2A&#43;Create&#43;a&#43;new&#43;branch&#43;so&#43;you&#43;can&#43;preview&#43;your&#43;new&#43;file&#43;and&#43;request&#43;a&#43;review&#43;via&#43;Pull&#43;Request.%0A" class="td-page-meta--child" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> Create child page</a>
+  <a href="https://github.com/eclipse/sw360.website/issues/new?title=SW360%2018.x.x%20Series%20Initial%20Setup" class="td-page-meta--issue" target="_blank" rel="noopener"><i class="fas fa-tasks fa-fw"></i> Create documentation issue</a>
   <a href="https://github.com/eclipse/sw360/issues/new" class="td-page-meta--project-issue" target="_blank" rel="noopener"><i class="fas fa-tasks fa-fw"></i> Create project issue</a>
   
 </div>
@@ -531,6 +531,15 @@ After login the sw360 is not setup, thus the server does not display much, but a
             
 
 
+<div class="td-toc"><nav id="TableOfContents">
+  <ul>
+    <li><a href="#user-and-login-settings-in-liferay">User and Login Settings in Liferay</a></li>
+    <li><a href="#setup-sw360-for-liferay-import-lar-files">Setup SW360 for Liferay: Import *.lar Files</a></li>
+    <li><a href="#create-user-accounts-for-test">Create User Accounts for Test</a></li>
+    <li><a href="#real-login">Real Login</a></li>
+  </ul>
+</nav></div>
+
 
 
             
@@ -564,16 +573,14 @@ After login the sw360 is not setup, thus the server does not display much, but a
     </li>
   <li class="breadcrumb-item"><a href="https://www.eclipse.org/sw360/docs/deployment/">Deployment</a>
     </li>
-  <li class="breadcrumb-item"><a href="https://www.eclipse.org/sw360/docs/deployment/legacy/">Legacy Guides</a>
-    </li>
   <li class="breadcrumb-item active">
-      <span>Initial Setup of Liferay 7.4 and sw360</span>
+      <span>sw360_18_series</span>
     </li>
   </ol>
 </nav>
             
 <div class="td-content">
-	<h1>Initial Setup of Liferay 7.4 and sw360</h1>
+	<h1>SW360 18.x.x Series Initial Setup</h1>
 	
 	<header class="article-meta">
 		
@@ -608,7 +615,7 @@ After login the sw360 is not setup, thus the server does not display much, but a
     <img src="/sw360/img/sw360screenshots/deploy74/3.png"/> 
 </figure>
 
-<h1 id="user-and-login-settings-in-liferay">User and Login Settings in Liferay</h1>
+<h2 id="user-and-login-settings-in-liferay">User and Login Settings in Liferay</h2>
 <p>Go into the control panel area by clicking the items icon (nine small cubes) in the upper right corner and select the control panel tab:</p>
 
 <figure>
@@ -657,7 +664,7 @@ After login the sw360 is not setup, thus the server does not display much, but a
 </figure>
 
 <p>Note that you need to reload the browser or load a new browser window to take changes to effect.</p>
-<h1 id="setup-sw360-for-liferay-import-lar-files">Setup SW360 for Liferay: Import *.lar Files</h1>
+<h2 id="setup-sw360-for-liferay-import-lar-files">Setup SW360 for Liferay: Import *.lar Files</h2>
 <p>For the setup of SW360 in Liferay, the portal description files, <code>*.lar</code> files need not be imported. there is no way except from doing this in the UI. If we are wrong with this, please let us know, because it is very annoying that these ever occurring steps cannot be automated with Liferay.</p>
 <p>In order to go ahead, switch to the <code>SW360</code> area where you can apply site settings:</p>
 
@@ -715,26 +722,20 @@ After login the sw360 is not setup, thus the server does not display much, but a
     <img src="/sw360/img/sw360screenshots/deploy74/20.png"/> 
 </figure>
 
-<h1 id="import-user-accounts-for-testing">Import User Accounts for Testing</h1>
+<h2 id="create-user-accounts-for-test">Create User Accounts for Test</h2>
 <p>Click the SW360 <code>Admin</code> menu which is_the right and selection the <code>User</code> item.</p>
 
 <figure>
     <img src="/sw360/img/sw360screenshots/deploy74/21.png"/> 
 </figure>
 
-<p>At the bottom of that view, select a User file to import for testing. Skip it if you will create users differently. You can find a <a href="https://github.com/sw360/sw360vagrant/blob/master/shared/test_users_with_passwords_12345.csv">user account import file</a> to import in the <code>sw360vagrant</code> project in the folder <code>shared</code>. After the user have been imported successfully, they should appear in the table view.</p>
+<p>Create at least one user with Admin properties. Example:</p>
 
 <figure>
-    <img src="/sw360/img/sw360screenshots/deploy74/22.png"/> 
+    <img src="/sw360/img/sw360screenshots/deploy74/26.png"/> 
 </figure>
 
-<p>After the user have been imported successfully, they should appear in the table view. You can logout for now and use one of the just added accounts (see below):</p>
-
-<figure>
-    <img src="/sw360/img/sw360screenshots/deploy74/23.png"/> 
-</figure>
-
-<h1 id="real-login">Real Login</h1>
+<h2 id="real-login">Real Login</h2>
 <p>One example user is <code>user@sw360.org</code> with the password <code>12345</code>. Note that in the import file with the example accounts, the password is provided with a hash. If you would like to generate new (salted) hashes, you can change your password and export the user list using the same portlet where you have imported the users. This functionality can be also used to migrate accounts between servers.</p>
 
 <figure>
@@ -751,7 +752,7 @@ After login the sw360 is not setup, thus the server does not display much, but a
 	
 	
 	<div class="text-muted mt-5 pt-3 border-top">
-  Last modified January 13, 2023: <a href="https://github.com/eclipse/sw360.website/commit/73265eee268e203c26b4a09f5323d7d5a1df4941">fix content native install 17 and add file Upgrade_Version_SW360_15_To_16.md (73265ee)</a>
+  Last modified April 9, 2024: <a href="https://github.com/eclipse/sw360.website/commit/a23d9ae43e6b90067d8037a44eac9162ee371ecb">feat(content): Rearrange content to avois deployment mistakes (a23d9ae)</a>
 </div>
 
 </div>
@@ -800,24 +801,24 @@ After login the sw360 is not setup, thus the server does not display much, but a
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/deploy-requirements/index.html b/docs/deployment/deploy-requirements/index.html
index f0028ff..c2ee458 100644
--- a/docs/deployment/deploy-requirements/index.html
+++ b/docs/deployment/deploy-requirements/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  active td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="td-sidebar-nav-active-item">System Requirements</span></a></label>
@@ -757,24 +757,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/deploy-secure-deployment/index.html b/docs/deployment/deploy-secure-deployment/index.html
index 262460c..0a7b515 100644
--- a/docs/deployment/deploy-secure-deployment/index.html
+++ b/docs/deployment/deploy-secure-deployment/index.html
@@ -25,11 +25,11 @@
 <meta property="og:type" content="article" />
 <meta property="og:url" content="https://www.eclipse.org/sw360/docs/deployment/deploy-secure-deployment/" /><meta property="article:section" content="docs" />
 
-<meta property="article:modified_time" content="2022-06-22T22:10:18+02:00" /><meta property="og:site_name" content="Eclipse SW360" />
+<meta property="article:modified_time" content="2024-04-09T18:22:28+02:00" /><meta property="og:site_name" content="Eclipse SW360" />
 <meta itemprop="name" content="Security">
 <meta itemprop="description" content="SW360 security checklist pre and post deployment">
-<meta itemprop="dateModified" content="2022-06-22T22:10:18+02:00" />
-<meta itemprop="wordCount" content="216">
+<meta itemprop="dateModified" content="2024-04-09T18:22:28+02:00" />
+<meta itemprop="wordCount" content="175">
 <meta itemprop="keywords" content="" /><meta name="twitter:card" content="summary"/>
 <meta name="twitter:title" content="Security"/>
 <meta name="twitter:description" content="SW360 security checklist pre and post deployment"/>
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -581,10 +581,8 @@
 <li>Lifearay</li>
 <li>Tomcat</li>
 <li>Couchdb</li>
-<li>Vagrant</li>
 </ul>
-<p>For vagrant it is important to understand how to close the provisioning users and not keep default usernames and passwords open.</p>
-<p>Then for the applications, the following very first line measure should be considered:</p>
+<p>For the applications, the following very first line measure should be considered:</p>
 <ul>
 <li>
 <p>Change password of Liferay administrator user or check if that is appropriately secure.</p>
@@ -611,15 +609,14 @@
 <p>Add https access to couchdb</p>
 </li>
 <li>
-<p>check that sw360 eyecuting user does not have sudo rights and config files for sw360 are <code>600</code> only for the executing user.</p>
+<p>check that sw360 runtime user does not have sudo rights and config files for sw360 are <code>600</code> only.</p>
 </li>
 </ul>
-<p>Note that the Linux vagrant scripts applies somesecurity measures already on the OS level.</p>
 
 	
 	
 	<div class="text-muted mt-5 pt-3 border-top">
-  Last modified June 22, 2022: <a href="https://github.com/eclipse/sw360.website/commit/032e0f60817fa17b0036ac6db37d09342a714890">SW360 website remodeling (#9) (032e0f6)</a>
+  Last modified April 9, 2024: <a href="https://github.com/eclipse/sw360.website/commit/a23d9ae43e6b90067d8037a44eac9162ee371ecb">feat(content): Rearrange content to avois deployment mistakes (a23d9ae)</a>
 </div>
 
 </div>
@@ -668,24 +665,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/deploy-specialdeployment/index.html b/docs/deployment/deploy-specialdeployment/index.html
index 0231fce..80974fb 100644
--- a/docs/deployment/deploy-specialdeployment/index.html
+++ b/docs/deployment/deploy-specialdeployment/index.html
@@ -306,6 +306,10 @@ Comprehensive blog post on SW360 Installation in Japanese
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -313,7 +317,22 @@ Comprehensive blog post on SW360 Installation in Japanese
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -325,29 +344,10 @@ Comprehensive blog post on SW360 Installation in Japanese
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -366,10 +366,6 @@ Comprehensive blog post on SW360 Installation in Japanese
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -382,6 +378,10 @@ Comprehensive blog post on SW360 Installation in Japanese
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  active td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="td-sidebar-nav-active-item">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -637,24 +637,24 @@ Comprehensive blog post on SW360 Installation in Japanese
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/index.html b/docs/deployment/index.html
index 7f69745..dd3b035 100644
--- a/docs/deployment/index.html
+++ b/docs/deployment/index.html
@@ -298,6 +298,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -305,7 +309,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -317,29 +336,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -358,10 +358,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -374,6 +370,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -517,10 +517,9 @@
 
 <div class="td-toc"><nav id="TableOfContents">
   <ul>
-    <li>
+    <li><a href="#recommended-sw360-deployment">Recommended SW360 Deployment</a>
       <ul>
-        <li><a href="#frequently-experienced-problems">Frequently Experienced Problems</a></li>
-        <li><a href="#general-topcis">General Topcis</a></li>
+        <li><a href="#general-topics">General Topics</a></li>
         <li><a href="#special-topics">Special Topics</a></li>
       </ul>
     </li>
@@ -582,55 +581,27 @@
 
 		
 	</header>
-	<h1 id="deploying-sw360">Deploying sw360</h1>
-<p>For the deployment of the SW360, it is about deploying a Liferay server application. Please understand, that apart from trying sw360 for a short while, for deployments of SW360 in your organisation you will need knowledge about how to deploy Java server applications. Regardless of the deployment approach the following main elements need to be considered:</p>
+	<h2 id="recommended-sw360-deployment">Recommended SW360 Deployment</h2>
+<p>For current SW360 deployment is recommended use docker compose, as base setup of the necessary third party tools are present.</p>
+<p>You can find <a href="https://github.com/eclipse-sw360/sw360/raw/main/docker-compose.yml">SW360 official docker-compose reference here</a>.</p>
+<p>This docker compose comes with default admin passwords for couchdb and postgres. Is recommended for production to customize this file.</p>
+<p>Donload the file mentioned above an just run:</p>
+<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-bash" data-lang="bash"><span style="display:flex;"><span>docker compose -d
+</span></span></code></pre></div><p>Three nested docker containers will be created for sw360, couchdb and postgres, and the respective volumes for the containers. They run in a closed sw360 docker network.</p>
+<p>After this, you need to execute the <a href="deploy-initial-setup18">18.x.x. series initial setup</a></p>
+<h3 id="general-topics">General Topics</h3>
 <ul>
-<li>A <a href="https://www.liferay.com/de/downloads-community">Liferay Community Edition bundeled with Tomcat</a>.</li>
-<li>Install CouchDB (this is where SW360 stores all the source code, SPDX files and metadata), depending on your platform, there are a number of ways to use CouchDB. Currently, we tested with CouchDB 2.1.2, other versions of CouchDB may work as well.</li>
-<li>For productive deployments, you do not want to go with the (Hypersonic) DB bundled with Tomcat, but install some normal DB server. We use PostgreSQL. The relation DB server is used by Liferay and should be thus compatible to it.</li>
-<li>For searches, consider CouchDB Lucene <a href="https://github.com/rnewson/couchdb-lucene/archive/v1.0.2.tar.gz">CouchDb Lucene</a>.</li>
-<li>There is a number of additional &ldquo;prerequisites&rdquo; for SW360, more detailed <a href="https://github.com/sw360/sw360vagrant/blob/master/download-packages.sh">in the Vagrant deployment setup</a>.</li>
+<li><a href="deploy-authorization-concept">Deployment Authorization Concept</a></li>
+<li><a href="deploy-configuration-files">Properties explained</a></li>
+<li><a href="deploy-requirements">Deployment Requirements</a></li>
+<li><a href="deploy-secure-deployment">Secure Deployment Notes</a></li>
 </ul>
-<p>In order to install sw360, you can choose between the following ways:</p>
-<ul>
-<li>Use the Vagrant-based installation. Please refer to the <a href="https://github.com/sw360/sw360vagrant">sw360 vagrant project</a> and the included Readme file. Basic prerequisites are
-<ul>
-<li>VirtualBox</li>
-<li>Vagrant and some vagrant plugins</li>
-<li>Presumeably a git client</li>
-</ul>
-</li>
-<li>You could install the sw360portal project natively on the machine. This will require more work in order to install the prerequisites. The above mentioned vagrant project documents very precisely what to do in order to install the sw360portal.</li>
-<li>Checkout the docker suite <a href="https://github.com/sw360/sw360chores">sw360chores</a> and generate a pre-built container where you can deploy the <code>*.war</code> files of sw360portal (both frontend and backend). <strong>Important</strong> this is work in progress now and likely not working out of the box.</li>
-</ul>
-<h3 id="frequently-experienced-problems">Frequently Experienced Problems</h3>
-<ol>
-<li>
-<p>The most experienced confusion is about the Liferay setup user: the setup user cannot be used to work with the sw360 because the setup user is missing an organisation assignment. For every user an organisation assignment is required for sw360 to work properly. Unfortunately, you cannot assign a liferay setup user to an organisation. So you do need to import users or create users with organisation.</p>
-</li>
-<li>
-<p>Currently, you need Java 11, we test it with OpenJDK. Newer or older versions may work, but currently, reports tell that for example Java 8 does not work.</p>
-</li>
-<li>
-<p>Thrift: for compiling the software you need to install <a href="https://github.com/apache/thrift">Apache Thrift</a> (a command line tool). We test with version 0.13.</p>
-</li>
-</ol>
-<h3 id="general-topcis">General Topcis</h3>
+<h3 id="special-topics">Special Topics</h3>
+<p>After install and setup sw360, this are possible topice to be considered:</p>
 <ul>
-<li><a href="Deploy-authorization-concept">Deployment Authorization Concept</a></li>
-<li><a href="Deploy-Configuration-Files">Properties explained</a></li>
-<li><a href="Deploy-FOSSology">Setup of connection with Fossology</a></li>
-<li><a href="Deploy-Requirements">Deployment Requirements</a></li>
-<li><a href="Deploy-Secure-Deployment">Secure Deployment Notes</a></li>
+<li><a href="deploy-configuration-country-codes">Special Coverage of Country Codes</a>, when countries are displayed, then it uses country codes in the DB</li>
+<li><a href="deploy-export-and-import">How to export data and import it to a new instance</a></li>
 </ul>
-<h3 id="special-topics">Special Topics</h3>
-<p>After installing sw360 more topics may include:</p>
-<ol>
-<li><a href="Deploy-configuration-country-codes">Special Coverage of Country Codes</a>, when countries are displayed, then it uses country codes in the DB</li>
-<li><a href="Deploy-Export-and-Import">How to export data and import it to a new instance</a></li>
-<li><a href="Deploy-Migrating-to-a-new-Server">How to migrate an existing sw360portal to a new instance</a></li>
-<li><a href="Dev-Database-Migration-using-Costco">Using costco to modify the couchdb database</a></li>
-</ol>
 
         <div class="section-index">
     
@@ -668,14 +639,6 @@
             </div>
         
             
-            <div class="entry">
-                <h5>
-                    <a href="/sw360/docs/deployment/nativeinstall/">Native Install</a>
-                </h5>
-                <p>SW360 Native Install Deployment</p>
-            </div>
-        
-            
             <div class="entry">
                 <h5>
                     <a href="/sw360/docs/deployment/deploy-authorization-concept/">Authorization Concept</a>
@@ -710,31 +673,31 @@
             
             <div class="entry">
                 <h5>
-                    <a href="/sw360/docs/deployment/deploy-docker/">Docker Deployment</a>
+                    <a href="/sw360/docs/deployment/deploy-export-and-import/">Export and Import</a>
                 </h5>
-                <p>Deploy SW360 with Docker</p>
+                <p>SW360 Export and Import</p>
             </div>
         
             
             <div class="entry">
                 <h5>
-                    <a href="/sw360/docs/deployment/deploy-export-and-import/">Export and Import</a>
+                    <a href="/sw360/docs/deployment/deploy-secure-deployment/">Security</a>
                 </h5>
-                <p>SW360 Export and Import</p>
+                <p>SW360 security checklist pre and post deployment</p>
             </div>
         
             
             <div class="entry">
                 <h5>
-                    <a href="/sw360/docs/deployment/deploy-secure-deployment/">Security</a>
+                    <a href="/sw360/docs/deployment/deploy-specialdeployment/">Special Deployment Guides</a>
                 </h5>
-                <p>SW360 security checklist pre and post deployment</p>
+                <p></p>
             </div>
         
             
             <div class="entry">
                 <h5>
-                    <a href="/sw360/docs/deployment/deploy-specialdeployment/">Special Deployment Guides</a>
+                    <a href="/sw360/docs/deployment/deploy-initial-setup18/">SW360 18.x.x Series Initial Setup</a>
                 </h5>
                 <p></p>
             </div>
@@ -753,7 +716,7 @@
 	
 	
 	<div class="text-muted mt-5 pt-3 border-top">
-  Last modified June 28, 2022: <a href="https://github.com/eclipse/sw360.website/commit/c61ddf9ae168cc094b5c0681056e618816da5f7c">feat(docs): Add docs from main sw360 (c61ddf9)</a>
+  Last modified April 9, 2024: <a href="https://github.com/eclipse/sw360.website/commit/a23d9ae43e6b90067d8037a44eac9162ee371ecb">feat(content): Rearrange content to avois deployment mistakes (a23d9ae)</a>
 </div>
 
 </div>
@@ -801,24 +764,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/index.xml b/docs/deployment/index.xml
index 84416e1..cd5e50e 100644
--- a/docs/deployment/index.xml
+++ b/docs/deployment/index.xml
@@ -49,19 +49,6 @@
         
         
         
-      </description>
-    </item>
-    
-    <item>
-      <title>Docs: Native Install</title>
-      <link>https://www.eclipse.org/sw360/docs/deployment/nativeinstall/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://www.eclipse.org/sw360/docs/deployment/nativeinstall/</guid>
-      <description>
-        
-        
-        
       </description>
     </item>
     
@@ -736,87 +723,6 @@ You can configure them by using the sw360.properties.&lt;/p&gt;
       </description>
     </item>
     
-    <item>
-      <title>Docs: Docker Deployment</title>
-      <link>https://www.eclipse.org/sw360/docs/deployment/deploy-docker/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://www.eclipse.org/sw360/docs/deployment/deploy-docker/</guid>
-      <description>
-        
-        
-        &lt;h1 id=&#34;a-quick-how-to-for-testing-sw360&#34;&gt;A quick how-to for testing SW360&lt;/h1&gt;
-&lt;h2 id=&#34;requirements&#34;&gt;Requirements&lt;/h2&gt;
-&lt;h3 id=&#34;platform-requirements&#34;&gt;Platform Requirements&lt;/h3&gt;
-&lt;p&gt;As you need Apache Thrift 0.11.0 (see &lt;a href=&#34;https://github.com/eclipse/sw360#required-software&#34;&gt;https://github.com/eclipse/sw360#required-software&lt;/a&gt; ), using the latest Ubuntu LTS (18.04) won&amp;rsquo;t work, so we start on Ubuntu 19.10 if you want to install from packages. As an alternative, consider the following script from the sw360 repository:&lt;/p&gt;
-&lt;p&gt;&lt;a href=&#34;https://github.com/eclipse/sw360/blob/master/scripts/install-thrift.sh&#34;&gt;https://github.com/eclipse/sw360/blob/master/scripts/install-thrift.sh&lt;/a&gt;&lt;/p&gt;
-&lt;p&gt;We&amp;rsquo;ll go the Docker way and follow the instructions of the &lt;a href=&#34;https://github.com/sw360/sw360chores&#34;&gt;sw360chores project&lt;/a&gt;. There is a nice diagram there, explaining the rather complex setup.&lt;/p&gt;
-&lt;h3 id=&#34;sw360chores-requirements&#34;&gt;sw360chores Requirements&lt;/h3&gt;
-&lt;blockquote&gt;
-&lt;p&gt;the perl interpreter to run ./sw360chores.pl&lt;/p&gt;
-&lt;/blockquote&gt;
-&lt;p&gt;You should already have it in your default, even if minimal, installation&lt;/p&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ which perl 
-&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;/usr/bin/perl
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;blockquote&gt;
-&lt;p&gt;git which is used in some prepare scripts&lt;/p&gt;
-&lt;/blockquote&gt;
-&lt;p&gt;&lt;code&gt;sudo apt install git&lt;/code&gt;&lt;/p&gt;
-&lt;blockquote&gt;
-&lt;p&gt;a current version of docker (min 1.30) [https://docs.docker.com/]&lt;/p&gt;
-&lt;/blockquote&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;sudo apt install docker.io
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;blockquote&gt;
-&lt;p&gt;docker-compose (min 1.21) [https://docs.docker.com/compose/install/]&lt;/p&gt;
-&lt;/blockquote&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;sudo apt install docker-compose
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;And you actually also need curl,&lt;/p&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;sudo apt install curl
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;h3 id=&#34;sw360-requirements&#34;&gt;Sw360 Requirements&lt;/h3&gt;
-&lt;p&gt;From the &lt;a href=&#34;https://github.com/eclipse/sw360#required-software&#34;&gt;sw360 Readme&lt;/a&gt;:&lt;/p&gt;
-&lt;blockquote&gt;
-&lt;p&gt;Java 1.8.X&lt;/p&gt;
-&lt;/blockquote&gt;
-&lt;p&gt;And when they say &amp;ldquo;1.8.X&amp;rdquo;, they mean it: it won&amp;rsquo;t work with a later version. So it&amp;rsquo;s better to uninstall the potential other versions of Java (/!\ this is expected to break other things on your environment if you depend on Java for anything), and then install the required version&lt;/p&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt; sudo apt install openjdk-8-jdk openjdk-8-jre
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;blockquote&gt;
-&lt;p&gt;In order to build you will need:&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;A git client&lt;/li&gt;
-&lt;li&gt;Apache Maven 3.6.X&lt;/li&gt;
-&lt;li&gt;Apache Thrift 0.11.0&lt;/li&gt;
-&lt;/ul&gt;
-&lt;/blockquote&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;sudo apt install maven
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;That will install maven Apache Maven 3.6.1 but you need to have installed the correct version (8) of Java &lt;em&gt;before hand&lt;/em&gt; otherwise it will install a too recent one.&lt;/p&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;sudo apt install thrift-compiler
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;That will install Thrift version 0.11.0, if you have not installed thrift using the script above.&lt;/p&gt;
-&lt;h2 id=&#34;cloning-the-repos&#34;&gt;Cloning the repos&lt;/h2&gt;
-&lt;h3 id=&#34;generating-an-ssh-key-pair-for-your-machine&#34;&gt;Generating an ssh key-pair for your machine&lt;/h3&gt;
-&lt;p&gt;If you don&amp;rsquo;t already have one, generate a key pair with no passphrase, in default location:&lt;/p&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;ssh-keygen -t rsa -b 4096 -C &amp;#34;your_email@example.com&amp;#34;
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;Not 100% sure, but not having one may create problems, so&amp;hellip;&lt;/p&gt;
-&lt;h3 id=&#34;cloning-sw360-chores&#34;&gt;Cloning sw360 chores&lt;/h3&gt;
-&lt;p&gt;I created a &lt;code&gt;code&lt;/code&gt; folder at the root of the user&amp;rsquo;s directory, just to make things simple.&lt;/p&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;~$ cd code
-&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;~/code$ git clone https://github.com/sw360/sw360chores.git
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;h3 id=&#34;cloning-eclipsesw360&#34;&gt;Cloning eclipse/sw360&lt;/h3&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;~/code$ git clone https://github.com/eclipse/sw360.git
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;h2 id=&#34;compiling-and-deploying-sw360-code&#34;&gt;Compiling and deploying SW360 Code&lt;/h2&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-go&#34; data-lang=&#34;go&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;~$&lt;/span&gt; cd code&lt;span style=&#34;color:#555&#34;&gt;/&lt;/span&gt;sw360&lt;span style=&#34;color:#555&#34;&gt;/&lt;/span&gt;
-&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;~&lt;/span&gt;&lt;span style=&#34;color:#555&#34;&gt;/&lt;/span&gt;code&lt;span style=&#34;color:#555&#34;&gt;/&lt;/span&gt;sw360&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;$&lt;/span&gt; mvn &lt;span style=&#34;color:#069;font-weight:bold&#34;&gt;package&lt;/span&gt; &lt;span style=&#34;color:#555&#34;&gt;-&lt;/span&gt;P deploy &lt;span style=&#34;color:#555&#34;&gt;-&lt;/span&gt;Dbase.deploy.dir=&lt;span style=&#34;color:#555&#34;&gt;/&lt;/span&gt;home&lt;span style=&#34;color:#555&#34;&gt;/&lt;/span&gt;inno3&lt;span style=&#34;color:#555&#34;&gt;/&lt;/span&gt;code&lt;span style=&#34;color:#555&#34;&gt;/&lt;/span&gt;sw360chores&lt;span style=&#34;color:#555&#34;&gt;/&lt;/span&gt;_deploy &lt;span style=&#34;color:#555&#34;&gt;-&lt;/span&gt;DskipTests
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;h2 id=&#34;launching-the-containers&#34;&gt;Launching the containers&lt;/h2&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ cd ~/code/sw360chores/
-&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;~/code/sw360chores$ ./sw360chores.pl --build -- up
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;And yes, there is a space between &lt;code&gt;--&lt;/code&gt; and &lt;code&gt;up&lt;/code&gt;.&lt;/p&gt;
-&lt;p&gt;If everything goes fine, you should see a line like&lt;/p&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;sw360_1                | 15-Jan-2020 12:33:38.480 INFO [main] org.apache.catalina.startup.Catalina.start Server startup in [144,475] milliseconds 
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;You should be able to login at &lt;a href=&#34;https://localhost:8443&#34;&gt;https://localhost:8443&lt;/a&gt; with the default credentials &lt;code&gt;setup@sw360.org&lt;/code&gt; and the password &lt;code&gt;sw360fossy&lt;/code&gt; (found &lt;a href=&#34;https://github.com/eclipse/sw360/wiki/Deploy-Liferay#liferay-administrator-steps&#34;&gt;here&lt;/a&gt;).&lt;/p&gt;
-&lt;p&gt;Please go ahead now with the setup of the Liferay - links can be found in the main wiki page.&lt;/p&gt;
-
-      </description>
-    </item>
-    
     <item>
       <title>Docs: Export and Import</title>
       <link>https://www.eclipse.org/sw360/docs/deployment/deploy-export-and-import/</link>
@@ -957,10 +863,8 @@ Nevertheless this scenario is not intended and maybe there are unforeseen side e
 &lt;li&gt;Lifearay&lt;/li&gt;
 &lt;li&gt;Tomcat&lt;/li&gt;
 &lt;li&gt;Couchdb&lt;/li&gt;
-&lt;li&gt;Vagrant&lt;/li&gt;
 &lt;/ul&gt;
-&lt;p&gt;For vagrant it is important to understand how to close the provisioning users and not keep default usernames and passwords open.&lt;/p&gt;
-&lt;p&gt;Then for the applications, the following very first line measure should be considered:&lt;/p&gt;
+&lt;p&gt;For the applications, the following very first line measure should be considered:&lt;/p&gt;
 &lt;ul&gt;
 &lt;li&gt;
 &lt;p&gt;Change password of Liferay administrator user or check if that is appropriately secure.&lt;/p&gt;
@@ -987,10 +891,9 @@ Nevertheless this scenario is not intended and maybe there are unforeseen side e
 &lt;p&gt;Add https access to couchdb&lt;/p&gt;
 &lt;/li&gt;
 &lt;li&gt;
-&lt;p&gt;check that sw360 eyecuting user does not have sudo rights and config files for sw360 are &lt;code&gt;600&lt;/code&gt; only for the executing user.&lt;/p&gt;
+&lt;p&gt;check that sw360 runtime user does not have sudo rights and config files for sw360 are &lt;code&gt;600&lt;/code&gt; only.&lt;/p&gt;
 &lt;/li&gt;
 &lt;/ul&gt;
-&lt;p&gt;Note that the Linux vagrant scripts applies somesecurity measures already on the OS level.&lt;/p&gt;
 
       </description>
     </item>
@@ -1012,6 +915,170 @@ Nevertheless this scenario is not intended and maybe there are unforeseen side e
       </description>
     </item>
     
+    <item>
+      <title>Docs: SW360 18.x.x Series Initial Setup</title>
+      <link>https://www.eclipse.org/sw360/docs/deployment/deploy-initial-setup18/</link>
+      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
+      
+      <guid>https://www.eclipse.org/sw360/docs/deployment/deploy-initial-setup18/</guid>
+      <description>
+        
+        
+        &lt;p&gt;After successful , Then if you open the server with the URL &lt;code&gt;https://localhost:8080/&lt;/code&gt; the following screen should appear:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/1.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Note that the actual image changes with every liferay version. If there is weird html output without images and plain text, then likely some port settings did not work and the pages generated have wrong URLs inside.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/2.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;After login the sw360 is not setup, thus the server does not display much, but a screen like the following:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/3.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;h2 id=&#34;user-and-login-settings-in-liferay&#34;&gt;User and Login Settings in Liferay&lt;/h2&gt;
+&lt;p&gt;Go into the control panel area by clicking the items icon (nine small cubes) in the upper right corner and select the control panel tab:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/4.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Edit this password policy and disable &lt;code&gt;change Required&lt;/code&gt; if you wish to do so. Click on Save_the bottom of the page to save the selection.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/6.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Then, go: in &lt;code&gt;Configuration&lt;/code&gt; &amp;gt;  &lt;code&gt;Instance Settings&lt;/code&gt; &amp;gt; &lt;code&gt;Users&lt;/code&gt; &amp;gt;&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/7.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;In this area, select &lt;code&gt;Default User Associations&lt;/code&gt; to enter SW360 and apply it also to existing users. Click on Save to save the selection:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/8.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Then, in &lt;code&gt;Configuration&lt;/code&gt; &amp;gt;  &lt;code&gt;Instance Settings&lt;/code&gt; &amp;gt; &lt;code&gt;User Authentication&lt;/code&gt; &amp;gt; &lt;code&gt;General&lt;/code&gt; to disable all kind of auto login to make sure only authenticated users can log in. You may want to switch off the e-mail verification, because for most of the development times it will not be of much value.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/9.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Finally, sice Liferay 7.4 some of the bundled modules need to be activated:&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;jquery&lt;/li&gt;
+&lt;li&gt;font awesome&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;In oder to do this, please select from the &lt;code&gt;Configuration&lt;/code&gt; &amp;gt;  &lt;code&gt;System Settings&lt;/code&gt; &amp;gt; &lt;code&gt;Third Party&lt;/code&gt; and go to jquery, select the enablement and click on Update:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/10.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Do the same for Font Awesome:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/11.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Note that you need to reload the browser or load a new browser window to take changes to effect.&lt;/p&gt;
+&lt;h2 id=&#34;setup-sw360-for-liferay-import-lar-files&#34;&gt;Setup SW360 for Liferay: Import *.lar Files&lt;/h2&gt;
+&lt;p&gt;For the setup of SW360 in Liferay, the portal description files, &lt;code&gt;*.lar&lt;/code&gt; files need not be imported. there is no way except from doing this in the UI. If we are wrong with this, please let us know, because it is very annoying that these ever occurring steps cannot be automated with Liferay.&lt;/p&gt;
+&lt;p&gt;In order to go ahead, switch to the &lt;code&gt;SW360&lt;/code&gt; area where you can apply site settings:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/12.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;The go into &amp;gt;  &lt;code&gt;Publishing&lt;/code&gt; &amp;gt; &lt;code&gt;Import&lt;/code&gt; which shows like this:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/13.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Then, click on the plus sign in order to import the *.lar file for public pages. You will find the lar files in the &lt;a href=&#34;https://github.com/eclipse/sw360/tree/master/frontend/configuration&#34;&gt;frontend/configuration&lt;/a&gt; folder of the sw360 repository.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/14.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;As for import settings, follow the selection as shown on the screenshot. It is very important that for the &lt;code&gt;Public_Pages_7_4_3_18_GA18.lar&lt;/code&gt; file the selection &lt;code&gt;Public_Pages_7_4_3_18_GA18.lar&lt;/code&gt; is made.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/15.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Importing permission makes sure that pages are visible according to users rights. For public pages, it is irrelevant_the moment. Overwriting and the write as current user needs to be selected.&lt;/p&gt;
+&lt;p&gt;After successful importing, the same steps shall be repeated for the &lt;code&gt;Private_Pages_7_4_3_18_GA18.lar&lt;/code&gt; file.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/16.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Make sure that &lt;code&gt;Private_Pages_7_4_3_18_GA18.lar &lt;/code&gt; is selected. Follow the other selections made as shown on the screenshot &amp;hellip; importing permissions &amp;hellip; mirror with overwriting, use the current author &amp;hellip;&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/17.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;If you click then the liferay logo_the upper left corner where the SW360 is, you will return to the application and the following screen should appear:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/18.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;You can close the left menu area by clicking on the upper left icon:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/19.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Click &lt;code&gt;Start&lt;/code&gt; to open the private pages. You are still logged in, so the setup account is used to view the pages.&lt;/p&gt;
+&lt;p&gt;&lt;strong&gt;Important&lt;/strong&gt; The setup account does not belong to a group. Thus, not all view are functional because they require a group membership to work correctly.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/20.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;h2 id=&#34;create-user-accounts-for-test&#34;&gt;Create User Accounts for Test&lt;/h2&gt;
+&lt;p&gt;Click the SW360 &lt;code&gt;Admin&lt;/code&gt; menu which is_the right and selection the &lt;code&gt;User&lt;/code&gt; item.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/21.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Create at least one user with Admin properties. Example:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/26.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;h2 id=&#34;real-login&#34;&gt;Real Login&lt;/h2&gt;
+&lt;p&gt;One example user is &lt;code&gt;user@sw360.org&lt;/code&gt; with the password &lt;code&gt;12345&lt;/code&gt;. Note that in the import file with the example accounts, the password is provided with a hash. If you would like to generate new (salted) hashes, you can change your password and export the user list using the same portlet where you have imported the users. This functionality can be also used to migrate accounts between servers.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/24.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;After the successful login, SW360 will look as follows.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/25.png&#34;/&gt; 
+&lt;/figure&gt;
+
+
+      </description>
+    </item>
+    
     <item>
       <title>Docs: System Requirements</title>
       <link>https://www.eclipse.org/sw360/docs/deployment/deploy-requirements/</link>
diff --git a/docs/deployment/legacy/deploy-liferay/index.html b/docs/deployment/legacy/deploy-liferay/index.html
index a9d7c18..62ba3bd 100644
--- a/docs/deployment/legacy/deploy-liferay/index.html
+++ b/docs/deployment/legacy/deploy-liferay/index.html
@@ -306,6 +306,10 @@ Login as setup administrator (if you are using the default unsafe password, you
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child active-path" id="m-sw360docsdeploymentlegacy-li">
@@ -313,7 +317,22 @@ Login as setup administrator (if you are using the default unsafe password, you
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  active td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="td-sidebar-nav-active-item">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -325,29 +344,10 @@ Login as setup administrator (if you are using the default unsafe password, you
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -366,10 +366,6 @@ Login as setup administrator (if you are using the default unsafe password, you
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -382,6 +378,10 @@ Login as setup administrator (if you are using the default unsafe password, you
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -739,24 +739,24 @@ save (on the right)</p>
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/legacy/deploy-liferay7.3/index.html b/docs/deployment/legacy/deploy-liferay7.3/index.html
index 846cb2a..1d55294 100644
--- a/docs/deployment/legacy/deploy-liferay7.3/index.html
+++ b/docs/deployment/legacy/deploy-liferay7.3/index.html
@@ -317,6 +317,10 @@ Sign in_the icon_the upper left corner. If you did not change the values in conf
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child active-path" id="m-sw360docsdeploymentlegacy-li">
@@ -324,7 +328,22 @@ Sign in_the icon_the upper left corner. If you did not change the values in conf
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -336,29 +355,10 @@ Sign in_the icon_the upper left corner. If you did not change the values in conf
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  active td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="td-sidebar-nav-active-item">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -377,10 +377,6 @@ Sign in_the icon_the upper left corner. If you did not change the values in conf
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -393,6 +389,10 @@ Sign in_the icon_the upper left corner. If you did not change the values in conf
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -816,24 +816,24 @@ Sign in_the icon_the upper left corner. If you did not change the values in conf
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/legacy/deploy-liferay7/index.html b/docs/deployment/legacy/deploy-liferay7/index.html
index b8e2331..4a2bc8f 100644
--- a/docs/deployment/legacy/deploy-liferay7/index.html
+++ b/docs/deployment/legacy/deploy-liferay7/index.html
@@ -306,6 +306,10 @@ Until then, some tasks need to be done manually, after everything has been built
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child active-path" id="m-sw360docsdeploymentlegacy-li">
@@ -313,7 +317,22 @@ Until then, some tasks need to be done manually, after everything has been built
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -325,29 +344,10 @@ Until then, some tasks need to be done manually, after everything has been built
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -366,10 +366,6 @@ Until then, some tasks need to be done manually, after everything has been built
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -382,6 +378,10 @@ Until then, some tasks need to be done manually, after everything has been built
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -807,24 +807,24 @@ Until then, some tasks need to be done manually, after everything has been built
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/legacy/deploy-natively-11/index.html b/docs/deployment/legacy/deploy-natively-11/index.html
index 69d81f0..9ea6797 100644
--- a/docs/deployment/legacy/deploy-natively-11/index.html
+++ b/docs/deployment/legacy/deploy-natively-11/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child active-path" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  active td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="td-sidebar-nav-active-item">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -794,24 +794,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/legacy/index.html b/docs/deployment/legacy/index.html
index c5ba8ae..f63c612 100644
--- a/docs/deployment/legacy/index.html
+++ b/docs/deployment/legacy/index.html
@@ -298,6 +298,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -305,7 +309,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  active td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="td-sidebar-nav-active-item">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -317,29 +336,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -358,10 +358,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -374,6 +370,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -587,15 +587,15 @@
             
             <div class="entry">
                 <h5>
-                    <a href="/sw360/docs/deployment/legacy/deploy-liferay/">Initial Setup of Liferay 6.2 and sw360</a>
+                    <a href="/sw360/docs/deployment/legacy/nativeinstall/">Native Install</a>
                 </h5>
-                <p></p>
+                <p>SW360 Native Install Deployment</p>
             </div>
         
             
             <div class="entry">
                 <h5>
-                    <a href="/sw360/docs/deployment/legacy/deploy-liferay7/">Initial Setup of Liferay 7.2 and sw360</a>
+                    <a href="/sw360/docs/deployment/legacy/deploy-liferay/">Initial Setup of Liferay 6.2 and sw360</a>
                 </h5>
                 <p></p>
             </div>
@@ -603,7 +603,7 @@
             
             <div class="entry">
                 <h5>
-                    <a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/">Initial Setup of Liferay 7.3 and sw360</a>
+                    <a href="/sw360/docs/deployment/legacy/deploy-liferay7/">Initial Setup of Liferay 7.2 and sw360</a>
                 </h5>
                 <p></p>
             </div>
@@ -611,7 +611,7 @@
             
             <div class="entry">
                 <h5>
-                    <a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/">Initial Setup of Liferay 7.4 and sw360</a>
+                    <a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/">Initial Setup of Liferay 7.3 and sw360</a>
                 </h5>
                 <p></p>
             </div>
@@ -678,24 +678,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/legacy/index.xml b/docs/deployment/legacy/index.xml
index d3c4d7b..7b07af6 100644
--- a/docs/deployment/legacy/index.xml
+++ b/docs/deployment/legacy/index.xml
@@ -13,6 +13,19 @@
       
     
     
+    <item>
+      <title>Docs: Native Install</title>
+      <link>https://www.eclipse.org/sw360/docs/deployment/legacy/nativeinstall/</link>
+      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
+      
+      <guid>https://www.eclipse.org/sw360/docs/deployment/legacy/nativeinstall/</guid>
+      <description>
+        
+        
+        
+      </description>
+    </item>
+    
     <item>
       <title>Docs: Initial Setup of Liferay 6.2 and sw360</title>
       <link>https://www.eclipse.org/sw360/docs/deployment/legacy/deploy-liferay/</link>
@@ -487,176 +500,6 @@ save (on the right)&lt;/p&gt;
       </description>
     </item>
     
-    <item>
-      <title>Docs: Initial Setup of Liferay 7.4 and sw360</title>
-      <link>https://www.eclipse.org/sw360/docs/deployment/legacy/deploy-liferay7.4/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://www.eclipse.org/sw360/docs/deployment/legacy/deploy-liferay7.4/</guid>
-      <description>
-        
-        
-        &lt;p&gt;After successful , Then if you open the server with the URL &lt;code&gt;https://localhost:8080/&lt;/code&gt; the following screen should appear:&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/1.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;p&gt;Note that the actual image changes with every liferay version. If there is weird html output without images and plain text, then likely some port settings did not work and the pages generated have wrong URLs inside.&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/2.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;p&gt;After login the sw360 is not setup, thus the server does not display much, but a screen like the following:&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/3.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;h1 id=&#34;user-and-login-settings-in-liferay&#34;&gt;User and Login Settings in Liferay&lt;/h1&gt;
-&lt;p&gt;Go into the control panel area by clicking the items icon (nine small cubes) in the upper right corner and select the control panel tab:&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/4.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;p&gt;Edit this password policy and disable &lt;code&gt;change Required&lt;/code&gt; if you wish to do so. Click on Save_the bottom of the page to save the selection.&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/6.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;p&gt;Then, go: in &lt;code&gt;Configuration&lt;/code&gt; &amp;gt;  &lt;code&gt;Instance Settings&lt;/code&gt; &amp;gt; &lt;code&gt;Users&lt;/code&gt; &amp;gt;&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/7.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;p&gt;In this area, select &lt;code&gt;Default User Associations&lt;/code&gt; to enter SW360 and apply it also to existing users. Click on Save to save the selection:&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/8.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;p&gt;Then, in &lt;code&gt;Configuration&lt;/code&gt; &amp;gt;  &lt;code&gt;Instance Settings&lt;/code&gt; &amp;gt; &lt;code&gt;User Authentication&lt;/code&gt; &amp;gt; &lt;code&gt;General&lt;/code&gt; to disable all kind of auto login to make sure only authenticated users can log in. You may want to switch off the e-mail verification, because for most of the development times it will not be of much value.&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/9.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;p&gt;Finally, sice Liferay 7.4 some of the bundled modules need to be activated:&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;jquery&lt;/li&gt;
-&lt;li&gt;font awesome&lt;/li&gt;
-&lt;/ul&gt;
-&lt;p&gt;In oder to do this, please select from the &lt;code&gt;Configuration&lt;/code&gt; &amp;gt;  &lt;code&gt;System Settings&lt;/code&gt; &amp;gt; &lt;code&gt;Third Party&lt;/code&gt; and go to jquery, select the enablement and click on Update:&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/10.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;p&gt;Do the same for Font Awesome:&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/11.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;p&gt;Note that you need to reload the browser or load a new browser window to take changes to effect.&lt;/p&gt;
-&lt;h1 id=&#34;setup-sw360-for-liferay-import-lar-files&#34;&gt;Setup SW360 for Liferay: Import *.lar Files&lt;/h1&gt;
-&lt;p&gt;For the setup of SW360 in Liferay, the portal description files, &lt;code&gt;*.lar&lt;/code&gt; files need not be imported. there is no way except from doing this in the UI. If we are wrong with this, please let us know, because it is very annoying that these ever occurring steps cannot be automated with Liferay.&lt;/p&gt;
-&lt;p&gt;In order to go ahead, switch to the &lt;code&gt;SW360&lt;/code&gt; area where you can apply site settings:&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/12.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;p&gt;The go into &amp;gt;  &lt;code&gt;Publishing&lt;/code&gt; &amp;gt; &lt;code&gt;Import&lt;/code&gt; which shows like this:&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/13.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;p&gt;Then, click on the plus sign in order to import the *.lar file for public pages. You will find the lar files in the &lt;a href=&#34;https://github.com/eclipse/sw360/tree/master/frontend/configuration&#34;&gt;frontend/configuration&lt;/a&gt; folder of the sw360 repository.&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/14.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;p&gt;As for import settings, follow the selection as shown on the screenshot. It is very important that for the &lt;code&gt;Public_Pages_7_4_3_18_GA18.lar&lt;/code&gt; file the selection &lt;code&gt;Public_Pages_7_4_3_18_GA18.lar&lt;/code&gt; is made.&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/15.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;p&gt;Importing permission makes sure that pages are visible according to users rights. For public pages, it is irrelevant_the moment. Overwriting and the write as current user needs to be selected.&lt;/p&gt;
-&lt;p&gt;After successful importing, the same steps shall be repeated for the &lt;code&gt;Private_Pages_7_4_3_18_GA18.lar&lt;/code&gt; file.&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/16.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;p&gt;Make sure that &lt;code&gt;Private_Pages_7_4_3_18_GA18.lar &lt;/code&gt; is selected. Follow the other selections made as shown on the screenshot &amp;hellip; importing permissions &amp;hellip; mirror with overwriting, use the current author &amp;hellip;&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/17.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;p&gt;If you click then the liferay logo_the upper left corner where the SW360 is, you will return to the application and the following screen should appear:&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/18.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;p&gt;You can close the left menu area by clicking on the upper left icon:&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/19.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;p&gt;Click &lt;code&gt;Start&lt;/code&gt; to open the private pages. You are still logged in, so the setup account is used to view the pages.&lt;/p&gt;
-&lt;p&gt;&lt;strong&gt;Important&lt;/strong&gt; The setup account does not belong to a group. Thus, not all view are functional because they require a group membership to work correctly.&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/20.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;h1 id=&#34;import-user-accounts-for-testing&#34;&gt;Import User Accounts for Testing&lt;/h1&gt;
-&lt;p&gt;Click the SW360 &lt;code&gt;Admin&lt;/code&gt; menu which is_the right and selection the &lt;code&gt;User&lt;/code&gt; item.&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/21.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;p&gt;At the bottom of that view, select a User file to import for testing. Skip it if you will create users differently. You can find a &lt;a href=&#34;https://github.com/sw360/sw360vagrant/blob/master/shared/test_users_with_passwords_12345.csv&#34;&gt;user account import file&lt;/a&gt; to import in the &lt;code&gt;sw360vagrant&lt;/code&gt; project in the folder &lt;code&gt;shared&lt;/code&gt;. After the user have been imported successfully, they should appear in the table view.&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/22.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;p&gt;After the user have been imported successfully, they should appear in the table view. You can logout for now and use one of the just added accounts (see below):&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/23.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;h1 id=&#34;real-login&#34;&gt;Real Login&lt;/h1&gt;
-&lt;p&gt;One example user is &lt;code&gt;user@sw360.org&lt;/code&gt; with the password &lt;code&gt;12345&lt;/code&gt;. Note that in the import file with the example accounts, the password is provided with a hash. If you would like to generate new (salted) hashes, you can change your password and export the user list using the same portlet where you have imported the users. This functionality can be also used to migrate accounts between servers.&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/24.png&#34;/&gt; 
-&lt;/figure&gt;
-
-&lt;p&gt;After the successful login, SW360 will look as follows.&lt;/p&gt;
-
-&lt;figure&gt;
-    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/25.png&#34;/&gt; 
-&lt;/figure&gt;
-
-
-      </description>
-    </item>
-    
     <item>
       <title>Docs: Ubuntu 18.04 LTS, Java 11</title>
       <link>https://www.eclipse.org/sw360/docs/deployment/legacy/deploy-natively-11/</link>
diff --git a/docs/deployment/nativeinstall/index.html b/docs/deployment/legacy/nativeinstall/index.html
similarity index 91%
rename from docs/deployment/nativeinstall/index.html
rename to docs/deployment/legacy/nativeinstall/index.html
index f94450d..ba40344 100644
--- a/docs/deployment/nativeinstall/index.html
+++ b/docs/deployment/legacy/nativeinstall/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 <meta name="generator" content="Hugo 0.111.3">
-<link rel="alternate" type="application/rss&#43;xml" href="https://www.eclipse.org/sw360/docs/deployment/nativeinstall/index.xml">
+<link rel="alternate" type="application/rss&#43;xml" href="https://www.eclipse.org/sw360/docs/deployment/legacy/nativeinstall/index.xml">
 <meta name="robots" content="noindex, nofollow">
 
 
@@ -24,7 +24,7 @@
 <meta property="og:title" content="Native Install" />
 <meta property="og:description" content="SW360 Native Install Deployment" />
 <meta property="og:type" content="website" />
-<meta property="og:url" content="https://www.eclipse.org/sw360/docs/deployment/nativeinstall/" /><meta property="og:site_name" content="Eclipse SW360" />
+<meta property="og:url" content="https://www.eclipse.org/sw360/docs/deployment/legacy/nativeinstall/" /><meta property="og:site_name" content="Eclipse SW360" />
 <meta itemprop="name" content="Native Install">
 <meta itemprop="description" content="SW360 Native Install Deployment"><meta name="twitter:card" content="summary"/>
 <meta name="twitter:title" content="Native Install"/>
@@ -298,14 +298,33 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacy-check"/>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child active-path" id="m-sw360docsdeploymentlegacy-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacy-check" checked/>
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  active td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="td-sidebar-nav-active-item">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -317,29 +336,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  active td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="td-sidebar-nav-active-item">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -358,10 +358,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -374,6 +370,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -504,9 +504,9 @@
           <aside class="d-none d-xl-block col-xl-2 td-sidebar-toc d-print-none">
             
 <div class="td-page-meta ml-2 pb-1 pt-2 mb-0">
-<a href="https://github.com/eclipse/sw360.website/tree/main/content/en/docs/Deployment/NativeInstall/_index.md" class="td-page-meta--view" target="_blank" rel="noopener"><i class="fa fa-file-alt fa-fw"></i> View page source</a>
-  <a href="https://github.com/eclipse/sw360.website/edit/main/content/en/docs/Deployment/NativeInstall/_index.md" class="td-page-meta--edit" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> Edit this page</a>
-  <a href="https://github.com/eclipse/sw360.website/new/main/content/en/docs/Deployment/NativeInstall/_index.md?filename=change-me.md&amp;value=---%0Atitle%3A&#43;%22Long&#43;Page&#43;Title%22%0AlinkTitle%3A&#43;%22Short&#43;Nav&#43;Title%22%0Aweight%3A&#43;100%0Adescription%3A&#43;%3E-%0A&#43;&#43;&#43;&#43;&#43;Page&#43;description&#43;for&#43;heading&#43;and&#43;indexes.%0A---%0A%0A%23%23&#43;Heading%0A%0AEdit&#43;this&#43;template&#43;to&#43;create&#43;your&#43;new&#43;page.%0A%0A%2A&#43;Give&#43;it&#43;a&#43;good&#43;name%2C&#43;ending&#43;in&#43;%60.md%60&#43;-&#43;e.g.&#43;%60getting-started.md%60%0A%2A&#43;Edit&#43;the&#43;%22front&#43;matter%22&#43;section&#43;at&#43;the&#43;top&#43;of&#43;the&#43;page&#43;%28weight&#43;controls&#43;how&#43;its&#43;ordered&#43;amongst&#43;other&#43;pages&#43;in&#43;the&#43;same&#43;directory%3B&#43;lowest&#43;number&#43;first%29.%0A%2A&#43;Add&#43;a&#43;good&#43;commit&#43;message&#43;at&#43;the&#43;bottom&#43;of&#43;the&#43;page&#43;%28%3C80&#43;characters%3B&#43;use&#43;the&#43;extended&#43;description&#43;field&#43;for&#43;more&#43;detail%29.%0A%2A&#43;Create&#43;a&#43;new&#43;branch&#43;so&#43;you&#43;can&#43;preview&#43;your&#43;new&#43;file&#43;and&#43;request&#43;a&#43;review&#43;via&#43;Pull&#43;Request.%0A" class="td-page-meta--child" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> Create child page</a>
+<a href="https://github.com/eclipse/sw360.website/tree/main/content/en/docs/Deployment/Legacy/NativeInstall/_index.md" class="td-page-meta--view" target="_blank" rel="noopener"><i class="fa fa-file-alt fa-fw"></i> View page source</a>
+  <a href="https://github.com/eclipse/sw360.website/edit/main/content/en/docs/Deployment/Legacy/NativeInstall/_index.md" class="td-page-meta--edit" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> Edit this page</a>
+  <a href="https://github.com/eclipse/sw360.website/new/main/content/en/docs/Deployment/Legacy/NativeInstall/_index.md?filename=change-me.md&amp;value=---%0Atitle%3A&#43;%22Long&#43;Page&#43;Title%22%0AlinkTitle%3A&#43;%22Short&#43;Nav&#43;Title%22%0Aweight%3A&#43;100%0Adescription%3A&#43;%3E-%0A&#43;&#43;&#43;&#43;&#43;Page&#43;description&#43;for&#43;heading&#43;and&#43;indexes.%0A---%0A%0A%23%23&#43;Heading%0A%0AEdit&#43;this&#43;template&#43;to&#43;create&#43;your&#43;new&#43;page.%0A%0A%2A&#43;Give&#43;it&#43;a&#43;good&#43;name%2C&#43;ending&#43;in&#43;%60.md%60&#43;-&#43;e.g.&#43;%60getting-started.md%60%0A%2A&#43;Edit&#43;the&#43;%22front&#43;matter%22&#43;section&#43;at&#43;the&#43;top&#43;of&#43;the&#43;page&#43;%28weight&#43;controls&#43;how&#43;its&#43;ordered&#43;amongst&#43;other&#43;pages&#43;in&#43;the&#43;same&#43;directory%3B&#43;lowest&#43;number&#43;first%29.%0A%2A&#43;Add&#43;a&#43;good&#43;commit&#43;message&#43;at&#43;the&#43;bottom&#43;of&#43;the&#43;page&#43;%28%3C80&#43;characters%3B&#43;use&#43;the&#43;extended&#43;description&#43;field&#43;for&#43;more&#43;detail%29.%0A%2A&#43;Create&#43;a&#43;new&#43;branch&#43;so&#43;you&#43;can&#43;preview&#43;your&#43;new&#43;file&#43;and&#43;request&#43;a&#43;review&#43;via&#43;Pull&#43;Request.%0A" class="td-page-meta--child" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> Create child page</a>
   <a href="https://github.com/eclipse/sw360.website/issues/new?title=Native%20Install" class="td-page-meta--issue" target="_blank" rel="noopener"><i class="fas fa-tasks fa-fw"></i> Create documentation issue</a>
   <a href="https://github.com/eclipse/sw360/issues/new" class="td-page-meta--project-issue" target="_blank" rel="noopener"><i class="fas fa-tasks fa-fw"></i> Create project issue</a>
   
@@ -548,6 +548,8 @@
     </li>
   <li class="breadcrumb-item"><a href="https://www.eclipse.org/sw360/docs/deployment/">Deployment</a>
     </li>
+  <li class="breadcrumb-item"><a href="https://www.eclipse.org/sw360/docs/deployment/legacy/">Legacy Guides</a>
+    </li>
   <li class="breadcrumb-item active">
       <span>Native Install</span>
     </li>
@@ -587,7 +589,7 @@
             
             <div class="entry">
                 <h5>
-                    <a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/">Native Install v14 and v16</a>
+                    <a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/">Native Install v14 and v16</a>
                 </h5>
                 <p>Native-Install-Version-14-and-Version-16</p>
             </div>
@@ -595,7 +597,7 @@
             
             <div class="entry">
                 <h5>
-                    <a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/">Native Install v17</a>
+                    <a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/">Native Install v17</a>
                 </h5>
                 <p>Native-Install-Version-17</p>
             </div>
@@ -606,7 +608,7 @@
 	
 	
 	<div class="text-muted mt-5 pt-3 border-top">
-  Last modified January 5, 2023: <a href="https://github.com/eclipse/sw360.website/commit/c56f4885e0a463714b4455a1850cfbe742fadb53">fix path folder Native Install (c56f488)</a>
+  Last modified April 9, 2024: <a href="https://github.com/eclipse/sw360.website/commit/a23d9ae43e6b90067d8037a44eac9162ee371ecb">feat(content): Rearrange content to avois deployment mistakes (a23d9ae)</a>
 </div>
 
 </div>
@@ -654,24 +656,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/nativeinstall/index.xml b/docs/deployment/legacy/nativeinstall/index.xml
similarity index 99%
rename from docs/deployment/nativeinstall/index.xml
rename to docs/deployment/legacy/nativeinstall/index.xml
index 79b8afc..a9405a5 100644
--- a/docs/deployment/nativeinstall/index.xml
+++ b/docs/deployment/legacy/nativeinstall/index.xml
@@ -1,11 +1,11 @@
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
     <title>Eclipse SW360 – Native Install</title>
-    <link>https://www.eclipse.org/sw360/docs/deployment/nativeinstall/</link>
+    <link>https://www.eclipse.org/sw360/docs/deployment/legacy/nativeinstall/</link>
     <description>Recent content in Native Install on Eclipse SW360</description>
     <generator>Hugo -- gohugo.io</generator>
     
-	  <atom:link href="https://www.eclipse.org/sw360/docs/deployment/nativeinstall/index.xml" rel="self" type="application/rss+xml" />
+	  <atom:link href="https://www.eclipse.org/sw360/docs/deployment/legacy/nativeinstall/index.xml" rel="self" type="application/rss+xml" />
     
     
       
@@ -15,10 +15,10 @@
     
     <item>
       <title>Docs: Native Install v14 and v16</title>
-      <link>https://www.eclipse.org/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/</link>
+      <link>https://www.eclipse.org/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://www.eclipse.org/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/</guid>
+      <guid>https://www.eclipse.org/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/</guid>
       <description>
         
         
@@ -1360,10 +1360,10 @@ beginning and click &lt;code&gt;Upload Users&lt;/code&gt; on the right side. &lt
     
     <item>
       <title>Docs: Native Install v17</title>
-      <link>https://www.eclipse.org/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/</link>
+      <link>https://www.eclipse.org/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://www.eclipse.org/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/</guid>
+      <guid>https://www.eclipse.org/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/</guid>
       <description>
         
         
diff --git a/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/index.html b/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/index.html
similarity index 96%
rename from docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/index.html
rename to docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/index.html
index 7e012f2..6ff7292 100644
--- a/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/index.html
+++ b/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/index.html
@@ -23,12 +23,12 @@
 <meta property="og:title" content="Native Install v14 and v16" />
 <meta property="og:description" content="Native-Install-Version-14-and-Version-16" />
 <meta property="og:type" content="article" />
-<meta property="og:url" content="https://www.eclipse.org/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" /><meta property="article:section" content="docs" />
+<meta property="og:url" content="https://www.eclipse.org/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" /><meta property="article:section" content="docs" />
 
-<meta property="article:modified_time" content="2022-12-22T10:56:05+07:00" /><meta property="og:site_name" content="Eclipse SW360" />
+<meta property="article:modified_time" content="2024-04-09T18:22:28+02:00" /><meta property="og:site_name" content="Eclipse SW360" />
 <meta itemprop="name" content="Native Install v14 and v16">
 <meta itemprop="description" content="Native-Install-Version-14-and-Version-16">
-<meta itemprop="dateModified" content="2022-12-22T10:56:05+07:00" />
+<meta itemprop="dateModified" content="2024-04-09T18:22:28+02:00" />
 <meta itemprop="wordCount" content="3687">
 <meta itemprop="keywords" content="" /><meta name="twitter:card" content="summary"/>
 <meta name="twitter:title" content="Native Install v14 and v16"/>
@@ -302,14 +302,33 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacy-check"/>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child active-path" id="m-sw360docsdeploymentlegacy-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacy-check" checked/>
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child active-path" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check" checked/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  active td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="td-sidebar-nav-active-item">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child active-path" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check" checked/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  active td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="td-sidebar-nav-active-item">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -508,9 +508,9 @@
           <aside class="d-none d-xl-block col-xl-2 td-sidebar-toc d-print-none">
             
 <div class="td-page-meta ml-2 pb-1 pt-2 mb-0">
-<a href="https://github.com/eclipse/sw360.website/tree/main/content/en/docs/Deployment/NativeInstall/Native-Install-SW360-Version-14.0.0-and-16.0.0.md" class="td-page-meta--view" target="_blank" rel="noopener"><i class="fa fa-file-alt fa-fw"></i> View page source</a>
-  <a href="https://github.com/eclipse/sw360.website/edit/main/content/en/docs/Deployment/NativeInstall/Native-Install-SW360-Version-14.0.0-and-16.0.0.md" class="td-page-meta--edit" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> Edit this page</a>
-  <a href="https://github.com/eclipse/sw360.website/new/main/content/en/docs/Deployment/NativeInstall/Native-Install-SW360-Version-14.0.0-and-16.0.0.md?filename=change-me.md&amp;value=---%0Atitle%3A&#43;%22Long&#43;Page&#43;Title%22%0AlinkTitle%3A&#43;%22Short&#43;Nav&#43;Title%22%0Aweight%3A&#43;100%0Adescription%3A&#43;%3E-%0A&#43;&#43;&#43;&#43;&#43;Page&#43;description&#43;for&#43;heading&#43;and&#43;indexes.%0A---%0A%0A%23%23&#43;Heading%0A%0AEdit&#43;this&#43;template&#43;to&#43;create&#43;your&#43;new&#43;page.%0A%0A%2A&#43;Give&#43;it&#43;a&#43;good&#43;name%2C&#43;ending&#43;in&#43;%60.md%60&#43;-&#43;e.g.&#43;%60getting-started.md%60%0A%2A&#43;Edit&#43;the&#43;%22front&#43;matter%22&#43;section&#43;at&#43;the&#43;top&#43;of&#43;the&#43;page&#43;%28weight&#43;controls&#43;how&#43;its&#43;ordered&#43;amongst&#43;other&#43;pages&#43;in&#43;the&#43;same&#43;directory%3B&#43;lowest&#43;number&#43;first%29.%0A%2A&#43;Add&#43;a&#43;good&#43;commit&#43;message&#43;at&#43;the&#43;bottom&#43;of&#43;the&#43;page&#43;%28%3C80&#43;characters%3B&#43;use&#43;the&#43;extended&#43;description&#43;field&#43;for&#43;more&#43;detail%29.%0A%2A&#43;Create&#43;a&#43;new&#43;branch&#43;so&#43;you&#43;can&#43;preview&#43;your&#43;new&#43;file&#43;and&#43;request&#43;a&#43;review&#43;via&#43;Pull&#43;Request.%0A" class="td-page-meta--child" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> Create child page</a>
+<a href="https://github.com/eclipse/sw360.website/tree/main/content/en/docs/Deployment/Legacy/NativeInstall/Native-Install-SW360-Version-14.0.0-and-16.0.0.md" class="td-page-meta--view" target="_blank" rel="noopener"><i class="fa fa-file-alt fa-fw"></i> View page source</a>
+  <a href="https://github.com/eclipse/sw360.website/edit/main/content/en/docs/Deployment/Legacy/NativeInstall/Native-Install-SW360-Version-14.0.0-and-16.0.0.md" class="td-page-meta--edit" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> Edit this page</a>
+  <a href="https://github.com/eclipse/sw360.website/new/main/content/en/docs/Deployment/Legacy/NativeInstall/Native-Install-SW360-Version-14.0.0-and-16.0.0.md?filename=change-me.md&amp;value=---%0Atitle%3A&#43;%22Long&#43;Page&#43;Title%22%0AlinkTitle%3A&#43;%22Short&#43;Nav&#43;Title%22%0Aweight%3A&#43;100%0Adescription%3A&#43;%3E-%0A&#43;&#43;&#43;&#43;&#43;Page&#43;description&#43;for&#43;heading&#43;and&#43;indexes.%0A---%0A%0A%23%23&#43;Heading%0A%0AEdit&#43;this&#43;template&#43;to&#43;create&#43;your&#43;new&#43;page.%0A%0A%2A&#43;Give&#43;it&#43;a&#43;good&#43;name%2C&#43;ending&#43;in&#43;%60.md%60&#43;-&#43;e.g.&#43;%60getting-started.md%60%0A%2A&#43;Edit&#43;the&#43;%22front&#43;matter%22&#43;section&#43;at&#43;the&#43;top&#43;of&#43;the&#43;page&#43;%28weight&#43;controls&#43;how&#43;its&#43;ordered&#43;amongst&#43;other&#43;pages&#43;in&#43;the&#43;same&#43;directory%3B&#43;lowest&#43;number&#43;first%29.%0A%2A&#43;Add&#43;a&#43;good&#43;commit&#43;message&#43;at&#43;the&#43;bottom&#43;of&#43;the&#43;page&#43;%28%3C80&#43;characters%3B&#43;use&#43;the&#43;extended&#43;description&#43;field&#43;for&#43;more&#43;detail%29.%0A%2A&#43;Create&#43;a&#43;new&#43;branch&#43;so&#43;you&#43;can&#43;preview&#43;your&#43;new&#43;file&#43;and&#43;request&#43;a&#43;review&#43;via&#43;Pull&#43;Request.%0A" class="td-page-meta--child" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> Create child page</a>
   <a href="https://github.com/eclipse/sw360.website/issues/new?title=Native%20Install%20v14%20and%20v16" class="td-page-meta--issue" target="_blank" rel="noopener"><i class="fas fa-tasks fa-fw"></i> Create documentation issue</a>
   <a href="https://github.com/eclipse/sw360/issues/new" class="td-page-meta--project-issue" target="_blank" rel="noopener"><i class="fas fa-tasks fa-fw"></i> Create project issue</a>
   
@@ -619,7 +619,9 @@
     </li>
   <li class="breadcrumb-item"><a href="https://www.eclipse.org/sw360/docs/deployment/">Deployment</a>
     </li>
-  <li class="breadcrumb-item"><a href="https://www.eclipse.org/sw360/docs/deployment/nativeinstall/">Native Install</a>
+  <li class="breadcrumb-item"><a href="https://www.eclipse.org/sw360/docs/deployment/legacy/">Legacy Guides</a>
+    </li>
+  <li class="breadcrumb-item"><a href="https://www.eclipse.org/sw360/docs/deployment/legacy/nativeinstall/">Native Install</a>
     </li>
   <li class="breadcrumb-item active">
       <span>Native-Install v14 and v16</span>
@@ -1981,7 +1983,7 @@ beginning and click <code>Upload Users</code> on the right side. <a href="https:
 	
 	
 	<div class="text-muted mt-5 pt-3 border-top">
-  Last modified December 22, 2022: <a href="https://github.com/eclipse/sw360.website/commit/f1071cc248d1bea1fa2f6ad4293b29a57aa1b3bd">install-native-17.0.0 (f1071cc)</a>
+  Last modified April 9, 2024: <a href="https://github.com/eclipse/sw360.website/commit/a23d9ae43e6b90067d8037a44eac9162ee371ecb">feat(content): Rearrange content to avois deployment mistakes (a23d9ae)</a>
 </div>
 
 </div>
@@ -2030,24 +2032,24 @@ beginning and click <code>Upload Users</code> on the right side. <a href="https:
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/index.html b/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/index.html
similarity index 95%
rename from docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/index.html
rename to docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/index.html
index af23608..84765ae 100644
--- a/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/index.html
+++ b/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/index.html
@@ -23,12 +23,12 @@
 <meta property="og:title" content="Native Install v17" />
 <meta property="og:description" content="Native-Install-Version-17" />
 <meta property="og:type" content="article" />
-<meta property="og:url" content="https://www.eclipse.org/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" /><meta property="article:section" content="docs" />
+<meta property="og:url" content="https://www.eclipse.org/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" /><meta property="article:section" content="docs" />
 
-<meta property="article:modified_time" content="2023-06-22T11:25:27+07:00" /><meta property="og:site_name" content="Eclipse SW360" />
+<meta property="article:modified_time" content="2024-04-09T18:22:28+02:00" /><meta property="og:site_name" content="Eclipse SW360" />
 <meta itemprop="name" content="Native Install v17">
 <meta itemprop="description" content="Native-Install-Version-17">
-<meta itemprop="dateModified" content="2023-06-22T11:25:27+07:00" />
+<meta itemprop="dateModified" content="2024-04-09T18:22:28+02:00" />
 <meta itemprop="wordCount" content="3632">
 <meta itemprop="keywords" content="" /><meta name="twitter:card" content="summary"/>
 <meta name="twitter:title" content="Native Install v17"/>
@@ -302,14 +302,33 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacy-check"/>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child active-path" id="m-sw360docsdeploymentlegacy-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacy-check" checked/>
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child active-path" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check" checked/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  active td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="td-sidebar-nav-active-item">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child active-path" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check" checked/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  active td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="td-sidebar-nav-active-item">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -508,9 +508,9 @@
           <aside class="d-none d-xl-block col-xl-2 td-sidebar-toc d-print-none">
             
 <div class="td-page-meta ml-2 pb-1 pt-2 mb-0">
-<a href="https://github.com/eclipse/sw360.website/tree/main/content/en/docs/Deployment/NativeInstall/Native-install-SW360-Version-17.0.0.md" class="td-page-meta--view" target="_blank" rel="noopener"><i class="fa fa-file-alt fa-fw"></i> View page source</a>
-  <a href="https://github.com/eclipse/sw360.website/edit/main/content/en/docs/Deployment/NativeInstall/Native-install-SW360-Version-17.0.0.md" class="td-page-meta--edit" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> Edit this page</a>
-  <a href="https://github.com/eclipse/sw360.website/new/main/content/en/docs/Deployment/NativeInstall/Native-install-SW360-Version-17.0.0.md?filename=change-me.md&amp;value=---%0Atitle%3A&#43;%22Long&#43;Page&#43;Title%22%0AlinkTitle%3A&#43;%22Short&#43;Nav&#43;Title%22%0Aweight%3A&#43;100%0Adescription%3A&#43;%3E-%0A&#43;&#43;&#43;&#43;&#43;Page&#43;description&#43;for&#43;heading&#43;and&#43;indexes.%0A---%0A%0A%23%23&#43;Heading%0A%0AEdit&#43;this&#43;template&#43;to&#43;create&#43;your&#43;new&#43;page.%0A%0A%2A&#43;Give&#43;it&#43;a&#43;good&#43;name%2C&#43;ending&#43;in&#43;%60.md%60&#43;-&#43;e.g.&#43;%60getting-started.md%60%0A%2A&#43;Edit&#43;the&#43;%22front&#43;matter%22&#43;section&#43;at&#43;the&#43;top&#43;of&#43;the&#43;page&#43;%28weight&#43;controls&#43;how&#43;its&#43;ordered&#43;amongst&#43;other&#43;pages&#43;in&#43;the&#43;same&#43;directory%3B&#43;lowest&#43;number&#43;first%29.%0A%2A&#43;Add&#43;a&#43;good&#43;commit&#43;message&#43;at&#43;the&#43;bottom&#43;of&#43;the&#43;page&#43;%28%3C80&#43;characters%3B&#43;use&#43;the&#43;extended&#43;description&#43;field&#43;for&#43;more&#43;detail%29.%0A%2A&#43;Create&#43;a&#43;new&#43;branch&#43;so&#43;you&#43;can&#43;preview&#43;your&#43;new&#43;file&#43;and&#43;request&#43;a&#43;review&#43;via&#43;Pull&#43;Request.%0A" class="td-page-meta--child" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> Create child page</a>
+<a href="https://github.com/eclipse/sw360.website/tree/main/content/en/docs/Deployment/Legacy/NativeInstall/Native-install-SW360-Version-17.0.0.md" class="td-page-meta--view" target="_blank" rel="noopener"><i class="fa fa-file-alt fa-fw"></i> View page source</a>
+  <a href="https://github.com/eclipse/sw360.website/edit/main/content/en/docs/Deployment/Legacy/NativeInstall/Native-install-SW360-Version-17.0.0.md" class="td-page-meta--edit" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> Edit this page</a>
+  <a href="https://github.com/eclipse/sw360.website/new/main/content/en/docs/Deployment/Legacy/NativeInstall/Native-install-SW360-Version-17.0.0.md?filename=change-me.md&amp;value=---%0Atitle%3A&#43;%22Long&#43;Page&#43;Title%22%0AlinkTitle%3A&#43;%22Short&#43;Nav&#43;Title%22%0Aweight%3A&#43;100%0Adescription%3A&#43;%3E-%0A&#43;&#43;&#43;&#43;&#43;Page&#43;description&#43;for&#43;heading&#43;and&#43;indexes.%0A---%0A%0A%23%23&#43;Heading%0A%0AEdit&#43;this&#43;template&#43;to&#43;create&#43;your&#43;new&#43;page.%0A%0A%2A&#43;Give&#43;it&#43;a&#43;good&#43;name%2C&#43;ending&#43;in&#43;%60.md%60&#43;-&#43;e.g.&#43;%60getting-started.md%60%0A%2A&#43;Edit&#43;the&#43;%22front&#43;matter%22&#43;section&#43;at&#43;the&#43;top&#43;of&#43;the&#43;page&#43;%28weight&#43;controls&#43;how&#43;its&#43;ordered&#43;amongst&#43;other&#43;pages&#43;in&#43;the&#43;same&#43;directory%3B&#43;lowest&#43;number&#43;first%29.%0A%2A&#43;Add&#43;a&#43;good&#43;commit&#43;message&#43;at&#43;the&#43;bottom&#43;of&#43;the&#43;page&#43;%28%3C80&#43;characters%3B&#43;use&#43;the&#43;extended&#43;description&#43;field&#43;for&#43;more&#43;detail%29.%0A%2A&#43;Create&#43;a&#43;new&#43;branch&#43;so&#43;you&#43;can&#43;preview&#43;your&#43;new&#43;file&#43;and&#43;request&#43;a&#43;review&#43;via&#43;Pull&#43;Request.%0A" class="td-page-meta--child" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> Create child page</a>
   <a href="https://github.com/eclipse/sw360.website/issues/new?title=Native%20Install%20v17" class="td-page-meta--issue" target="_blank" rel="noopener"><i class="fas fa-tasks fa-fw"></i> Create documentation issue</a>
   <a href="https://github.com/eclipse/sw360/issues/new" class="td-page-meta--project-issue" target="_blank" rel="noopener"><i class="fas fa-tasks fa-fw"></i> Create project issue</a>
   
@@ -591,7 +591,9 @@
     </li>
   <li class="breadcrumb-item"><a href="https://www.eclipse.org/sw360/docs/deployment/">Deployment</a>
     </li>
-  <li class="breadcrumb-item"><a href="https://www.eclipse.org/sw360/docs/deployment/nativeinstall/">Native Install</a>
+  <li class="breadcrumb-item"><a href="https://www.eclipse.org/sw360/docs/deployment/legacy/">Legacy Guides</a>
+    </li>
+  <li class="breadcrumb-item"><a href="https://www.eclipse.org/sw360/docs/deployment/legacy/nativeinstall/">Native Install</a>
     </li>
   <li class="breadcrumb-item active">
       <span>Native-Install v17</span>
@@ -1816,7 +1818,7 @@ beginning and click <code>Upload Users</code> on the right side. <a href="https:
 	
 	
 	<div class="text-muted mt-5 pt-3 border-top">
-  Last modified June 22, 2023: <a href="https://github.com/eclipse/sw360.website/commit/af2294c6255585c451337c61f071faa4ee5f4ec1">fix(update): Update config log4j2 for native install sw360 (af2294c)</a>
+  Last modified April 9, 2024: <a href="https://github.com/eclipse/sw360.website/commit/a23d9ae43e6b90067d8037a44eac9162ee371ecb">feat(content): Rearrange content to avois deployment mistakes (a23d9ae)</a>
 </div>
 
 </div>
@@ -1865,24 +1867,24 @@ beginning and click <code>Upload Users</code> on the right side. <a href="https:
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/upgrading/deploy-upgrade-to-liferay-7.3-and-java-11/index.html b/docs/deployment/upgrading/deploy-upgrade-to-liferay-7.3-and-java-11/index.html
index 40abad8..4a62dac 100644
--- a/docs/deployment/upgrading/deploy-upgrade-to-liferay-7.3-and-java-11/index.html
+++ b/docs/deployment/upgrading/deploy-upgrade-to-liferay-7.3-and-java-11/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -917,24 +917,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/upgrading/index.html b/docs/deployment/upgrading/index.html
index 65d9ec4..3d49c9e 100644
--- a/docs/deployment/upgrading/index.html
+++ b/docs/deployment/upgrading/index.html
@@ -298,6 +298,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -305,7 +309,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -317,29 +336,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -358,10 +358,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -374,6 +370,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -616,6 +616,14 @@
                 <p></p>
             </div>
         
+            
+            <div class="entry">
+                <h5>
+                    <a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/">Upgrade SW360 from 17.00 to 18.1.0</a>
+                </h5>
+                <p></p>
+            </div>
+        
     
 </div>
 
@@ -670,24 +678,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/upgrading/index.xml b/docs/deployment/upgrading/index.xml
index a467d1c..3c1c322 100644
--- a/docs/deployment/upgrading/index.xml
+++ b/docs/deployment/upgrading/index.xml
@@ -1024,6 +1024,134 @@ be aware that some scripts are using an internal dry-run switch which you have t
 
 &lt;p&gt;Make sure that &lt;code&gt;Private_Pages_7_4_3_18_GA18.lar &lt;/code&gt; is selected. Follow the other selections made as shown on the screenshot &amp;hellip; importing permissions &amp;hellip; mirror with overwriting, use the current author &amp;hellip;&lt;/p&gt;
 
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/17.png&#34;/&gt; 
+&lt;/figure&gt;
+
+
+      </description>
+    </item>
+    
+    <item>
+      <title>Docs: Upgrade SW360 from 17.00 to 18.1.0</title>
+      <link>https://www.eclipse.org/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/</link>
+      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
+      
+      <guid>https://www.eclipse.org/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/</guid>
+      <description>
+        
+        
+        &lt;p&gt;&lt;a href=&#34;#ref1&#34;&gt;Version of libraries&lt;/a&gt;&lt;/p&gt;
+&lt;p&gt;&lt;a href=&#34;#ref2&#34;&gt;Checkout source code SW360 to Tag Version 18.1.0&lt;/a&gt;&lt;/p&gt;
+&lt;p&gt;&lt;a href=&#34;#ref3&#34;&gt;Config Couchdb Lucene&lt;/a&gt;&lt;/p&gt;
+&lt;p&gt;&lt;a href=&#34;#ref4&#34;&gt;Build and deploy&lt;/a&gt;&lt;/p&gt;
+&lt;p&gt;&lt;a href=&#34;#ref5&#34;&gt;Start and Configure Liferay&lt;/a&gt;&lt;/p&gt;
+&lt;p&gt;&lt;a href=&#34;#ref6&#34;&gt;Setup SW360 for Liferay: Import *.lar Files&lt;/a&gt;&lt;/p&gt;
+&lt;h2 id=&#34;ref1&#34;&gt;Version of libraries&lt;/h2&gt;
+&lt;table&gt;
+&lt;thead&gt;
+&lt;tr&gt;
+&lt;th style=&#34;text-align:left&#34;&gt;Package Name&lt;/th&gt;
+&lt;th style=&#34;text-align:center&#34;&gt;Version&lt;/th&gt;
+&lt;/tr&gt;
+&lt;/thead&gt;
+&lt;tbody&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Liferay&lt;/td&gt;
+&lt;td style=&#34;text-align:center&#34;&gt;7.4.3&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Tomcat&lt;/td&gt;
+&lt;td style=&#34;text-align:center&#34;&gt;9.0.56&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Couchdb&lt;/td&gt;
+&lt;td style=&#34;text-align:center&#34;&gt;3.2.2&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Open JDK&lt;/td&gt;
+&lt;td style=&#34;text-align:center&#34;&gt;11.0.15&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Thrift&lt;/td&gt;
+&lt;td style=&#34;text-align:center&#34;&gt;0.16.0&lt;/td&gt;
+&lt;/tr&gt;
+&lt;/tbody&gt;
+&lt;/table&gt;
+&lt;p&gt;To check couchdb version: run &lt;code&gt;curl http://localhost_or_yourcouchdbserver:5984 | json_pp&lt;/code&gt;&lt;/p&gt;
+&lt;h2 id=&#34;ref2&#34;&gt;Prepare source code to use release 18.1.0&lt;/h2&gt;
+&lt;p&gt;Link contains source: &lt;a href=&#34;https://github.com/eclipse/sw360.git&#34;&gt;https://github.com/eclipse/sw360.git&lt;/a&gt;&lt;/p&gt;
+&lt;p&gt;Create folder to store new source code of version 18.1.0:&lt;/p&gt;
+&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-sh&#34; data-lang=&#34;sh&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ mkdir /home/user/work17to18
+&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;Clone source code from github:&lt;/p&gt;
+&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-sh&#34; data-lang=&#34;sh&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ git clone https://github.com/eclipse/sw360.git
+&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;Checkout to tag Version 18.1.0&lt;/p&gt;
+&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-sh&#34; data-lang=&#34;sh&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ git checkout sw360-18.1.0-M1
+&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;Set Environment for &lt;code&gt;${LIFERAY_INSTALL_7_4}&lt;/code&gt;&lt;/p&gt;
+&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-sh&#34; data-lang=&#34;sh&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ &lt;span style=&#34;color:#366&#34;&gt;export&lt;/span&gt; &lt;span style=&#34;color:#033&#34;&gt;LIFERAY_INSTALL_7_4&lt;/span&gt;&lt;span style=&#34;color:#555&#34;&gt;=&lt;/span&gt;/opt/liferay-ce-portal-7.4.3.18-ga18
+&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;Move folder &lt;code&gt;/home/user/work17to18/sw360&lt;/code&gt; run command&lt;/p&gt;
+&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-sh&#34; data-lang=&#34;sh&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ mvn clean install -DskipTests
+&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;Copy dependencies from folder &lt;strong&gt;/home/user/work17to18/sw360/deploy/jars&lt;/strong&gt; to &lt;strong&gt;${LIFERAY_INSTALL_7_4}/osgi/modules&lt;/strong&gt;&lt;/p&gt;
+&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-sh&#34; data-lang=&#34;sh&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ &lt;span style=&#34;color:#366&#34;&gt;cd&lt;/span&gt; /home/user/work17to18/sw360/utils/jars
+&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ sudo cp *.jar /opt/liferay-ce-portal-7.4.3.18-ga18/osgi/modules/
+&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;h2 id=&#34;ref3&#34;&gt;Config Couchdb Lucene&lt;/h2&gt;
+&lt;p&gt;Run following commands to config Couchdb Lucene (remember to replace &lt;strong&gt;COUCHDB_USER&lt;/strong&gt; and &lt;strong&gt;COUCHDB_PASSWORD&lt;/strong&gt; by username and password of couchdb):&lt;/p&gt;
+&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-sh&#34; data-lang=&#34;sh&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ &lt;span style=&#34;color:#366&#34;&gt;cd&lt;/span&gt; /home/user/work17to18/sw360/third-party/couchdb-lucene/
+&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ sed -i &lt;span style=&#34;color:#c30&#34;&gt;&amp;#34;s/allowLeadingWildcard=false/allowLeadingWildcard=true/&amp;#34;&lt;/span&gt; ./src/main/resources/couchdb-lucene.ini
+&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ sed -i &lt;span style=&#34;color:#c30&#34;&gt;&amp;#34;s/localhost:5984/COUCHDB_USER:COUCHDB_USER@localhost:5984/&amp;#34;&lt;/span&gt; ./src/main/resources/couchdb-lucene.ini
+&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ mvn clean install war:war
+&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ cp target/couchdb-lucene-*.war /opt/liferay-ce-portal-7.4.3.18-ga18/tomcat-9.0.56/webapps/couchdb-lucene.war
+&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;h2 id=&#34;ref4&#34;&gt;Build and deploy&lt;/h2&gt;
+&lt;p&gt;Set Environment for &lt;code&gt;${LIFERAY_INSTALL_7_4}&lt;/code&gt;&lt;/p&gt;
+&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-sh&#34; data-lang=&#34;sh&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ &lt;span style=&#34;color:#366&#34;&gt;cd&lt;/span&gt; /home/user/work17to18/sw360
+&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ &lt;span style=&#34;color:#366&#34;&gt;export&lt;/span&gt; &lt;span style=&#34;color:#033&#34;&gt;LIFERAY_INSTALL_7_4&lt;/span&gt;&lt;span style=&#34;color:#555&#34;&gt;=&lt;/span&gt;/opt/liferay-ce-portal-7.4.3.18-ga18
+&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;To clean everything and install without running the tests&lt;/p&gt;
+&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-sh&#34; data-lang=&#34;sh&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ mvn clean install -DskipTests
+&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;For deployment run the command&lt;/p&gt;
+&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-sh&#34; data-lang=&#34;sh&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ mvn package -P deploy -Dbase.deploy.dir&lt;span style=&#34;color:#555&#34;&gt;=&lt;/span&gt;. -Dliferay.deploy.dir&lt;span style=&#34;color:#555&#34;&gt;=&lt;/span&gt;&lt;span style=&#34;color:#a00&#34;&gt;${&lt;/span&gt;&lt;span style=&#34;color:#033&#34;&gt;LIFERAY_INSTALL_7_4&lt;/span&gt;&lt;span style=&#34;color:#a00&#34;&gt;}&lt;/span&gt;/deploy -Dbackend.deploy.dir&lt;span style=&#34;color:#555&#34;&gt;=&lt;/span&gt;&lt;span style=&#34;color:#a00&#34;&gt;${&lt;/span&gt;&lt;span style=&#34;color:#033&#34;&gt;LIFERAY_INSTALL_7_4&lt;/span&gt;&lt;span style=&#34;color:#a00&#34;&gt;}&lt;/span&gt;/tomcat-9.0.56/webapps -Drest.deploy.dir&lt;span style=&#34;color:#555&#34;&gt;=&lt;/span&gt;&lt;span style=&#34;color:#a00&#34;&gt;${&lt;/span&gt;&lt;span style=&#34;color:#033&#34;&gt;LIFERAY_INSTALL_7_4&lt;/span&gt;&lt;span style=&#34;color:#a00&#34;&gt;}&lt;/span&gt;/tomcat-9.0.56/webapps -Dtest&lt;span style=&#34;color:#555&#34;&gt;=&lt;/span&gt;org/eclipse/sw360/rest/resourceserver/restdocs/* -Dsurefire.failIfNoSpecifiedTests&lt;span style=&#34;color:#555&#34;&gt;=&lt;/span&gt;&lt;span style=&#34;color:#366&#34;&gt;false&lt;/span&gt; -DRunRestIntegrationTest&lt;span style=&#34;color:#555&#34;&gt;=&lt;/span&gt;&lt;span style=&#34;color:#366&#34;&gt;true&lt;/span&gt;
+&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;h2 id=&#34;ref5&#34;&gt;Start and Configure Liferay&lt;/h2&gt;
+&lt;p&gt;Set Environment for &lt;code&gt;${LIFERAY_INSTALL_7_4}&lt;/code&gt;&lt;/p&gt;
+&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-sh&#34; data-lang=&#34;sh&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ &lt;span style=&#34;color:#366&#34;&gt;export&lt;/span&gt; &lt;span style=&#34;color:#033&#34;&gt;LIFERAY_INSTALL_7_4&lt;/span&gt;&lt;span style=&#34;color:#555&#34;&gt;=&lt;/span&gt;/opt/liferay-ce-portal-7.4.3.18-ga18&lt;span style=&#34;color:#c30&#34;&gt;`&lt;/span&gt;
+&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;Start liferay&lt;/p&gt;
+&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-sh&#34; data-lang=&#34;sh&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ &lt;span style=&#34;color:#a00&#34;&gt;${&lt;/span&gt;&lt;span style=&#34;color:#033&#34;&gt;LIFERAY_INSTALL_7_4&lt;/span&gt;&lt;span style=&#34;color:#a00&#34;&gt;}&lt;/span&gt;/tomcat-9.0.56/bin/startup.sh
+&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;Log&lt;/p&gt;
+&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-sh&#34; data-lang=&#34;sh&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ tail -f &lt;span style=&#34;color:#a00&#34;&gt;${&lt;/span&gt;&lt;span style=&#34;color:#033&#34;&gt;LIFERAY_INSTALL_7_4&lt;/span&gt;&lt;span style=&#34;color:#a00&#34;&gt;}&lt;/span&gt;/tomcat-9.0.56/logs/catalina.out
+&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;SW360 url : &lt;a href=&#34;https://localhost:8080&#34;&gt;https://localhost:8080&lt;/a&gt;&lt;/p&gt;
+&lt;h2 id=&#34;ref6&#34;&gt;Setup SW360 for Liferay: Import *.lar Files&lt;/h2&gt;
+&lt;p&gt;&lt;strong&gt;You need over-import lar files to the portet can show the sw360 icons/images&lt;/strong&gt;&lt;/p&gt;
+&lt;p&gt;For the setup of SW360 in Liferay, the portal description files, &lt;code&gt;*.lar&lt;/code&gt; files need not be imported. There is no way except from doing this in the UI. If we are wrong with this, please let us know, because it is very annoying that these ever occurring steps cannot be automated with Liferay.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-01-24_14.49.41.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;The go into &amp;gt; &lt;code&gt;Publishing&lt;/code&gt; &amp;gt; &lt;code&gt;Import&lt;/code&gt; which shows like this:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/13.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Then, click on the plus sign in order to import the *.lar file for public pages. You will find the lar files in the &lt;a href=&#34;https://github.com/eclipse/sw360/tree/master/frontend/configuration&#34;&gt;frontend/configuration&lt;/a&gt; folder of the sw360 repository.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/14.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;As for import settings, follow the selection as shown on the screenshot. It is very important that for the &lt;code&gt;Public_Pages_7_4_3_18_GA18.lar&lt;/code&gt; file the selection &lt;code&gt;Public_Pages_7_4_3_18_GA18.lar&lt;/code&gt; is made.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/15.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Importing permission makes sure that pages are visible according to users rights. For public pages, it is irrelevant_the moment. Overwriting and the write as current user needs to be selected.&lt;/p&gt;
+&lt;p&gt;After successful importing, the same steps shall be repeated for the &lt;code&gt;Private_Pages_7_4_3_18_GA18.lar&lt;/code&gt; file.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/16.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Make sure that &lt;code&gt;Private_Pages_7_4_3_18_GA18.lar &lt;/code&gt; is selected. Follow the other selections made as shown on the screenshot &amp;hellip; importing permissions &amp;hellip; mirror with overwriting, use the current author &amp;hellip;&lt;/p&gt;
+
 &lt;figure&gt;
     &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy74/17.png&#34;/&gt; 
 &lt;/figure&gt;
diff --git a/docs/deployment/upgrading/upgrade-sw360-from-14.0.0-to-15.0.0/index.html b/docs/deployment/upgrading/upgrade-sw360-from-14.0.0-to-15.0.0/index.html
index 69d12f2..77888a1 100644
--- a/docs/deployment/upgrading/upgrade-sw360-from-14.0.0-to-15.0.0/index.html
+++ b/docs/deployment/upgrading/upgrade-sw360-from-14.0.0-to-15.0.0/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -801,24 +801,24 @@ beginning and click <code>Upload Users</code> on the right side. <a href="https:
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/upgrading/upgrade_version_sw360_15_to_16/index.html b/docs/deployment/upgrading/upgrade_version_sw360_15_to_16/index.html
index 318c055..012db33 100644
--- a/docs/deployment/upgrading/upgrade_version_sw360_15_to_16/index.html
+++ b/docs/deployment/upgrading/upgrade_version_sw360_15_to_16/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -849,24 +849,24 @@ For deployment run the command
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/index.html b/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/index.html
index e8ea418..4d73227 100644
--- a/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/index.html
+++ b/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/index.html
@@ -330,6 +330,10 @@ Checkout to tag Version 17."/>
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  active td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="td-sidebar-nav-active-item">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -337,7 +341,22 @@ Checkout to tag Version 17."/>
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -349,29 +368,10 @@ Checkout to tag Version 17."/>
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -390,10 +390,6 @@ Checkout to tag Version 17."/>
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -406,6 +402,10 @@ Checkout to tag Version 17."/>
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -1041,24 +1041,24 @@ be aware that some scripts are using an internal dry-run switch which you have t
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/deployment/deploy-docker/index.html b/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/index.html
similarity index 78%
rename from docs/deployment/deploy-docker/index.html
rename to docs/deployment/upgrading/upgrade_version_sw360_17_to_18/index.html
index 2170025..6896815 100644
--- a/docs/deployment/deploy-docker/index.html
+++ b/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/index.html
@@ -18,25 +18,50 @@
 <link rel="icon" type="image/png" href="/sw360/favicons/android-144x144.png" sizes="144x144">
 <link rel="icon" type="image/png" href="/sw360/favicons/android-192x192.png" sizes="192x192">
 
-<title>Docker Deployment | Eclipse SW360</title>
-<meta name="description" content="Deploy SW360 with Docker
-">
-<meta property="og:title" content="Docker Deployment" />
-<meta property="og:description" content="Deploy SW360 with Docker
-" />
+<title>Upgrade SW360 from 17.00 to 18.1.0 | Eclipse SW360</title>
+<meta name="description" content="Version of libraries
+Checkout source code SW360 to Tag Version 18.1.0
+Config Couchdb Lucene
+Build and deploy
+Start and Configure Liferay
+Setup SW360 …">
+<meta property="og:title" content="Upgrade SW360 from 17.00 to 18.1.0" />
+<meta property="og:description" content="Version of libraries
+Checkout source code SW360 to Tag Version 18.1.0
+Config Couchdb Lucene
+Build and deploy
+Start and Configure Liferay
+Setup SW360 for Liferay: Import *.lar Files
+Version of libraries Package Name Version Liferay 7.4.3 Tomcat 9.0.56 Couchdb 3.2.2 Open JDK 11.0.15 Thrift 0.16.0 To check couchdb version: run curl http://localhost_or_yourcouchdbserver:5984 | json_pp
+Prepare source code to use release 18.1.0 Link contains source: https://github.com/eclipse/sw360.git
+Create folder to store new source code of version 18." />
 <meta property="og:type" content="article" />
-<meta property="og:url" content="https://www.eclipse.org/sw360/docs/deployment/deploy-docker/" /><meta property="article:section" content="docs" />
-
-<meta property="article:modified_time" content="2022-06-22T22:10:18+02:00" /><meta property="og:site_name" content="Eclipse SW360" />
-<meta itemprop="name" content="Docker Deployment">
-<meta itemprop="description" content="Deploy SW360 with Docker
-">
-<meta itemprop="dateModified" content="2022-06-22T22:10:18+02:00" />
-<meta itemprop="wordCount" content="447">
+<meta property="og:url" content="https://www.eclipse.org/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" /><meta property="article:section" content="docs" />
+
+<meta property="article:modified_time" content="2024-02-28T09:35:24+07:00" /><meta property="og:site_name" content="Eclipse SW360" />
+<meta itemprop="name" content="Upgrade SW360 from 17.00 to 18.1.0">
+<meta itemprop="description" content="Version of libraries
+Checkout source code SW360 to Tag Version 18.1.0
+Config Couchdb Lucene
+Build and deploy
+Start and Configure Liferay
+Setup SW360 for Liferay: Import *.lar Files
+Version of libraries Package Name Version Liferay 7.4.3 Tomcat 9.0.56 Couchdb 3.2.2 Open JDK 11.0.15 Thrift 0.16.0 To check couchdb version: run curl http://localhost_or_yourcouchdbserver:5984 | json_pp
+Prepare source code to use release 18.1.0 Link contains source: https://github.com/eclipse/sw360.git
+Create folder to store new source code of version 18.">
+<meta itemprop="dateModified" content="2024-02-28T09:35:24+07:00" />
+<meta itemprop="wordCount" content="451">
 <meta itemprop="keywords" content="" /><meta name="twitter:card" content="summary"/>
-<meta name="twitter:title" content="Docker Deployment"/>
-<meta name="twitter:description" content="Deploy SW360 with Docker
-"/>
+<meta name="twitter:title" content="Upgrade SW360 from 17.00 to 18.1.0"/>
+<meta name="twitter:description" content="Version of libraries
+Checkout source code SW360 to Tag Version 18.1.0
+Config Couchdb Lucene
+Build and deploy
+Start and Configure Liferay
+Setup SW360 for Liferay: Import *.lar Files
+Version of libraries Package Name Version Liferay 7.4.3 Tomcat 9.0.56 Couchdb 3.2.2 Open JDK 11.0.15 Thrift 0.16.0 To check couchdb version: run curl http://localhost_or_yourcouchdbserver:5984 | json_pp
+Prepare source code to use release 18.1.0 Link contains source: https://github.com/eclipse/sw360.git
+Create folder to store new source code of version 18."/>
 
 
 
@@ -285,8 +310,8 @@
   
 </li>
   </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentupgrading-li">
-  <input type="checkbox" id="m-sw360docsdeploymentupgrading-check"/>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child active-path" id="m-sw360docsdeploymentupgrading-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgrading-check" checked/>
   <label for="m-sw360docsdeploymentupgrading-check"><a href="/sw360/docs/deployment/upgrading/" title="Upgrade from previous instances" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentupgrading"><span class="">Upgrade</span></a></label>
   
   <ul class="ul-3 foldable">
@@ -306,6 +331,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  active td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="td-sidebar-nav-active-item">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -313,7 +342,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -325,29 +369,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -366,10 +391,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  active td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="td-sidebar-nav-active-item">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -382,6 +403,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -512,10 +537,10 @@
           <aside class="d-none d-xl-block col-xl-2 td-sidebar-toc d-print-none">
             
 <div class="td-page-meta ml-2 pb-1 pt-2 mb-0">
-<a href="https://github.com/eclipse/sw360.website/tree/main/content/en/docs/Deployment/Deploy-Docker.md" class="td-page-meta--view" target="_blank" rel="noopener"><i class="fa fa-file-alt fa-fw"></i> View page source</a>
-  <a href="https://github.com/eclipse/sw360.website/edit/main/content/en/docs/Deployment/Deploy-Docker.md" class="td-page-meta--edit" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> Edit this page</a>
-  <a href="https://github.com/eclipse/sw360.website/new/main/content/en/docs/Deployment/Deploy-Docker.md?filename=change-me.md&amp;value=---%0Atitle%3A&#43;%22Long&#43;Page&#43;Title%22%0AlinkTitle%3A&#43;%22Short&#43;Nav&#43;Title%22%0Aweight%3A&#43;100%0Adescription%3A&#43;%3E-%0A&#43;&#43;&#43;&#43;&#43;Page&#43;description&#43;for&#43;heading&#43;and&#43;indexes.%0A---%0A%0A%23%23&#43;Heading%0A%0AEdit&#43;this&#43;template&#43;to&#43;create&#43;your&#43;new&#43;page.%0A%0A%2A&#43;Give&#43;it&#43;a&#43;good&#43;name%2C&#43;ending&#43;in&#43;%60.md%60&#43;-&#43;e.g.&#43;%60getting-started.md%60%0A%2A&#43;Edit&#43;the&#43;%22front&#43;matter%22&#43;section&#43;at&#43;the&#43;top&#43;of&#43;the&#43;page&#43;%28weight&#43;controls&#43;how&#43;its&#43;ordered&#43;amongst&#43;other&#43;pages&#43;in&#43;the&#43;same&#43;directory%3B&#43;lowest&#43;number&#43;first%29.%0A%2A&#43;Add&#43;a&#43;good&#43;commit&#43;message&#43;at&#43;the&#43;bottom&#43;of&#43;the&#43;page&#43;%28%3C80&#43;characters%3B&#43;use&#43;the&#43;extended&#43;description&#43;field&#43;for&#43;more&#43;detail%29.%0A%2A&#43;Create&#43;a&#43;new&#43;branch&#43;so&#43;you&#43;can&#43;preview&#43;your&#43;new&#43;file&#43;and&#43;request&#43;a&#43;review&#43;via&#43;Pull&#43;Request.%0A" class="td-page-meta--child" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> Create child page</a>
-  <a href="https://github.com/eclipse/sw360.website/issues/new?title=Docker%20Deployment" class="td-page-meta--issue" target="_blank" rel="noopener"><i class="fas fa-tasks fa-fw"></i> Create documentation issue</a>
+<a href="https://github.com/eclipse/sw360.website/tree/main/content/en/docs/Deployment/Upgrading/Upgrade_Version_SW360_17_To_18.md" class="td-page-meta--view" target="_blank" rel="noopener"><i class="fa fa-file-alt fa-fw"></i> View page source</a>
+  <a href="https://github.com/eclipse/sw360.website/edit/main/content/en/docs/Deployment/Upgrading/Upgrade_Version_SW360_17_To_18.md" class="td-page-meta--edit" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> Edit this page</a>
+  <a href="https://github.com/eclipse/sw360.website/new/main/content/en/docs/Deployment/Upgrading/Upgrade_Version_SW360_17_To_18.md?filename=change-me.md&amp;value=---%0Atitle%3A&#43;%22Long&#43;Page&#43;Title%22%0AlinkTitle%3A&#43;%22Short&#43;Nav&#43;Title%22%0Aweight%3A&#43;100%0Adescription%3A&#43;%3E-%0A&#43;&#43;&#43;&#43;&#43;Page&#43;description&#43;for&#43;heading&#43;and&#43;indexes.%0A---%0A%0A%23%23&#43;Heading%0A%0AEdit&#43;this&#43;template&#43;to&#43;create&#43;your&#43;new&#43;page.%0A%0A%2A&#43;Give&#43;it&#43;a&#43;good&#43;name%2C&#43;ending&#43;in&#43;%60.md%60&#43;-&#43;e.g.&#43;%60getting-started.md%60%0A%2A&#43;Edit&#43;the&#43;%22front&#43;matter%22&#43;section&#43;at&#43;the&#43;top&#43;of&#43;the&#43;page&#43;%28weight&#43;controls&#43;how&#43;its&#43;ordered&#43;amongst&#43;other&#43;pages&#43;in&#43;the&#43;same&#43;directory%3B&#43;lowest&#43;number&#43;first%29.%0A%2A&#43;Add&#43;a&#43;good&#43;commit&#43;message&#43;at&#43;the&#43;bottom&#43;of&#43;the&#43;page&#43;%28%3C80&#43;characters%3B&#43;use&#43;the&#43;extended&#43;description&#43;field&#43;for&#43;more&#43;detail%29.%0A%2A&#43;Create&#43;a&#43;new&#43;branch&#43;so&#43;you&#43;can&#43;preview&#43;your&#43;new&#43;file&#43;and&#43;request&#43;a&#43;review&#43;via&#43;Pull&#43;Request.%0A" class="td-page-meta--child" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> Create child page</a>
+  <a href="https://github.com/eclipse/sw360.website/issues/new?title=Upgrade%20SW360%20from%2017.00%20to%2018.1.0" class="td-page-meta--issue" target="_blank" rel="noopener"><i class="fas fa-tasks fa-fw"></i> Create documentation issue</a>
   <a href="https://github.com/eclipse/sw360/issues/new" class="td-page-meta--project-issue" target="_blank" rel="noopener"><i class="fas fa-tasks fa-fw"></i> Create project issue</a>
   
 </div>
@@ -525,22 +550,12 @@
 
 <div class="td-toc"><nav id="TableOfContents">
   <ul>
-    <li><a href="#requirements">Requirements</a>
-      <ul>
-        <li><a href="#platform-requirements">Platform Requirements</a></li>
-        <li><a href="#sw360chores-requirements">sw360chores Requirements</a></li>
-        <li><a href="#sw360-requirements">Sw360 Requirements</a></li>
-      </ul>
-    </li>
-    <li><a href="#cloning-the-repos">Cloning the repos</a>
-      <ul>
-        <li><a href="#generating-an-ssh-key-pair-for-your-machine">Generating an ssh key-pair for your machine</a></li>
-        <li><a href="#cloning-sw360-chores">Cloning sw360 chores</a></li>
-        <li><a href="#cloning-eclipsesw360">Cloning eclipse/sw360</a></li>
-      </ul>
-    </li>
-    <li><a href="#compiling-and-deploying-sw360-code">Compiling and deploying SW360 Code</a></li>
-    <li><a href="#launching-the-containers">Launching the containers</a></li>
+    <li><a href="#ref1">Version of libraries</a></li>
+    <li><a href="#ref2">Prepare source code to use release 18.1.0</a></li>
+    <li><a href="#ref3">Config Couchdb Lucene</a></li>
+    <li><a href="#ref4">Build and deploy</a></li>
+    <li><a href="#ref5">Start and Configure Liferay</a></li>
+    <li><a href="#ref6">Setup SW360 for Liferay: Import *.lar Files</a></li>
   </ul>
 </nav></div>
 
@@ -577,15 +592,17 @@
     </li>
   <li class="breadcrumb-item"><a href="https://www.eclipse.org/sw360/docs/deployment/">Deployment</a>
     </li>
+  <li class="breadcrumb-item"><a href="https://www.eclipse.org/sw360/docs/deployment/upgrading/">Upgrade</a>
+    </li>
   <li class="breadcrumb-item active">
-      <span>Docker Deployment</span>
+      <span>Upgrade SW360 from 17.0 to 18.1.0</span>
     </li>
   </ol>
 </nav>
             
 <div class="td-content">
-	<h1>Docker Deployment</h1>
-	<div class="lead">Deploy SW360 with Docker</div>
+	<h1>Upgrade SW360 from 17.00 to 18.1.0</h1>
+	
 	<header class="article-meta">
 		
 
@@ -601,79 +618,126 @@
 
 		
 	</header>    
-	<h1 id="a-quick-how-to-for-testing-sw360">A quick how-to for testing SW360</h1>
-<h2 id="requirements">Requirements</h2>
-<h3 id="platform-requirements">Platform Requirements</h3>
-<p>As you need Apache Thrift 0.11.0 (see <a href="https://github.com/eclipse/sw360#required-software">https://github.com/eclipse/sw360#required-software</a> ), using the latest Ubuntu LTS (18.04) won&rsquo;t work, so we start on Ubuntu 19.10 if you want to install from packages. As an alternative, consider the following script from the sw360 repository:</p>
-<p><a href="https://github.com/eclipse/sw360/blob/master/scripts/install-thrift.sh">https://github.com/eclipse/sw360/blob/master/scripts/install-thrift.sh</a></p>
-<p>We&rsquo;ll go the Docker way and follow the instructions of the <a href="https://github.com/sw360/sw360chores">sw360chores project</a>. There is a nice diagram there, explaining the rather complex setup.</p>
-<h3 id="sw360chores-requirements">sw360chores Requirements</h3>
-<blockquote>
-<p>the perl interpreter to run ./sw360chores.pl</p>
-</blockquote>
-<p>You should already have it in your default, even if minimal, installation</p>
-<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-fallback" data-lang="fallback"><span style="display:flex;"><span>$ which perl 
-</span></span><span style="display:flex;"><span>/usr/bin/perl
-</span></span></code></pre></div><blockquote>
-<p>git which is used in some prepare scripts</p>
-</blockquote>
-<p><code>sudo apt install git</code></p>
-<blockquote>
-<p>a current version of docker (min 1.30) [https://docs.docker.com/]</p>
-</blockquote>
-<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-fallback" data-lang="fallback"><span style="display:flex;"><span>sudo apt install docker.io
-</span></span></code></pre></div><blockquote>
-<p>docker-compose (min 1.21) [https://docs.docker.com/compose/install/]</p>
-</blockquote>
-<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-fallback" data-lang="fallback"><span style="display:flex;"><span>sudo apt install docker-compose
-</span></span></code></pre></div><p>And you actually also need curl,</p>
-<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-fallback" data-lang="fallback"><span style="display:flex;"><span>sudo apt install curl
-</span></span></code></pre></div><h3 id="sw360-requirements">Sw360 Requirements</h3>
-<p>From the <a href="https://github.com/eclipse/sw360#required-software">sw360 Readme</a>:</p>
-<blockquote>
-<p>Java 1.8.X</p>
-</blockquote>
-<p>And when they say &ldquo;1.8.X&rdquo;, they mean it: it won&rsquo;t work with a later version. So it&rsquo;s better to uninstall the potential other versions of Java (/!\ this is expected to break other things on your environment if you depend on Java for anything), and then install the required version</p>
-<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-fallback" data-lang="fallback"><span style="display:flex;"><span> sudo apt install openjdk-8-jdk openjdk-8-jre
-</span></span></code></pre></div><blockquote>
-<p>In order to build you will need:</p>
-<ul>
-<li>A git client</li>
-<li>Apache Maven 3.6.X</li>
-<li>Apache Thrift 0.11.0</li>
-</ul>
-</blockquote>
-<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-fallback" data-lang="fallback"><span style="display:flex;"><span>sudo apt install maven
-</span></span></code></pre></div><p>That will install maven Apache Maven 3.6.1 but you need to have installed the correct version (8) of Java <em>before hand</em> otherwise it will install a too recent one.</p>
-<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-fallback" data-lang="fallback"><span style="display:flex;"><span>sudo apt install thrift-compiler
-</span></span></code></pre></div><p>That will install Thrift version 0.11.0, if you have not installed thrift using the script above.</p>
-<h2 id="cloning-the-repos">Cloning the repos</h2>
-<h3 id="generating-an-ssh-key-pair-for-your-machine">Generating an ssh key-pair for your machine</h3>
-<p>If you don&rsquo;t already have one, generate a key pair with no passphrase, in default location:</p>
-<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-fallback" data-lang="fallback"><span style="display:flex;"><span>ssh-keygen -t rsa -b 4096 -C &#34;your_email@example.com&#34;
-</span></span></code></pre></div><p>Not 100% sure, but not having one may create problems, so&hellip;</p>
-<h3 id="cloning-sw360-chores">Cloning sw360 chores</h3>
-<p>I created a <code>code</code> folder at the root of the user&rsquo;s directory, just to make things simple.</p>
-<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-fallback" data-lang="fallback"><span style="display:flex;"><span>~$ cd code
-</span></span><span style="display:flex;"><span>~/code$ git clone https://github.com/sw360/sw360chores.git
-</span></span></code></pre></div><h3 id="cloning-eclipsesw360">Cloning eclipse/sw360</h3>
-<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-fallback" data-lang="fallback"><span style="display:flex;"><span>~/code$ git clone https://github.com/eclipse/sw360.git
-</span></span></code></pre></div><h2 id="compiling-and-deploying-sw360-code">Compiling and deploying SW360 Code</h2>
-<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-go" data-lang="go"><span style="display:flex;"><span><span style="color:#a00;background-color:#faa">~$</span> cd code<span style="color:#555">/</span>sw360<span style="color:#555">/</span>
-</span></span><span style="display:flex;"><span><span style="color:#a00;background-color:#faa">~</span><span style="color:#555">/</span>code<span style="color:#555">/</span>sw360<span style="color:#a00;background-color:#faa">$</span> mvn <span style="color:#069;font-weight:bold">package</span> <span style="color:#555">-</span>P deploy <span style="color:#555">-</span>Dbase.deploy.dir=<span style="color:#555">/</span>home<span style="color:#555">/</span>inno3<span style="color:#555">/</span>code<span style="color:#555">/</span>sw360chores<span style="color:#555">/</span>_deploy <span style="color:#555">-</span>DskipTests
-</span></span></code></pre></div><h2 id="launching-the-containers">Launching the containers</h2>
-<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-fallback" data-lang="fallback"><span style="display:flex;"><span>$ cd ~/code/sw360chores/
-</span></span><span style="display:flex;"><span>~/code/sw360chores$ ./sw360chores.pl --build -- up
-</span></span></code></pre></div><p>And yes, there is a space between <code>--</code> and <code>up</code>.</p>
-<p>If everything goes fine, you should see a line like</p>
-<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-fallback" data-lang="fallback"><span style="display:flex;"><span>sw360_1                | 15-Jan-2020 12:33:38.480 INFO [main] org.apache.catalina.startup.Catalina.start Server startup in [144,475] milliseconds 
-</span></span></code></pre></div><p>You should be able to login at <a href="https://localhost:8443">https://localhost:8443</a> with the default credentials <code>setup@sw360.org</code> and the password <code>sw360fossy</code> (found <a href="https://github.com/eclipse/sw360/wiki/Deploy-Liferay#liferay-administrator-steps">here</a>).</p>
-<p>Please go ahead now with the setup of the Liferay - links can be found in the main wiki page.</p>
+	<p><a href="#ref1">Version of libraries</a></p>
+<p><a href="#ref2">Checkout source code SW360 to Tag Version 18.1.0</a></p>
+<p><a href="#ref3">Config Couchdb Lucene</a></p>
+<p><a href="#ref4">Build and deploy</a></p>
+<p><a href="#ref5">Start and Configure Liferay</a></p>
+<p><a href="#ref6">Setup SW360 for Liferay: Import *.lar Files</a></p>
+<h2 id="ref1">Version of libraries</h2>
+<table>
+<thead>
+<tr>
+<th style="text-align:left">Package Name</th>
+<th style="text-align:center">Version</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td style="text-align:left">Liferay</td>
+<td style="text-align:center">7.4.3</td>
+</tr>
+<tr>
+<td style="text-align:left">Tomcat</td>
+<td style="text-align:center">9.0.56</td>
+</tr>
+<tr>
+<td style="text-align:left">Couchdb</td>
+<td style="text-align:center">3.2.2</td>
+</tr>
+<tr>
+<td style="text-align:left">Open JDK</td>
+<td style="text-align:center">11.0.15</td>
+</tr>
+<tr>
+<td style="text-align:left">Thrift</td>
+<td style="text-align:center">0.16.0</td>
+</tr>
+</tbody>
+</table>
+<p>To check couchdb version: run <code>curl http://localhost_or_yourcouchdbserver:5984 | json_pp</code></p>
+<h2 id="ref2">Prepare source code to use release 18.1.0</h2>
+<p>Link contains source: <a href="https://github.com/eclipse/sw360.git">https://github.com/eclipse/sw360.git</a></p>
+<p>Create folder to store new source code of version 18.1.0:</p>
+<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-sh" data-lang="sh"><span style="display:flex;"><span>$ mkdir /home/user/work17to18
+</span></span></code></pre></div><p>Clone source code from github:</p>
+<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-sh" data-lang="sh"><span style="display:flex;"><span>$ git clone https://github.com/eclipse/sw360.git
+</span></span></code></pre></div><p>Checkout to tag Version 18.1.0</p>
+<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-sh" data-lang="sh"><span style="display:flex;"><span>$ git checkout sw360-18.1.0-M1
+</span></span></code></pre></div><p>Set Environment for <code>${LIFERAY_INSTALL_7_4}</code></p>
+<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-sh" data-lang="sh"><span style="display:flex;"><span>$ <span style="color:#366">export</span> <span style="color:#033">LIFERAY_INSTALL_7_4</span><span style="color:#555">=</span>/opt/liferay-ce-portal-7.4.3.18-ga18
+</span></span></code></pre></div><p>Move folder <code>/home/user/work17to18/sw360</code> run command</p>
+<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-sh" data-lang="sh"><span style="display:flex;"><span>$ mvn clean install -DskipTests
+</span></span></code></pre></div><p>Copy dependencies from folder <strong>/home/user/work17to18/sw360/deploy/jars</strong> to <strong>${LIFERAY_INSTALL_7_4}/osgi/modules</strong></p>
+<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-sh" data-lang="sh"><span style="display:flex;"><span>$ <span style="color:#366">cd</span> /home/user/work17to18/sw360/utils/jars
+</span></span><span style="display:flex;"><span>$ sudo cp *.jar /opt/liferay-ce-portal-7.4.3.18-ga18/osgi/modules/
+</span></span></code></pre></div><h2 id="ref3">Config Couchdb Lucene</h2>
+<p>Run following commands to config Couchdb Lucene (remember to replace <strong>COUCHDB_USER</strong> and <strong>COUCHDB_PASSWORD</strong> by username and password of couchdb):</p>
+<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-sh" data-lang="sh"><span style="display:flex;"><span>$ <span style="color:#366">cd</span> /home/user/work17to18/sw360/third-party/couchdb-lucene/
+</span></span><span style="display:flex;"><span>$ sed -i <span style="color:#c30">&#34;s/allowLeadingWildcard=false/allowLeadingWildcard=true/&#34;</span> ./src/main/resources/couchdb-lucene.ini
+</span></span><span style="display:flex;"><span>$ sed -i <span style="color:#c30">&#34;s/localhost:5984/COUCHDB_USER:COUCHDB_USER@localhost:5984/&#34;</span> ./src/main/resources/couchdb-lucene.ini
+</span></span><span style="display:flex;"><span>$ mvn clean install war:war
+</span></span><span style="display:flex;"><span>$ cp target/couchdb-lucene-*.war /opt/liferay-ce-portal-7.4.3.18-ga18/tomcat-9.0.56/webapps/couchdb-lucene.war
+</span></span></code></pre></div><h2 id="ref4">Build and deploy</h2>
+<p>Set Environment for <code>${LIFERAY_INSTALL_7_4}</code></p>
+<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-sh" data-lang="sh"><span style="display:flex;"><span>$ <span style="color:#366">cd</span> /home/user/work17to18/sw360
+</span></span><span style="display:flex;"><span>$ <span style="color:#366">export</span> <span style="color:#033">LIFERAY_INSTALL_7_4</span><span style="color:#555">=</span>/opt/liferay-ce-portal-7.4.3.18-ga18
+</span></span></code></pre></div><p>To clean everything and install without running the tests</p>
+<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-sh" data-lang="sh"><span style="display:flex;"><span>$ mvn clean install -DskipTests
+</span></span></code></pre></div><p>For deployment run the command</p>
+<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-sh" data-lang="sh"><span style="display:flex;"><span>$ mvn package -P deploy -Dbase.deploy.dir<span style="color:#555">=</span>. -Dliferay.deploy.dir<span style="color:#555">=</span><span style="color:#a00">${</span><span style="color:#033">LIFERAY_INSTALL_7_4</span><span style="color:#a00">}</span>/deploy -Dbackend.deploy.dir<span style="color:#555">=</span><span style="color:#a00">${</span><span style="color:#033">LIFERAY_INSTALL_7_4</span><span style="color:#a00">}</span>/tomcat-9.0.56/webapps -Drest.deploy.dir<span style="color:#555">=</span><span style="color:#a00">${</span><span style="color:#033">LIFERAY_INSTALL_7_4</span><span style="color:#a00">}</span>/tomcat-9.0.56/webapps -Dtest<span style="color:#555">=</span>org/eclipse/sw360/rest/resourceserver/restdocs/* -Dsurefire.failIfNoSpecifiedTests<span style="color:#555">=</span><span style="color:#366">false</span> -DRunRestIntegrationTest<span style="color:#555">=</span><span style="color:#366">true</span>
+</span></span></code></pre></div><h2 id="ref5">Start and Configure Liferay</h2>
+<p>Set Environment for <code>${LIFERAY_INSTALL_7_4}</code></p>
+<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-sh" data-lang="sh"><span style="display:flex;"><span>$ <span style="color:#366">export</span> <span style="color:#033">LIFERAY_INSTALL_7_4</span><span style="color:#555">=</span>/opt/liferay-ce-portal-7.4.3.18-ga18<span style="color:#c30">`</span>
+</span></span></code></pre></div><p>Start liferay</p>
+<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-sh" data-lang="sh"><span style="display:flex;"><span>$ <span style="color:#a00">${</span><span style="color:#033">LIFERAY_INSTALL_7_4</span><span style="color:#a00">}</span>/tomcat-9.0.56/bin/startup.sh
+</span></span></code></pre></div><p>Log</p>
+<div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-sh" data-lang="sh"><span style="display:flex;"><span>$ tail -f <span style="color:#a00">${</span><span style="color:#033">LIFERAY_INSTALL_7_4</span><span style="color:#a00">}</span>/tomcat-9.0.56/logs/catalina.out
+</span></span></code></pre></div><p>SW360 url : <a href="https://localhost:8080">https://localhost:8080</a></p>
+<h2 id="ref6">Setup SW360 for Liferay: Import *.lar Files</h2>
+<p><strong>You need over-import lar files to the portet can show the sw360 icons/images</strong></p>
+<p>For the setup of SW360 in Liferay, the portal description files, <code>*.lar</code> files need not be imported. There is no way except from doing this in the UI. If we are wrong with this, please let us know, because it is very annoying that these ever occurring steps cannot be automated with Liferay.</p>
+
+<figure>
+    <img src="/sw360/img/sw360screenshots/deploy73/2020-01-24_14.49.41.png"/> 
+</figure>
+
+<p>The go into &gt; <code>Publishing</code> &gt; <code>Import</code> which shows like this:</p>
+
+<figure>
+    <img src="/sw360/img/sw360screenshots/deploy74/13.png"/> 
+</figure>
+
+<p>Then, click on the plus sign in order to import the *.lar file for public pages. You will find the lar files in the <a href="https://github.com/eclipse/sw360/tree/master/frontend/configuration">frontend/configuration</a> folder of the sw360 repository.</p>
+
+<figure>
+    <img src="/sw360/img/sw360screenshots/deploy74/14.png"/> 
+</figure>
+
+<p>As for import settings, follow the selection as shown on the screenshot. It is very important that for the <code>Public_Pages_7_4_3_18_GA18.lar</code> file the selection <code>Public_Pages_7_4_3_18_GA18.lar</code> is made.</p>
+
+<figure>
+    <img src="/sw360/img/sw360screenshots/deploy74/15.png"/> 
+</figure>
+
+<p>Importing permission makes sure that pages are visible according to users rights. For public pages, it is irrelevant_the moment. Overwriting and the write as current user needs to be selected.</p>
+<p>After successful importing, the same steps shall be repeated for the <code>Private_Pages_7_4_3_18_GA18.lar</code> file.</p>
+
+<figure>
+    <img src="/sw360/img/sw360screenshots/deploy74/16.png"/> 
+</figure>
+
+<p>Make sure that <code>Private_Pages_7_4_3_18_GA18.lar </code> is selected. Follow the other selections made as shown on the screenshot &hellip; importing permissions &hellip; mirror with overwriting, use the current author &hellip;</p>
+
+<figure>
+    <img src="/sw360/img/sw360screenshots/deploy74/17.png"/> 
+</figure>
+
 
 	
 	
 	<div class="text-muted mt-5 pt-3 border-top">
-  Last modified June 22, 2022: <a href="https://github.com/eclipse/sw360.website/commit/032e0f60817fa17b0036ac6db37d09342a714890">SW360 website remodeling (#9) (032e0f6)</a>
+  Last modified February 28, 2024: <a href="https://github.com/eclipse/sw360.website/commit/b3cb567cdd1ef985f6b9efbbd1d5c6ce455bee9a">feat(Upgrade version): Add upgrade version doc from 17.0.0 to 18.1.0 (b3cb567)</a>
 </div>
 
 </div>
@@ -722,24 +786,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/dev-adding-a-new-portlet-backend/index.html b/docs/development/dev-adding-a-new-portlet-backend/index.html
index 6b5f975..8cc9dad 100644
--- a/docs/development/dev-adding-a-new-portlet-backend/index.html
+++ b/docs/development/dev-adding-a-new-portlet-backend/index.html
@@ -308,6 +308,10 @@ Add methods to the thrift idl definition Add methods to the data handler interfa
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -315,7 +319,22 @@ Add methods to the thrift idl definition Add methods to the data handler interfa
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -327,29 +346,10 @@ Add methods to the thrift idl definition Add methods to the data handler interfa
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -368,10 +368,6 @@ Add methods to the thrift idl definition Add methods to the data handler interfa
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -384,6 +380,10 @@ Add methods to the thrift idl definition Add methods to the data handler interfa
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -716,24 +716,24 @@ In the ComponentDatabaseHandler.java we actually do some work and implement the
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/dev-adding-a-new-portlet-frontend/index.html b/docs/development/dev-adding-a-new-portlet-frontend/index.html
index 7c388fc..165eff2 100644
--- a/docs/development/dev-adding-a-new-portlet-frontend/index.html
+++ b/docs/development/dev-adding-a-new-portlet-frontend/index.html
@@ -318,6 +318,10 @@ public class DatabaseSanitation extends Sw360Portlet the base class Sw360Portlet
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -325,7 +329,22 @@ public class DatabaseSanitation extends Sw360Portlet the base class Sw360Portlet
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -337,29 +356,10 @@ public class DatabaseSanitation extends Sw360Portlet the base class Sw360Portlet
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -378,10 +378,6 @@ public class DatabaseSanitation extends Sw360Portlet the base class Sw360Portlet
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -394,6 +390,10 @@ public class DatabaseSanitation extends Sw360Portlet the base class Sw360Portlet
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -764,24 +764,24 @@ Then we change the theme of Private Pages back to SW360-Theme.</p>
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/dev-adding-new-fields-to-existing-classes/index.html b/docs/development/dev-adding-new-fields-to-existing-classes/index.html
index d819cd5..a27ef16 100644
--- a/docs/development/dev-adding-new-fields-to-existing-classes/index.html
+++ b/docs/development/dev-adding-new-fields-to-existing-classes/index.html
@@ -308,6 +308,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -315,7 +319,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -327,29 +346,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -368,10 +368,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -384,6 +380,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -672,24 +672,24 @@ We will add the license text to licenses in the thrift file:</p>
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/dev-branches/index.html b/docs/development/dev-branches/index.html
index 3360b74..846954d 100644
--- a/docs/development/dev-branches/index.html
+++ b/docs/development/dev-branches/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -636,24 +636,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/dev-database-migration-using-costco/index.html b/docs/development/dev-database-migration-using-costco/index.html
index 3238f96..ad8b09b 100644
--- a/docs/development/dev-database-migration-using-costco/index.html
+++ b/docs/development/dev-database-migration-using-costco/index.html
@@ -314,6 +314,10 @@ Problem The main problem with changing field names in thrift is that existing do
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -321,7 +325,22 @@ Problem The main problem with changing field names in thrift is that existing do
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -333,29 +352,10 @@ Problem The main problem with changing field names in thrift is that existing do
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -374,10 +374,6 @@ Problem The main problem with changing field names in thrift is that existing do
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -390,6 +386,10 @@ Problem The main problem with changing field names in thrift is that existing do
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -736,24 +736,24 @@ Problem The main problem with changing field names in thrift is that existing do
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/dev-dod-and-style/index.html b/docs/development/dev-dod-and-style/index.html
index 7bd82fe..c796d22 100644
--- a/docs/development/dev-dod-and-style/index.html
+++ b/docs/development/dev-dod-and-style/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -725,24 +725,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/dev-external-documents-with-couchdb/index.html b/docs/development/dev-external-documents-with-couchdb/index.html
index c7bb27c..232acfb 100644
--- a/docs/development/dev-external-documents-with-couchdb/index.html
+++ b/docs/development/dev-external-documents-with-couchdb/index.html
@@ -303,6 +303,10 @@ In some cases inline documents are not sufficient for storing extended informati
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -310,7 +314,22 @@ In some cases inline documents are not sufficient for storing extended informati
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -322,29 +341,10 @@ In some cases inline documents are not sufficient for storing extended informati
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -363,10 +363,6 @@ In some cases inline documents are not sufficient for storing extended informati
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -379,6 +375,10 @@ In some cases inline documents are not sufficient for storing extended informati
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -955,24 +955,24 @@ The following classes are needed:</p>
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/dev-filtering-in-portlets/index.html b/docs/development/dev-filtering-in-portlets/index.html
index 0b563a5..353e590 100644
--- a/docs/development/dev-filtering-in-portlets/index.html
+++ b/docs/development/dev-filtering-in-portlets/index.html
@@ -311,6 +311,10 @@ The filters actually result in a new search request, when hitting apply filters
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -318,7 +322,22 @@ The filters actually result in a new search request, when hitting apply filters
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -330,29 +349,10 @@ The filters actually result in a new search request, when hitting apply filters
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -371,10 +371,6 @@ The filters actually result in a new search request, when hitting apply filters
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -387,6 +383,10 @@ The filters actually result in a new search request, when hitting apply filters
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -650,24 +650,24 @@ The filters actually result in a new search request, when hitting apply filters
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/dev-fossology-integration/index.html b/docs/development/dev-fossology-integration/index.html
index 25c657d..0bfa771 100644
--- a/docs/development/dev-fossology-integration/index.html
+++ b/docs/development/dev-fossology-integration/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -688,24 +688,24 @@ In order to make the clearing decisions available a reuser needs to be scheduled
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/dev-liferay-friendly-url/index.html b/docs/development/dev-liferay-friendly-url/index.html
index 61d7224..cf487ea 100644
--- a/docs/development/dev-liferay-friendly-url/index.html
+++ b/docs/development/dev-liferay-friendly-url/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -708,24 +708,24 @@ It is helpful to generate <code>&lt;portlet:renderURL&gt;</code> placeholder and
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/dev-moderation-requests/index.html b/docs/development/dev-moderation-requests/index.html
index 3f12120..e9bb911 100644
--- a/docs/development/dev-moderation-requests/index.html
+++ b/docs/development/dev-moderation-requests/index.html
@@ -311,6 +311,10 @@ Application Flow A user changes a moderated document, which are component, relea
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -318,7 +322,22 @@ Application Flow A user changes a moderated document, which are component, relea
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -330,29 +349,10 @@ Application Flow A user changes a moderated document, which are component, relea
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -371,10 +371,6 @@ Application Flow A user changes a moderated document, which are component, relea
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -387,6 +383,10 @@ Application Flow A user changes a moderated document, which are component, relea
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -719,24 +719,24 @@ On selecting the moderation requests, both documents (original and the updated o
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/dev-releasing-sw360/index.html b/docs/development/dev-releasing-sw360/index.html
index e0e9b2c..96b4c52 100644
--- a/docs/development/dev-releasing-sw360/index.html
+++ b/docs/development/dev-releasing-sw360/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -726,24 +726,24 @@ $ mvn install
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/dev-role-authorisation-model/index.html b/docs/development/dev-role-authorisation-model/index.html
index 0a09938..62e9003 100644
--- a/docs/development/dev-role-authorisation-model/index.html
+++ b/docs/development/dev-role-authorisation-model/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -869,24 +869,24 @@ In contrast, the contributor cannot delete data items.</li>
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/dev-semantic-commits/index.html b/docs/development/dev-semantic-commits/index.html
index edb6189..d78f108 100644
--- a/docs/development/dev-semantic-commits/index.html
+++ b/docs/development/dev-semantic-commits/index.html
@@ -308,6 +308,10 @@ The following are supported feat (new feature for the user, not a new feature fo
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -315,7 +319,22 @@ The following are supported feat (new feature for the user, not a new feature fo
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -327,29 +346,10 @@ The following are supported feat (new feature for the user, not a new feature fo
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -368,10 +368,6 @@ The following are supported feat (new feature for the user, not a new feature fo
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -384,6 +380,10 @@ The following are supported feat (new feature for the user, not a new feature fo
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -679,24 +679,24 @@ The following are supported feat (new feature for the user, not a new feature fo
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/dev-testing-frameworks/index.html b/docs/development/dev-testing-frameworks/index.html
index 5ac0e27..c5a2910 100644
--- a/docs/development/dev-testing-frameworks/index.html
+++ b/docs/development/dev-testing-frameworks/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -635,24 +635,24 @@ This is basically a runner that allows to use parametrized tests.</p>
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/dev-troubleshooting/index.html b/docs/development/dev-troubleshooting/index.html
index 7b5a3d5..30f8da0 100644
--- a/docs/development/dev-troubleshooting/index.html
+++ b/docs/development/dev-troubleshooting/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -744,24 +744,24 @@ sw360/src/libraries/lib-datahandler/src/main/java/com/siemens/sw360/datahandler/
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/dev-using-requirejs-for-javascript-modules/index.html b/docs/development/dev-using-requirejs-for-javascript-modules/index.html
index 964acee..dfaddf8 100644
--- a/docs/development/dev-using-requirejs-for-javascript-modules/index.html
+++ b/docs/development/dev-using-requirejs-for-javascript-modules/index.html
@@ -308,6 +308,10 @@ libraries like jquery or datatables can be imported by name but without a specif
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -315,7 +319,22 @@ libraries like jquery or datatables can be imported by name but without a specif
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -327,29 +346,10 @@ libraries like jquery or datatables can be imported by name but without a specif
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -368,10 +368,6 @@ libraries like jquery or datatables can be imported by name but without a specif
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -384,6 +380,10 @@ libraries like jquery or datatables can be imported by name but without a specif
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -746,24 +746,24 @@ require(['components/includes/vendors/addVendor'], function(addVendor) {
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/index.html b/docs/development/index.html
index 97988b9..0b1c177 100644
--- a/docs/development/index.html
+++ b/docs/development/index.html
@@ -298,6 +298,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -305,7 +309,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -317,29 +336,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -358,10 +358,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -374,6 +370,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -873,24 +873,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/restapi/access/index.html b/docs/development/restapi/access/index.html
index 9764e60..9eba36c 100644
--- a/docs/development/restapi/access/index.html
+++ b/docs/development/restapi/access/index.html
@@ -321,6 +321,10 @@ xmlHttpRequest = new XMLHttpRequest(); xmlHttpRequest.open(&#39;POST&#39;, &#39;
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -328,7 +332,22 @@ xmlHttpRequest = new XMLHttpRequest(); xmlHttpRequest.open(&#39;POST&#39;, &#39;
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -340,29 +359,10 @@ xmlHttpRequest = new XMLHttpRequest(); xmlHttpRequest.open(&#39;POST&#39;, &#39;
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -381,10 +381,6 @@ xmlHttpRequest = new XMLHttpRequest(); xmlHttpRequest.open(&#39;POST&#39;, &#39;
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -397,6 +393,10 @@ xmlHttpRequest = new XMLHttpRequest(); xmlHttpRequest.open(&#39;POST&#39;, &#39;
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -798,24 +798,24 @@ results in the following request</p>
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/restapi/dev-rest-api/index.html b/docs/development/restapi/dev-rest-api/index.html
index 2d5b83e..c0737f6 100644
--- a/docs/development/restapi/dev-rest-api/index.html
+++ b/docs/development/restapi/dev-rest-api/index.html
@@ -308,6 +308,10 @@ Module authorization-server - OAuth2 Authorization Server, offering typical auth
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -315,7 +319,22 @@ Module authorization-server - OAuth2 Authorization Server, offering typical auth
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -327,29 +346,10 @@ Module authorization-server - OAuth2 Authorization Server, offering typical auth
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -368,10 +368,6 @@ Module authorization-server - OAuth2 Authorization Server, offering typical auth
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -384,6 +380,10 @@ Module authorization-server - OAuth2 Authorization Server, offering typical auth
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -916,10 +916,10 @@ The following example shows some ideas of the REST API. It can be obtained by</p
 <div class="highlight"><pre tabindex="0" style="background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-json" data-lang="json"><span style="display:flex;"><span>{
 </span></span><span style="display:flex;"><span>  <span style="color:#309;font-weight:bold">&#34;access_token&#34;</span> : <span style="color:#c30">&#34;eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOlsic3czNjAtUkVTVC1BUEkiXSwidXNlcl9uYW1lIjoiYWRtaW5Ac3czNjAub3JnIiwic2NvcGUiOlsiUkVBRCJdLCJleHAiOjE1NjM4MDYwNDQsImF1dGhvcml0aWVzIjpbIlJFQUQiXSwianRpIjoiZDY4ZWY1YWEtZTQ5My00Y2YxLWI2NGQtNWE5MTdkY2M2ZTYwIiwiY2xpZW50X2lkIjoiMTcyMmZmYzdkZWE3MTU3OGQ5ZWE1ZTZhNmMwMDA4NzMifQ.iO5sLrqRcZfzvMP5gjaJhk3caWyZLkUesdbMfqCGy4V5rbnU9QP1LjdybY0Udh8hvAvhlpqPfaxeKe1c3-gQs5MYlqG0lNQCyWcb7NRHj8VFlwLPuJRZJNk3tybvgITVm9r14pfAXogpVE0S4KihD2W1_SoKH4NzTa2vOEG0CK4VzCLetxUlUuePxZH8ugouqbS2d0SpyeeMTm-PzxzzeTb_4ulGpg63eE1v7GvTsI23uh2WfIgHBa1GRr5jWtE0Meq-5UFCVQkhMm8P-r8wO2iuRblCu6a-bWwy7bfdj3S2VDnqSQskE2dVrC_qMs-V2AGvCV1xvlF0P8A4tgwL-w&#34;</span>,
 </span></span><span style="display:flex;"><span>  <span style="color:#309;font-weight:bold">&#34;token_type&#34;</span> : <span style="color:#c30">&#34;bearer&#34;</span>,
-</span></span><span style="display:flex;"><span>  <span style="color:#309;font-weight:bold">&#34;refresh_token&#34;</span> : <span style="color:#a00;background-color:#faa">&#34;eyJhbGciOiJSUzI</span><span style="color:#f60">1</span><span style="color:#a00;background-color:#faa">NiIsInR</span><span style="color:#f60">5</span><span style="color:#a00;background-color:#faa">cCI</span><span style="color:#f60">6</span><span style="color:#a00;background-color:#faa">IkpXVCJ</span><span style="color:#f60">9</span><span style="color:#a00;background-color:#faa">.eyJhdWQiOlsic</span><span style="color:#f60">3</span><span style="color:#a00;background-color:#faa">czNjAtUkVTVC</span><span style="color:#f60">1</span><span style="color:#a00;background-color:#faa">BUEkiXSwidXNlcl</span><span style="color:#f60">9</span><span style="color:#a00;background-color:#faa">uYW</span><span style="color:#f60">1</span><span style="color:#a00;background-color:#faa">lIjoiYWRtaW</span><span style="color:#f60">5</span><span style="color:#a00;background-color:#faa">Ac</span><span style="color:#f60">3</span><span style="color:#a00;background-color:#faa">czNjAub</span><span style="color:#f60">3</span><span style="color:#a00;background-color:#faa">JnIiwic</span><span style="color:#f60">2</span><span style="color:#a00;background-color:#faa">NvcGUiOlsiUkVBRCJdLCJhdGkiOiJkNjhlZjVhYS</span><span style="color:#f60">1</span><span style="color:#a00;background-color:#faa">lNDkzLTRjZjEtYjY</span><span style="color:#f60">0</span><span style="color:#a00;background-color:#faa">ZC</span><span style="color:#f60">01</span><span style="color:#a00;background-color:#faa">YTkxN</span><span style="color:#f60">2</span><span style="color:#a00;background-color:#faa">RjYzZlNjAiLCJleHAiOjE</span><span style="color:#f60">1</span><span style="color:#a00;background-color:#faa">NjM</span><span style="color:#f60">4</span><span style="color:#a00;background-color:#faa">MDYwNDQsImF</span><span style="color:#f60">1</span><span style="color:#a00;background-color:#faa">dGhvcml</span><span style="color:#f60">0</span><span style="color:#a00;background-color:#faa">aWVzIjpbIlJFQUQiXSwianRpIjoiM</span><span style="color:#f60">2</span><span style="color:#a00;background-color:#faa">VkZDcxODAtMTBlYi</span><span style="color:#f60">00</span><span style="color:#a00;background-color:#faa">Y</span><span style="color:#f60">2</span><span style="color:#a00;background-color:#faa">MwLTg</span><span style="color:#f60">0</span><span style="color:#a00;background-color:#faa">NTUtMGYwZmIyMWMwYmU</span><span style="color:#f60">0</span><span style="color:#a00;background-color:#faa">IiwiY</span><span style="color:#f60">2</span><span style="color:#a00;background-color:#faa">xpZW</span><span style="color:#f60">50</span><span style="color:#a00;background-color:#faa">X</span><span style="color:#f60">2</span><span style="color:#a00;background-color:#faa">lkIjoiMTcyMmZmYzdkZWE</span><span style="color:#f60">3</span><span style="color:#a00;background-color:#faa">MTU</span><span style="color:#f60">3</span><span style="color:#a00;background-color:#faa">OGQ</span><span style="color:#f60">5</span><span style="color:#a00;background-color:#faa">ZWE</span><span style="color:#f60">1</span><span style="color:#a00;background-color:#faa">ZTZhNmMwMDA</span><span style="color:#f60">4</span><span style="color:#a00;background-color:#faa">NzMifQ.iMGfdHWpJNseoxIk</span><span style="color:#f60">7</span><span style="color:#a00;background-color:#faa">tKCNTyC</span><span style="color:#f60">1</span><span style="color:#a00;background-color:#faa">w</span><span style="color:#f60">4</span><span style="color:#a00;background-color:#faa">_AJ</span><span style="color:#f60">4</span><span style="color:#a00;background-color:#faa">cSv</span><span style="color:#f60">6</span><span style="color:#a00;background-color:#faa">kO</span><span style="color:#f60">64</span><span style="color:#a00;background-color:#faa">_BkF</span><span style="color:#f60">54</span><span style="color:#a00;background-color:#faa">MLudvyf</span><span style="color:#f60">9</span><span style="color:#a00;background-color:#faa">uVSIHpAeHhSFdvhbjksynRqq_u</span><span style="color:#f60">78</span><span style="color:#a00;background-color:#faa">vW</span><span style="color:#f60">8</span><span style="color:#a00;background-color:#faa">ptY</span><span style="color:#f60">1</span><span style="color:#a00;background-color:#faa">la</span><span style="color:#f60">65</span><span style="color:#a00;background-color:#faa">Qx</span><span style="color:#f60">8</span><span style="color:#a00;background-color:#faa">glHz</span><span style="color:#f60">0</span><span style="color:#a00;background-color:#faa">sktWBfMDJsUA</span><span style="color:#f60">4</span><span style="color:#a00;background-color:#faa">ynU</span><span style="color:#f60">2</span><span style="color:#a00;background-color:#faa">iZbKU</span><span style="color:#f60">92</span><span style="color:#a00;background-color:#faa">f</span><span style="color:#f60">2</span><span style="color:#a00;background-color:#faa">OOf</span><span style="color:#f60">3</span><span style="color:#a00;background-color:#faa">wQRVt</span><span style="color:#f60">38</span><span style="color:#a00;background-color:#faa">-Y</span><span style="color:#f60">1</span><span style="color:#a00;background-color:#faa">mBUsDMIStyKTDeIXGT</span><span style="color:#f60">3</span><span style="color:#a00;background-color:#faa">LJr_</span><span style="color:#f60">8</span><span style="color:#a00;background-color:#faa">k</span><span style="color:#f60">5</span><span style="color:#a00;background-color:#faa">dRAGvayixaezxDFw</span><span style="color:#f60">3</span><span style="color:#a00;background-color:#faa">dWK</span><span style="color:#f60">2</span><span style="color:#a00;background-color:#faa">M</span><span style="color:#f60">6</span><span style="color:#a00;background-color:#faa">P</span><span style="color:#f60">9</span><span style="color:#a00;background-color:#faa">h-ZnfEP</span><span style="color:#f60">47</span><span style="color:#a00;background-color:#faa">HpIUZrG</span><span style="color:#f60">8</span><span style="color:#a00;background-color:#faa">cgwPmNCZ</span><span style="color:#f60">9</span><span style="color:#a00;background-color:#faa">gBXsqVnueDYZth</span><span style="color:#f60">6</span><span style="color:#a00;background-color:#faa">TaEKIvWbkZtwY</span><span style="color:#f60">0</span><span style="color:#a00;background-color:#faa">ikWKyJL</span><span style="color:#f60">2</span><span style="color:#a00;background-color:#faa">xLm</span><span style="color:#f60">78</span><span style="color:#a00;background-color:#faa">O</span><span style="color:#f60">1</span><span style="color:#a00;background-color:#faa">ii</span><span style="color:#f60">3</span><span style="color:#a00;background-color:#faa">lA</span><span style="color:#f60">5</span><span style="color:#a00;background-color:#faa">ENt</span><span style="color:#f60">5</span><span style="color:#a00;background-color:#faa">I</span><span style="color:#f60">0</span><span style="color:#a00;background-color:#faa">DTfTm</span><span style="color:#f60">8</span><span style="color:#a00;background-color:#faa">QuK_zcm</span><span style="color:#f60">679</span><span style="color:#a00;background-color:#faa">W</span><span style="color:#f60">9</span><span style="color:#a00;background-color:#faa">jF</span><span style="color:#f60">0</span><span style="color:#a00;background-color:#faa">jvwIR</span><span style="color:#f60">71</span><span style="color:#a00;background-color:#faa">fM</span><span style="color:#f60">0</span><span style="color:#a00;background-color:#faa">JSWjkBoXd</span><span style="color:#f60">2</span><span style="color:#a00;background-color:#faa">h</span><span style="color:#f60">9</span><span style="color:#a00;background-color:#faa">oLmE</span><span style="color:#f60">2</span><span style="color:#a00;background-color:#faa">CF</span><span style="color:#f60">2</span><span style="color:#a00;background-color:#faa">sFVaJor_ermk-L</span><span style="color:#f60">0</span><span style="color:#a00;background-color:#faa">LsA</span><span style="color:#c30">&#34;,
-</span></span></span><span style="display:flex;"><span><span style="color:#c30">  &#34;</span><span style="color:#a00;background-color:#faa">expires_in</span><span style="color:#c30">&#34; : 3599,
-</span></span></span><span style="display:flex;"><span><span style="color:#c30">  &#34;</span><span style="color:#a00;background-color:#faa">scope</span><span style="color:#c30">&#34; : &#34;</span><span style="color:#a00;background-color:#faa">READ</span><span style="color:#c30">&#34;,
-</span></span></span><span style="display:flex;"><span><span style="color:#c30">  &#34;</span><span style="color:#a00;background-color:#faa">jti</span><span style="color:#c30">&#34; : &#34;</span><span style="color:#a00;background-color:#faa">d</span><span style="color:#f60">68</span><span style="color:#a00;background-color:#faa">ef</span><span style="color:#f60">5</span><span style="color:#a00;background-color:#faa">aa-e</span><span style="color:#f60">493-4</span><span style="color:#a00;background-color:#faa">cf</span><span style="color:#f60">1</span><span style="color:#a00;background-color:#faa">-b</span><span style="color:#f60">64</span><span style="color:#a00;background-color:#faa">d</span><span style="color:#f60">-5</span><span style="color:#a00;background-color:#faa">a</span><span style="color:#f60">917</span><span style="color:#a00;background-color:#faa">dcc</span><span style="color:#f60">6e60</span><span style="color:#a00;background-color:#faa">&#34;</span>
+</span></span><span style="display:flex;"><span>  <span style="color:#309;font-weight:bold">&#34;refresh_token&#34;</span> : <span style="color:#c30">&#34;eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOlsic3czNjAtUkVTVC1BUEkiXSwidXNlcl9uYW1lIjoiYWRtaW5Ac3czNjAub3JnIiwic2NvcGUiOlsiUkVBRCJdLCJhdGkiOiJkNjhlZjVhYS1lNDkzLTRjZjEtYjY0ZC01YTkxN2RjYzZlNjAiLCJleHAiOjE1NjM4MDYwNDQsImF1dGhvcml0aWVzIjpbIlJFQUQiXSwianRpIjoiM2VkZDcxODAtMTBlYi00Y2MwLTg0NTUtMGYwZmIyMWMwYmU0IiwiY2xpZW50X2lkIjoiMTcyMmZmYzdkZWE3MTU3OGQ5ZWE1ZTZhNmMwMDA4NzMifQ.iMGfdHWpJNseoxIk7tKCNTyC1w4_AJ4cSv6kO64_BkF54MLudvyf9uVSIHpAeHhSFdvhbjksynRqq_u78vW8ptY1la65Qx8glHz0sktWBfMDJsUA4ynU2iZbKU92f2OOf3wQRVt38-Y1mBUsDMIStyKTDeIXGT3LJr_8k5dRAGvayixaezxDFw3dWK2M6P9h-ZnfEP47HpIUZrG8cgwPmNCZ9gBXsqVnueDYZth6TaEKIvWbkZtwY0ikWKyJL2xLm78O1ii3lA5ENt5I0DTfTm8QuK_zcm679W9jF0jvwIR71fM0JSWjkBoXd2h9oLmE2CF2sFVaJor_ermk-L0LsA&#34;</span>,
+</span></span><span style="display:flex;"><span>  <span style="color:#309;font-weight:bold">&#34;expires_in&#34;</span> : <span style="color:#f60">3599</span>,
+</span></span><span style="display:flex;"><span>  <span style="color:#309;font-weight:bold">&#34;scope&#34;</span> : <span style="color:#c30">&#34;READ&#34;</span>,
+</span></span><span style="display:flex;"><span>  <span style="color:#309;font-weight:bold">&#34;jti&#34;</span> : <span style="color:#c30">&#34;d68ef5aa-e493-4cf1-b64d-5a917dcc6e60&#34;</span>
 </span></span><span style="display:flex;"><span>}
 </span></span></code></pre></div><p>Of course, the username and password must be your user credentials and the client id and secret have to be replaced with the configured values. And again, the wanted value is the value of the field <code>access_token</code> and probably <code>refresh_token</code>.</p>
 <p>More Links:</p>
@@ -1095,24 +1095,24 @@ authentication of the <code>authorization-server</code> properly:</p>
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/restapi/index.html b/docs/development/restapi/index.html
index 421dd79..c36fe40 100644
--- a/docs/development/restapi/index.html
+++ b/docs/development/restapi/index.html
@@ -298,6 +298,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -305,7 +309,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -317,29 +336,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -358,10 +358,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -374,6 +370,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -692,24 +692,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/restapi/index.xml b/docs/development/restapi/index.xml
index 5b9e648..ac9d31f 100644
--- a/docs/development/restapi/index.xml
+++ b/docs/development/restapi/index.xml
@@ -460,10 +460,10 @@ The following example shows some ideas of the REST API. It can be obtained by&lt
 &lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-json&#34; data-lang=&#34;json&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;{
 &lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#309;font-weight:bold&#34;&gt;&amp;#34;access_token&amp;#34;&lt;/span&gt; : &lt;span style=&#34;color:#c30&#34;&gt;&amp;#34;eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOlsic3czNjAtUkVTVC1BUEkiXSwidXNlcl9uYW1lIjoiYWRtaW5Ac3czNjAub3JnIiwic2NvcGUiOlsiUkVBRCJdLCJleHAiOjE1NjM4MDYwNDQsImF1dGhvcml0aWVzIjpbIlJFQUQiXSwianRpIjoiZDY4ZWY1YWEtZTQ5My00Y2YxLWI2NGQtNWE5MTdkY2M2ZTYwIiwiY2xpZW50X2lkIjoiMTcyMmZmYzdkZWE3MTU3OGQ5ZWE1ZTZhNmMwMDA4NzMifQ.iO5sLrqRcZfzvMP5gjaJhk3caWyZLkUesdbMfqCGy4V5rbnU9QP1LjdybY0Udh8hvAvhlpqPfaxeKe1c3-gQs5MYlqG0lNQCyWcb7NRHj8VFlwLPuJRZJNk3tybvgITVm9r14pfAXogpVE0S4KihD2W1_SoKH4NzTa2vOEG0CK4VzCLetxUlUuePxZH8ugouqbS2d0SpyeeMTm-PzxzzeTb_4ulGpg63eE1v7GvTsI23uh2WfIgHBa1GRr5jWtE0Meq-5UFCVQkhMm8P-r8wO2iuRblCu6a-bWwy7bfdj3S2VDnqSQskE2dVrC_qMs-V2AGvCV1xvlF0P8A4tgwL-w&amp;#34;&lt;/span&gt;,
 &lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#309;font-weight:bold&#34;&gt;&amp;#34;token_type&amp;#34;&lt;/span&gt; : &lt;span style=&#34;color:#c30&#34;&gt;&amp;#34;bearer&amp;#34;&lt;/span&gt;,
-&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#309;font-weight:bold&#34;&gt;&amp;#34;refresh_token&amp;#34;&lt;/span&gt; : &lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;&amp;#34;eyJhbGciOiJSUzI&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;NiIsInR&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;5&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;cCI&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;6&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;IkpXVCJ&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;9&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;.eyJhdWQiOlsic&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;3&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;czNjAtUkVTVC&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;BUEkiXSwidXNlcl&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;9&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;uYW&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;lIjoiYWRtaW&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;5&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;Ac&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;3&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;czNjAub&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;3&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;JnIiwic&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;NvcGUiOlsiUkVBRCJdLCJhdGkiOiJkNjhlZjVhYS&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;lNDkzLTRjZjEtYjY&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;0&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;ZC&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;01&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;YTkxN&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;RjYzZlNjAiLCJleHAiOjE&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;NjM&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;4&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;MDYwNDQsImF&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;dGhvcml&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;0&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;aWVzIjpbIlJFQUQiXSwianRpIjoiM&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;VkZDcxODAtMTBlYi&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;00&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;Y&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;MwLTg&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;0&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;NTUtMGYwZmIyMWMwYmU&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;0&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;IiwiY&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;xpZW&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;50&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;X&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;lkIjoiMTcyMmZmYzdkZWE&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;3&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;MTU&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;3&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;OGQ&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;5&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;ZWE&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;ZTZhNmMwMDA&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;4&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;NzMifQ.iMGfdHWpJNseoxIk&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;7&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;tKCNTyC&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;w&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;4&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;_AJ&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;4&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;cSv&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;6&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;kO&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;64&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;_BkF&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;54&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;MLudvyf&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;9&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;uVSIHpAeHhSFdvhbjksynRqq_u&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;78&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;vW&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;8&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;ptY&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;la&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;65&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;Qx&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;8&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;glHz&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;0&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;sktWBfMDJsUA&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;4&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;ynU&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;iZbKU&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;92&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;f&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;OOf&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;3&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;wQRVt&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;38&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;-Y&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;mBUsDMIStyKTDeIXGT&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;3&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;LJr_&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;8&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;k&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;5&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;dRAGvayixaezxDFw&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;3&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;dWK&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;M&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;6&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;P&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;9&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;h-ZnfEP&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;47&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;HpIUZrG&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;8&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;cgwPmNCZ&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;9&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;gBXsqVnueDYZth&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;6&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;TaEKIvWbkZtwY&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;0&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;ikWKyJL&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;xLm&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;78&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;O&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;ii&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;3&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;lA&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;5&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;ENt&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;5&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;I&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;0&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;DTfTm&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;8&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;QuK_zcm&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;679&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;W&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;9&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;jF&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;0&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;jvwIR&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;71&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;fM&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;0&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;JSWjkBoXd&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;h&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;9&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;oLmE&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;CF&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;sFVaJor_ermk-L&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;0&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;LsA&lt;/span&gt;&lt;span style=&#34;color:#c30&#34;&gt;&amp;#34;,
-&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#c30&#34;&gt;  &amp;#34;&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;expires_in&lt;/span&gt;&lt;span style=&#34;color:#c30&#34;&gt;&amp;#34; : 3599,
-&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#c30&#34;&gt;  &amp;#34;&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;scope&lt;/span&gt;&lt;span style=&#34;color:#c30&#34;&gt;&amp;#34; : &amp;#34;&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;READ&lt;/span&gt;&lt;span style=&#34;color:#c30&#34;&gt;&amp;#34;,
-&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#c30&#34;&gt;  &amp;#34;&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;jti&lt;/span&gt;&lt;span style=&#34;color:#c30&#34;&gt;&amp;#34; : &amp;#34;&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;d&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;68&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;ef&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;5&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;aa-e&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;493-4&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;cf&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;-b&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;64&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;d&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;-5&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;a&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;917&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;dcc&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;6e60&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;&amp;#34;&lt;/span&gt;
+&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#309;font-weight:bold&#34;&gt;&amp;#34;refresh_token&amp;#34;&lt;/span&gt; : &lt;span style=&#34;color:#c30&#34;&gt;&amp;#34;eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOlsic3czNjAtUkVTVC1BUEkiXSwidXNlcl9uYW1lIjoiYWRtaW5Ac3czNjAub3JnIiwic2NvcGUiOlsiUkVBRCJdLCJhdGkiOiJkNjhlZjVhYS1lNDkzLTRjZjEtYjY0ZC01YTkxN2RjYzZlNjAiLCJleHAiOjE1NjM4MDYwNDQsImF1dGhvcml0aWVzIjpbIlJFQUQiXSwianRpIjoiM2VkZDcxODAtMTBlYi00Y2MwLTg0NTUtMGYwZmIyMWMwYmU0IiwiY2xpZW50X2lkIjoiMTcyMmZmYzdkZWE3MTU3OGQ5ZWE1ZTZhNmMwMDA4NzMifQ.iMGfdHWpJNseoxIk7tKCNTyC1w4_AJ4cSv6kO64_BkF54MLudvyf9uVSIHpAeHhSFdvhbjksynRqq_u78vW8ptY1la65Qx8glHz0sktWBfMDJsUA4ynU2iZbKU92f2OOf3wQRVt38-Y1mBUsDMIStyKTDeIXGT3LJr_8k5dRAGvayixaezxDFw3dWK2M6P9h-ZnfEP47HpIUZrG8cgwPmNCZ9gBXsqVnueDYZth6TaEKIvWbkZtwY0ikWKyJL2xLm78O1ii3lA5ENt5I0DTfTm8QuK_zcm679W9jF0jvwIR71fM0JSWjkBoXd2h9oLmE2CF2sFVaJor_ermk-L0LsA&amp;#34;&lt;/span&gt;,
+&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#309;font-weight:bold&#34;&gt;&amp;#34;expires_in&amp;#34;&lt;/span&gt; : &lt;span style=&#34;color:#f60&#34;&gt;3599&lt;/span&gt;,
+&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#309;font-weight:bold&#34;&gt;&amp;#34;scope&amp;#34;&lt;/span&gt; : &lt;span style=&#34;color:#c30&#34;&gt;&amp;#34;READ&amp;#34;&lt;/span&gt;,
+&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#309;font-weight:bold&#34;&gt;&amp;#34;jti&amp;#34;&lt;/span&gt; : &lt;span style=&#34;color:#c30&#34;&gt;&amp;#34;d68ef5aa-e493-4cf1-b64d-5a917dcc6e60&amp;#34;&lt;/span&gt;
 &lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;}
 &lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;Of course, the username and password must be your user credentials and the client id and secret have to be replaced with the configured values. And again, the wanted value is the value of the field &lt;code&gt;access_token&lt;/code&gt; and probably &lt;code&gt;refresh_token&lt;/code&gt;.&lt;/p&gt;
 &lt;p&gt;More Links:&lt;/p&gt;
diff --git a/docs/development/testcases/index.html b/docs/development/testcases/index.html
index 4de34e3..1ec42df 100644
--- a/docs/development/testcases/index.html
+++ b/docs/development/testcases/index.html
@@ -298,6 +298,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -305,7 +309,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -317,29 +336,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -358,10 +358,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -374,6 +370,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -670,24 +670,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/testcases/index.xml b/docs/development/testcases/index.xml
index 2bf5e56..b31609f 100644
--- a/docs/development/testcases/index.xml
+++ b/docs/development/testcases/index.xml
@@ -22,7 +22,7 @@
       <description>
         
         
-        &lt;h2 id=&#34;add-a-component-and-release-with-vendor-present&#34;&gt;Add a component and release with vendor present&lt;/h2&gt;
+        &lt;h2 id=&#34;tc01-add-a-component-and-release-with-vendor-present&#34;&gt;TC01: Add a component and release with vendor present&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -39,82 +39,92 @@
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Components&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Components&lt;/em&gt; tab&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Components&lt;/em&gt; page is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Component&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;New Component&lt;/em&gt; page is displayed with mandatory fields marked with red star&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Component&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;- &lt;em&gt;New Component&lt;/em&gt; page is displayed with mandatory fields marked with red star: Name, Categories, Component Type. &lt;br&gt;- A message &lt;em&gt;Success:New Component&lt;/em&gt; is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Fill in a component &lt;em&gt;Name&lt;/em&gt; and &lt;em&gt;Categories&lt;/em&gt; and click &lt;em&gt;Add Component&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The page remain the same and the message &lt;em&gt;You are editing the original document.&lt;/em&gt; is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Fill in a component &lt;em&gt;Name&lt;/em&gt;, &lt;em&gt;Categories&lt;/em&gt; and &lt;em&gt;Component Type&lt;/em&gt; fields. &lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt;&lt;br&gt;- Name: Component 1@1&lt;br&gt;- Categories: Categories_1@1&lt;br&gt;- Component Type: OSS&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The page changes to &lt;em&gt;New Release Edit&lt;/em&gt; page&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Create Component&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;- Create component successfully. &lt;br&gt;- Redirect to the edit component page.&lt;br&gt;-Show message: &lt;em&gt;Success:You are editing the original document.&lt;/em&gt;&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;6&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Fill in a release &lt;em&gt;Version&lt;/em&gt; and &lt;em&gt;CPE ID&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Releases&lt;/em&gt; tab&lt;br&gt;Click &lt;em&gt;Add Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Redirect to Add Release page&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;7&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The page remain the same and the message &lt;em&gt;You are editing the original document.&lt;/em&gt; is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Fill in a release &lt;em&gt;Version&lt;/em&gt; and &lt;em&gt;CPE ID&lt;/em&gt;&lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt;&lt;br&gt;- Version: version1.0.0.x&lt;br&gt;- CPE ID: UUID_1002&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields:&lt;br&gt;- Version: version1.0.0.x&lt;br&gt;- CPE ID: UUID_1002&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;8&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Vendor&lt;/em&gt; field&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Search Vendor&lt;/em&gt; dialog is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Create Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;- Create a release successfully.&lt;br&gt;- Redirect to the edit new release page.&lt;br&gt;- The message &lt;em&gt;Success:You are editing the original document.&lt;/em&gt; is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;9&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Search&lt;/em&gt; for a Vendor, select it and click &lt;em&gt;Select&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Dialog is closed and selected Vendor is added under &lt;em&gt;Vendor&lt;/em&gt; field&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Vendor&lt;/em&gt; field&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Search Vendor&lt;/em&gt; dialog is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;10&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Attachments&lt;/em&gt; link&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Attachments&lt;/em&gt; page is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Vendor&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Create new Vendor&lt;/em&gt; dialog display&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;11&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Add Attachment&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Upload Attachment&lt;/em&gt; dialog is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Input data in fields&lt;br&gt;- Full Name: add vendor 01&lt;br&gt;-Short Name: add vendor01&lt;br&gt;-URL: &lt;a href=&#34;https://github.com/eclipse-sw360/sw360&#34;&gt;https://github.com/eclipse-sw360/sw360&lt;/a&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;12&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Browse&lt;/em&gt; and select the attachment&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;File name is displayed in the dialog&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Vendor&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The vendor is added in Vendor field of the release with full name is &lt;em&gt;add vendor 01&lt;/em&gt;&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;13&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Upload&lt;/em&gt; button&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The file is uploaded and dialog is closed. Also the attached file is listed in the &lt;em&gt;Attachment&lt;/em&gt; page&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Attachments&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Attachments&lt;/em&gt; page is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;14&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Change the &lt;em&gt;Attachment type&lt;/em&gt; to real type, e.g. &lt;em&gt;Source file&lt;/em&gt; if it is a source file&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Type changed successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Attachment&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Upload Attachment&lt;/em&gt; dialog is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;15&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Release updated successfully!&lt;/em&gt; message is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Browse&lt;/em&gt; and select the attachment.&lt;br&gt;Eg: attachment1.xlsx&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;File name is displayed in the dialog&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;16&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Components&lt;/em&gt; tab&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The new component should be added to the components list (e.g. filter by &lt;em&gt;Keyword Search&lt;/em&gt;)&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Upload&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The file is uploaded and dialog is closed. Also the attached file is listed in the &lt;em&gt;Attachment&lt;/em&gt; page&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;17&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Change the attachment &lt;em&gt;Type&lt;/em&gt; to real type.&lt;br&gt;Eg: Component license information (Combined)&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Type changed successfully&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;18&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Message: &lt;em&gt;Success:Release {name} ({version}) updated successfully!&lt;/em&gt; is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;modify-a-component-and-release-with-vendor-present&#34;&gt;Modify a component and release with vendor present&lt;/h2&gt;
+&lt;h2 id=&#34;tc02-verify-data-after-add-a-component-and-release-with-vendor-present&#34;&gt;TC02: Verify data after add a component and release with vendor present&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -126,17 +136,32 @@
 &lt;tbody&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;1&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Search for an existing component (e.g. created in TC01) and click &lt;em&gt;Edit&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;You are editing the original document&lt;/em&gt; message is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Search for the component is created in TC01:&lt;br&gt;- Click &lt;em&gt;Components&lt;/em&gt; portlet&lt;br&gt;- At Advanced Search area, input &lt;em&gt;Component 1@1&lt;/em&gt; in the &lt;em&gt;Component Name&lt;/em&gt; textbox.&lt;br&gt;- Click &lt;em&gt;Search&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The new component display in the table with:&lt;br&gt;- Vendor: add vendor01&lt;br&gt;- Component Name: &lt;em&gt;Component 1@1&lt;/em&gt; is displayed with hyper link.&lt;br&gt;- Main licenses: blank&lt;br&gt;- Component Type: OSS&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Execute steps 5-16 from TC01&lt;/td&gt;
-&lt;td&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click hyper link of name &lt;em&gt;Component 1@1&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Redirect to view component &lt;em&gt;Component 1@1&lt;/em&gt; page&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Release Overview&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The release display with:&lt;br&gt;- Name: Component 1@1&lt;br&gt;- Version displays with hyper link: version1.0.0.x&lt;br&gt;- Clearing State: New&lt;br&gt;- Clearing Report: no report&lt;br&gt;- Release Mainline State: Open&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click hyper link &lt;em&gt;version1.0.0.x&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Redirect to view screen of release &lt;em&gt;Component 1@1 version1.0.0.x&lt;/em&gt;&lt;br&gt;Data of the release:&lt;br&gt;- Summary tab:&lt;br&gt;+ display text with: COMPONENT 1@1 VERSION1.0.0.X&lt;br&gt;+ CPE ID: UUID_1002&lt;br&gt;+ Created on: date of created.&lt;br&gt;+ Created by: user created.&lt;br&gt;+ Modified On: date of modified.&lt;br&gt;+ Modified By: user modified.&lt;br&gt;+ Clearing State: New&lt;br&gt;+ Release Mainline State: Open&lt;br&gt;+ Release Vendor with:&lt;br&gt;   Full Name:	add vendor 01&lt;br&gt;   Short Name: add vendor01&lt;br&gt;   URL: &lt;a href=&#34;https://github.com/eclipse-sw360/sw360&#34;&gt;https://github.com/eclipse-sw360/sw360&lt;/a&gt;&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Attachments&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Display file name &lt;em&gt;attachment1.xlsx&lt;/em&gt; in the table.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;add-and-modify-a-component-and-release-with-all-fields-filled-in&#34;&gt;Add and modify a component and release with all fields filled in&lt;/h2&gt;
+&lt;h2 id=&#34;tc03-modify-a-component-and-release-with-vendor-present&#34;&gt;TC03: Modify a component and release with vendor present&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -148,87 +173,99 @@
 &lt;tbody&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;1&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Components&lt;/em&gt; tab&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Components&lt;/em&gt; page is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Search for an existing component (e.g. created in TC01: &lt;em&gt;Component 1@1&lt;/em&gt;) and click &lt;em&gt;Edit&lt;/em&gt; icon&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Success:You are editing the original document&lt;/em&gt; message is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Component&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;New Component&lt;/em&gt; page is displayed with mandatory fields marked with red star&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Releases&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Release list is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Fill in all editable fields under &lt;em&gt;Basic Information&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Redirect to Add Release page&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Component&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The page remain the same and the message &lt;em&gt;You are editing the original document.&lt;/em&gt; is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Fill in a release &lt;em&gt;Version&lt;/em&gt; and &lt;em&gt;CPE ID&lt;/em&gt;&lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt;&lt;br&gt;- Version: v1.0.0.1&lt;br&gt;- CPE ID: cpe:id:123456&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields:&lt;br&gt;- Version: v1.0.0.1&lt;br&gt;- CPE ID: cpe:id:123456&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The page changes to &lt;em&gt;New Release Edit&lt;/em&gt; page&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Create Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;- Redirect to the edit new release page.&lt;br&gt;- The message &lt;em&gt;Success:You are editing the original document.&lt;/em&gt; is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;6&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Fill in all editable fields under &lt;em&gt;Release Summary&lt;/em&gt; and &lt;em&gt;Release Repository&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Vendor&lt;/em&gt; field&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Search Vendor&lt;/em&gt; dialog is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;7&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The page remain the same and the message &lt;em&gt;You are editing the original document.&lt;/em&gt; is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Search&lt;/em&gt; button.&lt;br&gt;Select a vendor (eg: select  vendor with full name &lt;em&gt;VendorUp&lt;/em&gt;) &lt;br&gt;Click &lt;em&gt;Select Vendor&lt;/em&gt; button.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Dialog is closed and selected Vendor is  added under &lt;em&gt;Vendor&lt;/em&gt; field: VendorUp&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;8&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Linked Releases&lt;/em&gt; link&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Linked Releases&lt;/em&gt; page displayed successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Attachments&lt;/em&gt; tab&lt;br&gt;Click &lt;em&gt;Add Attachment&lt;/em&gt; button&lt;br&gt;Click &lt;em&gt;Browse&lt;/em&gt; and select the attachment. Eg:  attachment2.img&lt;br&gt;Click &lt;em&gt;Upload&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The file is uploaded and dialog is closed.  Also the attached file is listed in the Attachment page&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;9&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Click to add Releases&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Search Release&lt;/em&gt; dialog is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Message &lt;em&gt;Success:Release Component 1@1  (v1.0.0.1) updated successfully!&lt;/em&gt; is displayed&lt;/td&gt;
 &lt;/tr&gt;
+&lt;/tbody&gt;
+&lt;/table&gt;
+&lt;h2 id=&#34;tc04-verify-data-after--modify-a-component-and-release-with-vendor-present&#34;&gt;TC04: Verify data after  modify a component and release with vendor present&lt;/h2&gt;
+&lt;table&gt;
+&lt;thead&gt;
 &lt;tr&gt;
-&lt;td style=&#34;text-align:right&#34;&gt;10&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Search by name&lt;/em&gt; and &lt;em&gt;Select&lt;/em&gt; a release to be added&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Dialog is closed and selected release is displayed under &lt;em&gt;Linked Releases&lt;/em&gt; section&lt;/td&gt;
+&lt;th style=&#34;text-align:right&#34;&gt;Step&lt;/th&gt;
+&lt;th style=&#34;text-align:left&#34;&gt;Action&lt;/th&gt;
+&lt;th style=&#34;text-align:left&#34;&gt;Result&lt;/th&gt;
 &lt;/tr&gt;
+&lt;/thead&gt;
+&lt;tbody&gt;
 &lt;tr&gt;
-&lt;td style=&#34;text-align:right&#34;&gt;11&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Clearing Details&lt;/em&gt; link&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Clearing Details&lt;/em&gt; dialog is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;1&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Continue TC03&lt;/td&gt;
+&lt;td&gt;&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
-&lt;td style=&#34;text-align:right&#34;&gt;12&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Fill in all editable fields&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields&lt;/td&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Summary&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Data in the tab:&lt;br&gt;- Modified On: date of modified.&lt;br&gt;- Modified By: user modified.&lt;br&gt;Data of other fields in the tab is same data before updated.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
-&lt;td style=&#34;text-align:right&#34;&gt;13&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Attachments&lt;/em&gt; link and upload a file&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;File attached successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Release Overview&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;New release with version &lt;em&gt;v1.0.0.1&lt;/em&gt;  is added in the release  table.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
-&lt;td style=&#34;text-align:right&#34;&gt;14&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Release updated successfully!&lt;/em&gt; message is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;v1.0.0.1&lt;/em&gt; hyper link&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Text display with: &lt;em&gt;COMPONENT 1@1  V1.0.0.1&lt;/em&gt; at the right corner.&lt;br&gt;- At Summary tab: &lt;br&gt;  + CPE ID: cpe:id:123456&lt;br&gt;  + Release Vendor: display with Full Name, Short Name and URL correctly with  vendor &lt;em&gt;VendorUp&lt;/em&gt;  &lt;br&gt;- At Attachments tab: attachment &lt;em&gt;attachment2.img&lt;/em&gt; display in  the attachment table with correct information.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
-&lt;td style=&#34;text-align:right&#34;&gt;15&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Check all fields of the release under &lt;em&gt;Summary&lt;/em&gt;, &lt;em&gt;Linked Releases&lt;/em&gt;, &lt;em&gt;Clearing Details&lt;/em&gt; and &lt;em&gt;Attachments&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Values are filled in correctly&lt;/td&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Component 1@1&lt;/em&gt; hyper link&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Redirect to view screen of &lt;em&gt;Component 1@1&lt;/em&gt;  component.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
-&lt;td style=&#34;text-align:right&#34;&gt;16&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Edit&lt;/em&gt; button, modify some fields and &lt;em&gt;Update Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Values are updated successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;6&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Attachments&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Data in the tab is same data before updated.&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;7&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Vulnerabilities&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Data in the tab is same data before updated.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;delete-a-component-that-is-first-linked-to-a-project-and-then-not-and-a-project&#34;&gt;Delete a component that is first linked to a project and then not, and a project&lt;/h2&gt;
+&lt;h2 id=&#34;tc05-add-and-modify-a-component-and-release-with-all-fields-filled-in&#34;&gt;TC05: Add and modify a component and release with all fields filled in&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -240,52 +277,67 @@
 &lt;tbody&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;1&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Create a new component&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Component is created successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Components&lt;/em&gt; tab&lt;br&gt;Click &lt;em&gt;Add Component&lt;/em&gt; button&lt;br&gt;Fill in all editable fields&lt;br&gt;Click &lt;em&gt;Create Component&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;- Redirect to edit component screen with the  message &lt;em&gt;Success:You are editing the original document.&lt;/em&gt; is displayed in the  left corner.&lt;br&gt;- Create component successfully. Data match with input  data.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Add a new release to this component&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Release is added successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Releases&lt;/em&gt; tab.&lt;br&gt;Click &lt;em&gt;Add Releases&lt;/em&gt; button.&lt;br&gt;At &lt;em&gt;Summary&lt;/em&gt; tab, fill in all editable fields under &lt;em&gt;Release Summary&lt;/em&gt; and &lt;em&gt;Release Repository&lt;/em&gt;.&lt;br&gt;Click &lt;em&gt;Create Release&lt;/em&gt; button.&lt;br&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Redirect to edit release screen.&lt;br&gt;Created release successfully. Data match with input data.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Create a new project&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Project is created successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Linked Releases&lt;/em&gt; tab&lt;br&gt;Click &lt;em&gt;Click to add Releases&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The dialog &lt;em&gt;Link Releases&lt;/em&gt; is displayed.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Add the linked release created above to this project&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Release linked successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Input search name into textbox&lt;br&gt;Click &lt;em&gt;Search&lt;/em&gt; button&lt;br&gt;Select 3 releases.&lt;br&gt;Click &lt;em&gt;Link Releases&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Dialog is closed and selected release is displayed under &lt;em&gt;Linked Releases&lt;/em&gt; section.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Go to components, try to delete the newly created component (that is linked to a project)&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Message &lt;em&gt;I could not delete the component!&lt;/em&gt; is displayed.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Linked Packages&lt;/em&gt; tab&lt;br&gt;Click &lt;em&gt;Add Packages&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The dialog &lt;em&gt;Link Packages&lt;/em&gt; is displayed.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;6&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;OK&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Component is not deleted&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Input an exist orphan package name into textbox.&lt;br&gt;Click &lt;em&gt;Search&lt;/em&gt; button.&lt;br&gt;Select a package.&lt;br&gt;Click &lt;em&gt;Link Packages&lt;/em&gt; button.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Dialog is closed and selected package is displayed under &lt;em&gt;Linked Packages&lt;/em&gt; table&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;7&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Go to Projects, delete the newly created project&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Project is deleted successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Clearing Details&lt;/em&gt; tab&lt;br&gt;Fill in all editable fields&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;8&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Go to components, delete the newly created components (not linked anymore to a project)&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Message &lt;em&gt;Do you want to delete component?&lt;/em&gt; is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;ECC Details&lt;/em&gt; tab&lt;br&gt;Fill in all editable fields&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;9&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;OK&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Component is deleted successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Attachments&lt;/em&gt; tab&lt;br&gt;Click &lt;em&gt;Add Attachment&lt;/em&gt; button&lt;br&gt;Click &lt;em&gt;Browse&lt;/em&gt; and select the attachment. &lt;em&gt;Eg&lt;/em&gt;: attachment3.xlsx&lt;br&gt;Click &lt;em&gt;Upload&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The file is uploaded and dialog is closed. Also the attached file is listed in the Attachment page&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;10&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;- &lt;em&gt;Success:Release {componentName} ({version}) updated successfully!&lt;/em&gt; message is displayed.&lt;br&gt;- Redirect to the view release screen.&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;11&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Check all fields of the release by click tabs: &lt;em&gt;Summary, Linked Releases, Linked Packages, Clearing Details and Attachments&lt;/em&gt;.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Values are filled in correctly, match with input data.&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;12&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Edit Release&lt;/em&gt; button, modify some fields.&lt;br&gt;Eg: &lt;br&gt;- &lt;em&gt;Version&lt;/em&gt; field ( in &lt;em&gt;Summary&lt;/em&gt; tab): rename version name_updated&lt;br&gt;      - &lt;em&gt;ECC Status&lt;/em&gt; field (in &lt;em&gt;ECC Details&lt;/em&gt; tab): Approved.&lt;br&gt;Click &lt;em&gt;Update Release&lt;/em&gt; button.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Values are updated successfully&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;add-new-attachments-to-an-existing-release-and-delete-attachments&#34;&gt;Add new attachments to an existing release and delete attachments&lt;/h2&gt;
+&lt;h2 id=&#34;tc06-delete-a-component-that-is-first-linked-to-a-project-and-then-not-and-a-project&#34;&gt;TC06: Delete a component that is first linked to a project and then not, and a project&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -297,82 +349,149 @@
 &lt;tbody&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;1&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Search for an existing component (e.g. created in TC01) and click &lt;em&gt;Release Overview&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The list of releases are displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Create a new component&lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt; component with name &lt;em&gt;Component @1234&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Component is created successfully&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on release version that needs a new attachment&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Release Summary: name&lt;/em&gt; page is displayed for the selected release&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Add a new release to this component&lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt; release &lt;em&gt;Rel1&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Release is added successfully&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Edit&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;You are editing the original document.&lt;/em&gt; message is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Create a new project &lt;em&gt;P1&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Project is created successfully&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Attachments&lt;/em&gt; link&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Attachments&lt;/em&gt; page is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Add the linked release &lt;em&gt;Rel1&lt;/em&gt; to project &lt;em&gt;P1&lt;/em&gt;.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Release linked successfully&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Add Attachment&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Upload Attachment&lt;/em&gt; dialog is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Components&lt;/em&gt; portlet.&lt;br&gt;Search component &lt;em&gt;Component @1234&lt;/em&gt; by name at advanced search.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Component &lt;em&gt;Component @1234&lt;/em&gt; display on the result table.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;6&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Browse&lt;/em&gt; and select several attachments&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;File names are displayed in the dialog&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click delete icon of component &lt;em&gt;Component @1234&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;A warning &lt;em&gt;The component Component @1234 cannot be deleted, since it contains 1 releases. Please delete the releases first.&lt;/em&gt;&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;7&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Cancel&lt;/em&gt; near some files not to be added&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;File names are removed from the list&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;OK&lt;/em&gt; button in the warning dialog.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The dialog is closed, component is not deleted&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;8&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Upload&lt;/em&gt; button for the remaining files&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The files are uploaded and dialog is closed. Also the attached file are listed in the &lt;em&gt;Attachment&lt;/em&gt; page&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Components&lt;/em&gt; portlet.&lt;br&gt;Search for the component &lt;em&gt;Component @1234&lt;/em&gt; and click hyper link of component &lt;em&gt;Component @1234&lt;/em&gt;.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;View screen of &lt;em&gt;Component @1234&lt;/em&gt; component is display&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;9&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Change some &lt;em&gt;Attachment type&lt;/em&gt; to real type, e.g. &lt;em&gt;Source file&lt;/em&gt; if it is a source file&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Type changed successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Release&lt;/em&gt; Overview.&lt;br&gt;Click Delete icon button of release &lt;em&gt;Rel1&lt;/em&gt;.&lt;br&gt;Click &lt;em&gt;Delete Release&lt;/em&gt; button in the dialog.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;- Dialog &lt;em&gt;Delete Releases&lt;/em&gt; is displayed.&lt;br&gt;- Delete the release is failure.&lt;br&gt;- The message: &lt;em&gt;I could not delete the release, since it is used by another component (release) or project&lt;/em&gt; display.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;10&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Release updated successfully!&lt;/em&gt; message is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Go to project &lt;em&gt;P1&lt;/em&gt;, delete project &lt;em&gt;P1&lt;/em&gt;.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The project is deleted successfully&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;11&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Edit&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;You are editing the original document.&lt;/em&gt; message is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Go to component &lt;em&gt;Component @1234&lt;/em&gt;, at  &lt;em&gt;Release Overview&lt;/em&gt; tab, click Delete icon button of release &lt;em&gt;Rel1&lt;/em&gt;.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Show message: &lt;em&gt;Do you really want to delete the release {componentName} ({version}) ?&lt;/em&gt;&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;12&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Attachments&lt;/em&gt; link&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Attachments&lt;/em&gt; page is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Delete Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Release is deleted successfully&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;13&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Delete&lt;/em&gt; icon to delete an attachment&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Message &lt;em&gt;Do you really want to delete this attachment?&lt;/em&gt; is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Edit Component&lt;/em&gt; button.&lt;br&gt;Click &lt;em&gt;Delete Component&lt;/em&gt; button.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The dialog is displayed with message: &lt;em&gt;Do you really want to delete the component {componentName} ?&lt;/em&gt;&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;14&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;OK&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Attachment is deleted successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Delete Component&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Component is deleted successfully&lt;/td&gt;
+&lt;/tr&gt;
+&lt;/tbody&gt;
+&lt;/table&gt;
+&lt;h2 id=&#34;tc07-add-new-attachments-to-an-existing-release-and-delete-attachments&#34;&gt;TC07: Add new attachments to an existing release and delete attachments&lt;/h2&gt;
+&lt;table&gt;
+&lt;thead&gt;
+&lt;tr&gt;
+&lt;th style=&#34;text-align:right&#34;&gt;Step&lt;/th&gt;
+&lt;th style=&#34;text-align:left&#34;&gt;Action&lt;/th&gt;
+&lt;th style=&#34;text-align:left&#34;&gt;Result&lt;/th&gt;
 &lt;/tr&gt;
+&lt;/thead&gt;
+&lt;tbody&gt;
 &lt;tr&gt;
-&lt;td style=&#34;text-align:right&#34;&gt;15&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Release updated successfully!&lt;/em&gt; message is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;1&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Search for an existing component (e.g. created in TC01) and click &lt;em&gt;Release Overview&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The list of releases are displayed&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click edit icon in the Action column of release version that needs a new attachment. &lt;em&gt;Eg:&lt;/em&gt; release &lt;em&gt;Rel1&lt;/em&gt;.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Edit release &lt;em&gt;Rel1&lt;/em&gt; page is displayed.&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Attachments&lt;/em&gt; tab&lt;br&gt;Click &lt;em&gt;Add Attachment&lt;/em&gt; button&lt;br&gt;Click &lt;em&gt;Browse&lt;/em&gt; and select several attachments.&lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt; 5 attachment files (att1, att2, att3, att4, att5)&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;File names are displayed in the dialog&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Delete&lt;/em&gt; button near some files not to be added.&lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt; delete 2 attachment files (att1, att3)&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;File names are removed from the list&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Upload&lt;/em&gt; button for the remaining files.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The attached file are listed in the &lt;em&gt;Attachment&lt;/em&gt; page: att2, att4, att5&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;6&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Change some &lt;em&gt;Attachment type&lt;/em&gt; to real type, e.g. &lt;em&gt;source file, clearing report, CLI,&amp;hellip;&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Type changed successfully&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;7&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Release &lt;em&gt;Ree1&lt;/em&gt; is updated correctly.&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;8&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Edit Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Success:You are editing the original document.&lt;/em&gt; message is displayed&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;9&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Attachments&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Attachments&lt;/em&gt; page is displayed&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;10&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click delete icon to delete an attachment&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Show message: &lt;em&gt;Do you really want to delete attachment {attachmentName}({attachmentId})?&lt;/em&gt;&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;11&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Delete Attachment button&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Attachment is deleted successfully, data of attachment is removed from attachment table.&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;12&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Release Ree1 is updated correctly with message &lt;em&gt;Success: Release {componentName}({version}) updated successfully!&lt;/em&gt;&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;duplicate-an-existing-release&#34;&gt;Duplicate an existing release&lt;/h2&gt;
+&lt;h2 id=&#34;tc08-duplicate-an-existing-release&#34;&gt;TC08: Duplicate an existing release&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -384,47 +503,47 @@
 &lt;tbody&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;1&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Search for an existing component with release with all fields filled in (e.g. created in TC03) and click &lt;em&gt;Release Overview&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Search for an existing component with release with all fields filled in (Eg: created in TC05) and click &lt;em&gt;Release Overview&lt;/em&gt;&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;The list of releases are displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Duplicate&lt;/em&gt; button under Action column&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The page changes to &lt;em&gt;Release name Edit&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The page changes to create duplicate release screen&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;Check all fields from copied release&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;All fields from &lt;em&gt;Release Summary&lt;/em&gt; and &lt;em&gt;Repository&lt;/em&gt; are unchanged&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;- &lt;em&gt;Summary&lt;/em&gt; tab:&lt;br&gt;  + &lt;em&gt;CPE ID&lt;/em&gt; field: blank&lt;br&gt;  + Remain fields are unchanged (exclude disable fields).&lt;br&gt;- &lt;em&gt;Linked Releases&lt;/em&gt; tab: there is no linked release.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Change the &lt;em&gt;Version&lt;/em&gt; field to a new one, fill in a &lt;em&gt;CPE ID&lt;/em&gt; and click &lt;em&gt;Add Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;You are editing the original document.&lt;/em&gt; message is displayed.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Change the &lt;em&gt;Version&lt;/em&gt; field and fill in a &lt;em&gt;CPE ID&lt;/em&gt;.&lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt;  Version: ver_duplicate&lt;br&gt;       CPE ID: CPE ID_duplicate&lt;br&gt;Click &lt;em&gt;Create Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;- Redirect to edit release screen.&lt;br&gt;- Create duplicate release is success with message: &lt;em&gt;Success:You are editing the original document.&lt;/em&gt;&lt;br&gt;- Data of duplicate release is correct.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Modify some other fields, e.g. &lt;em&gt;Release Date&lt;/em&gt; and click &lt;em&gt;Clearing Details&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Modify some other fields.&lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt; Release Date: 2023-06-12. &lt;br&gt;Click &lt;em&gt;Clearing Details&lt;/em&gt; tab&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Clearing Details&lt;/em&gt; page is displayed and does not contain any field from copied release&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;6&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Release Component updated successfully!&lt;/em&gt; message is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The release is updated successfully with data correctly&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;7&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on component name link on top of the page&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click component name link on top of the page&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;Summary page for the component is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;8&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on _Release Overview&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Release Overview&lt;/em&gt; tab&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;The new copied release is listed among previous releases&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;search-for-and-create-a-new-vendor-for-a-new-release&#34;&gt;Search for and create a new vendor for a new release&lt;/h2&gt;
+&lt;h2 id=&#34;tc09-search-for-and-create-a-new-vendor-for-a-new-release&#34;&gt;TC09: Search for and create a new vendor for a new release&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -436,52 +555,57 @@
 &lt;tbody&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;1&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Search for an existing component and click &lt;em&gt;Edit&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;You are editing the original document&lt;/em&gt; message is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Components&lt;/em&gt; portlet&lt;br&gt;At advanced Search, search for an existing component.&lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt; input &lt;em&gt;Comp1&lt;/em&gt; in the Component Name text box.&lt;br&gt;Click &lt;em&gt;Search&lt;/em&gt; button.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Component &lt;em&gt;Comp1&lt;/em&gt; display in the result table.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The page changes to &lt;em&gt;New Release Edit&lt;/em&gt; page&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click edit icon in Actions column of component &lt;em&gt;Comp1&lt;/em&gt;.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Edit screen of component &lt;em&gt;Comp1&lt;/em&gt; is displayed with message:  &lt;em&gt;Success:You are editing the original document&lt;/em&gt;&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Fill in a release &lt;em&gt;Version&lt;/em&gt; and &lt;em&gt;CPE ID&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Releases&lt;/em&gt; tab&lt;br&gt;Click &lt;em&gt;Add Releases&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The page changes to &lt;em&gt;New Release Edit&lt;/em&gt; page&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Vendor&lt;/em&gt; field&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Search Vendor&lt;/em&gt; dialog is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Fill in a release &lt;em&gt;Version&lt;/em&gt; and &lt;em&gt;CPE ID&lt;/em&gt;&lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt;&lt;br&gt;     + Version: @1.0.2&lt;br&gt;     + CPE ID: moshiano_002&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add New Vendor&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Create New Vendor&lt;/em&gt; dialog is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Vendor&lt;/em&gt; field&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Search Vendor&lt;/em&gt; dialog is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;6&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Fill in &lt;em&gt;Full name&lt;/em&gt;, &lt;em&gt;Short name&lt;/em&gt; and &lt;em&gt;URL&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Vendor&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Create New Vendor&lt;/em&gt; dialog is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;7&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Vendor&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Dialog closes and the new vendor is displayed in release &lt;em&gt;Vendor&lt;/em&gt; field&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Fill in &lt;em&gt;Full name&lt;/em&gt;, &lt;em&gt;Short name&lt;/em&gt; and &lt;em&gt;URL&lt;/em&gt;&lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt;&lt;br&gt;Full Name: Fullvendor_0909&lt;br&gt;Short Name: Short_ven090&lt;br&gt;URL: &lt;a href=&#34;https://github.com/&#34;&gt;https://github.com/&lt;/a&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;8&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The page remain the same and the message &lt;em&gt;You are editing the original document.&lt;/em&gt; is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Vendor&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Dialog closes and the new vendor is displayed in release &lt;em&gt;Vendor&lt;/em&gt; field with full name &lt;em&gt;Fullvendor_0909&lt;/em&gt;&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;9&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on component name link on top of the page&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Create Release&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Redirect to edit release page with the message &lt;em&gt;Success:You are editing the original document.&lt;/em&gt; is displayed&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;10&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click component name link on top of the page&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;Summary page for the component is displayed. The new vendor for the new release, as well as existing vendors from previous releases are listed under &lt;em&gt;Vendors&lt;/em&gt; field for the component&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;link-a-release-to-the-project-in-view-component-page-and-check-used-by-projects&#34;&gt;Link a release to the project in view component page and check used by projects&lt;/h2&gt;
+&lt;h2 id=&#34;tc10-link-a-release-to-the-project-in-view-component-page-and-check-used-by-projects&#34;&gt;TC10: Link a release to the project in view component page and check used by projects&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -503,27 +627,27 @@
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Search&lt;/em&gt; button then choose a project to link&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Search&lt;/em&gt; button then choose a project to link&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Link to Project&lt;/em&gt; button on the dialog is enabled&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on _&lt;em&gt;Link to Project&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Link to Project&lt;/em&gt; button&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;The release {component name} ({version}) has been successfully linked to project {project name}&lt;/em&gt;&lt;br&gt;&lt;em&gt;Click &lt;ins&gt;here&lt;ins&gt;&lt;/em&gt; &lt;em&gt;to edit the release relation as well as the project mainline state in the project.&lt;/em&gt; message is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;here&lt;/em&gt; hyperlink in the dialog&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;here&lt;/em&gt; hyperlink in the dialog&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;Redirect to the &lt;em&gt;edit project&lt;/em&gt; page with the release was linked (displayed on  &lt;em&gt;License Clearing&lt;/em&gt; page)&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;6&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Re-open the release at view page and click on &lt;em&gt;Summary&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Re-open the release at view page and click &lt;em&gt;Summary&lt;/em&gt; tab&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;Used by project information is updated correspondingly&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;link-a-release-to-a-project-in-the-view-release-page&#34;&gt;Link a release to a project in the view release page&lt;/h2&gt;
+&lt;h2 id=&#34;tc11-link-a-release-to-a-project-in-the-view-release-page&#34;&gt;TC11: Link a release to a project in the view release page&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -540,32 +664,32 @@
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;a release name&lt;/em&gt; hyperlink. Eg: release R1&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;a release name&lt;/em&gt; hyperlink. Eg: release R1&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;Redirect to the &lt;em&gt;view release&lt;/em&gt; page&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Link to Project&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Link to Project&lt;/em&gt; button&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;The dialog &lt;em&gt;Link Release to Project&lt;/em&gt; is displayed with &lt;em&gt;Link to Project&lt;/em&gt; button is disabled&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Search&lt;/em&gt; button then choose a project to link&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Search&lt;/em&gt; button then choose a project to link&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Link to Project&lt;/em&gt; button on the dialog is enabled&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on _&lt;em&gt;Link to Project&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Link to Project&lt;/em&gt; button&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;The release {component name} ({version}) has been successfully linked to project {project name}&lt;/em&gt;&lt;br&gt;&lt;em&gt;Click &lt;ins&gt;here&lt;ins&gt;&lt;/em&gt; &lt;em&gt;to edit the release relation as well as the project mainline state in the project.&lt;/em&gt; message is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;6&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;here&lt;/em&gt; hyperlink in the dialog&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;here&lt;/em&gt; hyperlink in the dialog&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;Redirect to the &lt;em&gt;edit project&lt;/em&gt; page with the release was linked (displayed on  &lt;em&gt;License Clearing&lt;/em&gt; page)&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;import-a-new-component-by-spdxxml-rdf-file&#34;&gt;Import a new component by .spdx/.xml/ .rdf file&lt;/h2&gt;
+&lt;h2 id=&#34;tc12-import-a-new-component-by-spdxxml-rdf-file&#34;&gt;TC12: Import a new component by .spdx/.xml/ .rdf file&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -577,12 +701,12 @@
 &lt;tbody&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;1&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Components&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Components&lt;/em&gt; tab&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Components&lt;/em&gt; page is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Import SBOM&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Import SBOM&lt;/em&gt; button&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;A dialog &lt;em&gt;Upload SBOM&lt;/em&gt; is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
@@ -592,12 +716,12 @@
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Import&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Import&lt;/em&gt; button&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;The dialog is closed. New releases and new components are imported successfully&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;export-components-without-releases&#34;&gt;Export components without releases&lt;/h2&gt;
+&lt;h2 id=&#34;tc13-export-components-without-releases&#34;&gt;TC13: Export components without releases&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -609,17 +733,17 @@
 &lt;tbody&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;1&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Components&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Components&lt;/em&gt; tab&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Components&lt;/em&gt; page is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Export Spreadsheet&lt;/em&gt; button and choose &lt;em&gt;Components only&lt;/em&gt; option&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;A new file with name&amp;rsquo;s format &lt;em&gt;components-{yyyy}-{mm}-{dd}.xlsx&lt;/em&gt; is downloaded&lt;br&gt; The content of the downloaded file includes information of all components in the system&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Export Spreadsheet&lt;/em&gt; button and choose &lt;em&gt;Components only&lt;/em&gt; option&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;- A new file with name&amp;rsquo;s format &lt;em&gt;components-{yyyy}-{mm}-{dd}.xlsx&lt;/em&gt; is downloaded&lt;br&gt;- The content of the downloaded file includes information of all components in the system&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;export-components-with-releases&#34;&gt;Export components with releases&lt;/h2&gt;
+&lt;h2 id=&#34;tc14-export-components-with-releases&#34;&gt;TC14: Export components with releases&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -631,17 +755,17 @@
 &lt;tbody&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;1&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Components&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Components&lt;/em&gt; tab&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Components&lt;/em&gt; page is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Export Spreadsheet&lt;/em&gt; button and choose &lt;em&gt;Components with releases&lt;/em&gt; option&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;New file with name &lt;em&gt;components-{yyyy}-{mm}-{dd}.xlsx&lt;/em&gt; is downloaded.&lt;br&gt; The content of the downloaded file includes information of all components and releases in the system&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Export Spreadsheet&lt;/em&gt; button and choose &lt;em&gt;Components with releases&lt;/em&gt; option&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;- New file with name &lt;em&gt;components-{yyyy}-{mm}-{dd}.xlsx&lt;/em&gt; is downloaded.&lt;br&gt;- The content of the downloaded file includes information of all components and releases in the system&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;create-a-clearing-request-for-a-release&#34;&gt;Create a clearing request for a release&lt;/h2&gt;
+&lt;h2 id=&#34;tc15-create-a-clearing-request-for-a-release&#34;&gt;TC15: Create a clearing request for a release&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -663,27 +787,27 @@
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Attachments&lt;/em&gt; tab, then add a source file (Eg: .rdf file) with &lt;em&gt;Type&lt;/em&gt; is &lt;em&gt;Source file&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Attachments&lt;/em&gt; tab, then add a source file (Eg: .rdf file) with &lt;em&gt;Type&lt;/em&gt; is &lt;em&gt;Source file&lt;/em&gt;&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;The data is updated correspondingly&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Update Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt; button&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;The message &lt;em&gt;Success:Release {release name} updated successfully!&lt;/em&gt; is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Clearing details&lt;/em&gt; tab, then click on &lt;em&gt;Possology Process&lt;/em&gt; icon beside &lt;em&gt;Clearing State&lt;/em&gt; field and wait for the process to finish&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Clearing details&lt;/em&gt; tab, then click &lt;em&gt;Fossology Process&lt;/em&gt; icon beside &lt;em&gt;Clearing State&lt;/em&gt; field and wait for the process to finish&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;The message &lt;em&gt;The FOSSology process already finished. You should find the resulting report as attachment at this release.&lt;/em&gt; is displayed in the &lt;em&gt;Fossology Process&lt;/em&gt; dialog&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;6&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Close&lt;/em&gt; button in the dialog&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Close&lt;/em&gt; button in the dialog&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;The dialog is closed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;7&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Reload this page, then click on &lt;em&gt;Attachments&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Reload this page, then click &lt;em&gt;Attachments&lt;/em&gt; tab&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;A new file is listed in &lt;em&gt;Attachments&lt;/em&gt; page with name&amp;rsquo;s format &lt;em&gt;{component name}-{version}-{yyyymmdd}-{hhmm}-SPDX.rdf&lt;/em&gt;&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
diff --git a/docs/development/testcases/test-cases-components/index.html b/docs/development/testcases/test-cases-components/index.html
index 71442f4..639ee76 100644
--- a/docs/development/testcases/test-cases-components/index.html
+++ b/docs/development/testcases/test-cases-components/index.html
@@ -19,7 +19,7 @@
 <link rel="icon" type="image/png" href="/sw360/favicons/android-192x192.png" sizes="192x192">
 
 <title>Component / Release | Eclipse SW360</title>
-<meta name="description" content="Add a component and release with vendor present
+<meta name="description" content="TC01: Add a component and release with vendor present
 
 
 
@@ -32,20 +32,20 @@ Result
 
 1
 Sign In with a known user
-User successfully signed in and Home page is …">
+User successfully signed in and Home page …">
 <meta property="og:title" content="Component / Release" />
-<meta property="og:description" content="Add a component and release with vendor present Step Action Result 1 Sign In with a known user User successfully signed in and Home page is displayed 2 Click on Components tab Components page is displayed 3 Click Add Component New Component page is displayed with mandatory fields marked with red star 4 Fill in a component Name and Categories and click Add Component The page remain the same and the message You are editing the original document." />
+<meta property="og:description" content="TC01: Add a component and release with vendor present Step Action Result 1 Sign In with a known user User successfully signed in and Home page is displayed 2 Click Components tab Components page is displayed 3 Click Add Component button - New Component page is displayed with mandatory fields marked with red star: Name, Categories, Component Type. - A message Success:New Component is displayed 4 Fill in a component Name, Categories and Component Type fields." />
 <meta property="og:type" content="article" />
 <meta property="og:url" content="https://www.eclipse.org/sw360/docs/development/testcases/test-cases-components/" /><meta property="article:section" content="docs" />
 
-<meta property="article:modified_time" content="2023-09-18T10:02:24+07:00" /><meta property="og:site_name" content="Eclipse SW360" />
+<meta property="article:modified_time" content="2024-03-01T14:13:57+07:00" /><meta property="og:site_name" content="Eclipse SW360" />
 <meta itemprop="name" content="Component / Release">
-<meta itemprop="description" content="Add a component and release with vendor present Step Action Result 1 Sign In with a known user User successfully signed in and Home page is displayed 2 Click on Components tab Components page is displayed 3 Click Add Component New Component page is displayed with mandatory fields marked with red star 4 Fill in a component Name and Categories and click Add Component The page remain the same and the message You are editing the original document.">
-<meta itemprop="dateModified" content="2023-09-18T10:02:24+07:00" />
-<meta itemprop="wordCount" content="1948">
+<meta itemprop="description" content="TC01: Add a component and release with vendor present Step Action Result 1 Sign In with a known user User successfully signed in and Home page is displayed 2 Click Components tab Components page is displayed 3 Click Add Component button - New Component page is displayed with mandatory fields marked with red star: Name, Categories, Component Type. - A message Success:New Component is displayed 4 Fill in a component Name, Categories and Component Type fields.">
+<meta itemprop="dateModified" content="2024-03-01T14:13:57+07:00" />
+<meta itemprop="wordCount" content="2909">
 <meta itemprop="keywords" content="" /><meta name="twitter:card" content="summary"/>
 <meta name="twitter:title" content="Component / Release"/>
-<meta name="twitter:description" content="Add a component and release with vendor present Step Action Result 1 Sign In with a known user User successfully signed in and Home page is displayed 2 Click on Components tab Components page is displayed 3 Click Add Component New Component page is displayed with mandatory fields marked with red star 4 Fill in a component Name and Categories and click Add Component The page remain the same and the message You are editing the original document."/>
+<meta name="twitter:description" content="TC01: Add a component and release with vendor present Step Action Result 1 Sign In with a known user User successfully signed in and Home page is displayed 2 Click Components tab Components page is displayed 3 Click Add Component button - New Component page is displayed with mandatory fields marked with red star: Name, Categories, Component Type. - A message Success:New Component is displayed 4 Fill in a component Name, Categories and Component Type fields."/>
 
 
 
@@ -315,6 +315,10 @@ User successfully signed in and Home page is …">
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -322,7 +326,22 @@ User successfully signed in and Home page is …">
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -334,29 +353,10 @@ User successfully signed in and Home page is …">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -375,10 +375,6 @@ User successfully signed in and Home page is …">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -391,6 +387,10 @@ User successfully signed in and Home page is …">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -534,19 +534,21 @@ User successfully signed in and Home page is …">
 
 <div class="td-toc"><nav id="TableOfContents">
   <ul>
-    <li><a href="#add-a-component-and-release-with-vendor-present">Add a component and release with vendor present</a></li>
-    <li><a href="#modify-a-component-and-release-with-vendor-present">Modify a component and release with vendor present</a></li>
-    <li><a href="#add-and-modify-a-component-and-release-with-all-fields-filled-in">Add and modify a component and release with all fields filled in</a></li>
-    <li><a href="#delete-a-component-that-is-first-linked-to-a-project-and-then-not-and-a-project">Delete a component that is first linked to a project and then not, and a project</a></li>
-    <li><a href="#add-new-attachments-to-an-existing-release-and-delete-attachments">Add new attachments to an existing release and delete attachments</a></li>
-    <li><a href="#duplicate-an-existing-release">Duplicate an existing release</a></li>
-    <li><a href="#search-for-and-create-a-new-vendor-for-a-new-release">Search for and create a new vendor for a new release</a></li>
-    <li><a href="#link-a-release-to-the-project-in-view-component-page-and-check-used-by-projects">Link a release to the project in view component page and check used by projects</a></li>
-    <li><a href="#link-a-release-to-a-project-in-the-view-release-page">Link a release to a project in the view release page</a></li>
-    <li><a href="#import-a-new-component-by-spdxxml-rdf-file">Import a new component by .spdx/.xml/ .rdf file</a></li>
-    <li><a href="#export-components-without-releases">Export components without releases</a></li>
-    <li><a href="#export-components-with-releases">Export components with releases</a></li>
-    <li><a href="#create-a-clearing-request-for-a-release">Create a clearing request for a release</a></li>
+    <li><a href="#tc01-add-a-component-and-release-with-vendor-present">TC01: Add a component and release with vendor present</a></li>
+    <li><a href="#tc02-verify-data-after-add-a-component-and-release-with-vendor-present">TC02: Verify data after add a component and release with vendor present</a></li>
+    <li><a href="#tc03-modify-a-component-and-release-with-vendor-present">TC03: Modify a component and release with vendor present</a></li>
+    <li><a href="#tc04-verify-data-after--modify-a-component-and-release-with-vendor-present">TC04: Verify data after  modify a component and release with vendor present</a></li>
+    <li><a href="#tc05-add-and-modify-a-component-and-release-with-all-fields-filled-in">TC05: Add and modify a component and release with all fields filled in</a></li>
+    <li><a href="#tc06-delete-a-component-that-is-first-linked-to-a-project-and-then-not-and-a-project">TC06: Delete a component that is first linked to a project and then not, and a project</a></li>
+    <li><a href="#tc07-add-new-attachments-to-an-existing-release-and-delete-attachments">TC07: Add new attachments to an existing release and delete attachments</a></li>
+    <li><a href="#tc08-duplicate-an-existing-release">TC08: Duplicate an existing release</a></li>
+    <li><a href="#tc09-search-for-and-create-a-new-vendor-for-a-new-release">TC09: Search for and create a new vendor for a new release</a></li>
+    <li><a href="#tc10-link-a-release-to-the-project-in-view-component-page-and-check-used-by-projects">TC10: Link a release to the project in view component page and check used by projects</a></li>
+    <li><a href="#tc11-link-a-release-to-a-project-in-the-view-release-page">TC11: Link a release to a project in the view release page</a></li>
+    <li><a href="#tc12-import-a-new-component-by-spdxxml-rdf-file">TC12: Import a new component by .spdx/.xml/ .rdf file</a></li>
+    <li><a href="#tc13-export-components-without-releases">TC13: Export components without releases</a></li>
+    <li><a href="#tc14-export-components-with-releases">TC14: Export components with releases</a></li>
+    <li><a href="#tc15-create-a-clearing-request-for-a-release">TC15: Create a clearing request for a release</a></li>
   </ul>
 </nav></div>
 
@@ -609,7 +611,7 @@ User successfully signed in and Home page is …">
 
 		
 	</header>    
-	<h2 id="add-a-component-and-release-with-vendor-present">Add a component and release with vendor present</h2>
+	<h2 id="tc01-add-a-component-and-release-with-vendor-present">TC01: Add a component and release with vendor present</h2>
 <table>
 <thead>
 <tr>
@@ -626,82 +628,92 @@ User successfully signed in and Home page is …">
 </tr>
 <tr>
 <td style="text-align:right">2</td>
-<td style="text-align:left">Click on <em>Components</em> tab</td>
+<td style="text-align:left">Click <em>Components</em> tab</td>
 <td style="text-align:left"><em>Components</em> page is displayed</td>
 </tr>
 <tr>
 <td style="text-align:right">3</td>
-<td style="text-align:left">Click <em>Add Component</em></td>
-<td style="text-align:left"><em>New Component</em> page is displayed with mandatory fields marked with red star</td>
+<td style="text-align:left">Click <em>Add Component</em> button</td>
+<td style="text-align:left">- <em>New Component</em> page is displayed with mandatory fields marked with red star: Name, Categories, Component Type. <br>- A message <em>Success:New Component</em> is displayed</td>
 </tr>
 <tr>
 <td style="text-align:right">4</td>
-<td style="text-align:left">Fill in a component <em>Name</em> and <em>Categories</em> and click <em>Add Component</em></td>
-<td style="text-align:left">The page remain the same and the message <em>You are editing the original document.</em> is displayed</td>
+<td style="text-align:left">Fill in a component <em>Name</em>, <em>Categories</em> and <em>Component Type</em> fields. <br><em>Eg:</em><br>- Name: Component 1@1<br>- Categories: Categories_1@1<br>- Component Type: OSS</td>
+<td style="text-align:left">Values are entered in the fields</td>
 </tr>
 <tr>
 <td style="text-align:right">5</td>
-<td style="text-align:left">Click <em>Add Release</em></td>
-<td style="text-align:left">The page changes to <em>New Release Edit</em> page</td>
+<td style="text-align:left">Click <em>Create Component</em> button</td>
+<td style="text-align:left">- Create component successfully. <br>- Redirect to the edit component page.<br>-Show message: <em>Success:You are editing the original document.</em></td>
 </tr>
 <tr>
 <td style="text-align:right">6</td>
-<td style="text-align:left">Fill in a release <em>Version</em> and <em>CPE ID</em></td>
-<td style="text-align:left">Values are entered in the fields</td>
+<td style="text-align:left">Click <em>Releases</em> tab<br>Click <em>Add Release</em> button</td>
+<td style="text-align:left">Redirect to Add Release page</td>
 </tr>
 <tr>
 <td style="text-align:right">7</td>
-<td style="text-align:left">Click <em>Add Release</em></td>
-<td style="text-align:left">The page remain the same and the message <em>You are editing the original document.</em> is displayed</td>
+<td style="text-align:left">Fill in a release <em>Version</em> and <em>CPE ID</em><br><em>Eg:</em><br>- Version: version1.0.0.x<br>- CPE ID: UUID_1002</td>
+<td style="text-align:left">Values are entered in the fields:<br>- Version: version1.0.0.x<br>- CPE ID: UUID_1002</td>
 </tr>
 <tr>
 <td style="text-align:right">8</td>
-<td style="text-align:left">Click <em>Vendor</em> field</td>
-<td style="text-align:left"><em>Search Vendor</em> dialog is displayed</td>
+<td style="text-align:left">Click <em>Create Release</em> button</td>
+<td style="text-align:left">- Create a release successfully.<br>- Redirect to the edit new release page.<br>- The message <em>Success:You are editing the original document.</em> is displayed</td>
 </tr>
 <tr>
 <td style="text-align:right">9</td>
-<td style="text-align:left"><em>Search</em> for a Vendor, select it and click <em>Select</em></td>
-<td style="text-align:left">Dialog is closed and selected Vendor is added under <em>Vendor</em> field</td>
+<td style="text-align:left">Click <em>Vendor</em> field</td>
+<td style="text-align:left"><em>Search Vendor</em> dialog is displayed</td>
 </tr>
 <tr>
 <td style="text-align:right">10</td>
-<td style="text-align:left">Click on <em>Attachments</em> link</td>
-<td style="text-align:left"><em>Attachments</em> page is displayed</td>
+<td style="text-align:left">Click <em>Add Vendor</em> button</td>
+<td style="text-align:left"><em>Create new Vendor</em> dialog display</td>
 </tr>
 <tr>
 <td style="text-align:right">11</td>
-<td style="text-align:left">Click on <em>Add Attachment</em></td>
-<td style="text-align:left"><em>Upload Attachment</em> dialog is displayed</td>
+<td style="text-align:left">Input data in fields<br>- Full Name: add vendor 01<br>-Short Name: add vendor01<br>-URL: <a href="https://github.com/eclipse-sw360/sw360">https://github.com/eclipse-sw360/sw360</a></td>
+<td style="text-align:left">Values are entered in the fields.</td>
 </tr>
 <tr>
 <td style="text-align:right">12</td>
-<td style="text-align:left">Click <em>Browse</em> and select the attachment</td>
-<td style="text-align:left">File name is displayed in the dialog</td>
+<td style="text-align:left">Click <em>Add Vendor</em> button</td>
+<td style="text-align:left">The vendor is added in Vendor field of the release with full name is <em>add vendor 01</em></td>
 </tr>
 <tr>
 <td style="text-align:right">13</td>
-<td style="text-align:left">Click <em>Upload</em> button</td>
-<td style="text-align:left">The file is uploaded and dialog is closed. Also the attached file is listed in the <em>Attachment</em> page</td>
+<td style="text-align:left">Click <em>Attachments</em> tab</td>
+<td style="text-align:left"><em>Attachments</em> page is displayed</td>
 </tr>
 <tr>
 <td style="text-align:right">14</td>
-<td style="text-align:left">Change the <em>Attachment type</em> to real type, e.g. <em>Source file</em> if it is a source file</td>
-<td style="text-align:left">Type changed successfully</td>
+<td style="text-align:left">Click <em>Add Attachment</em> button</td>
+<td style="text-align:left"><em>Upload Attachment</em> dialog is displayed</td>
 </tr>
 <tr>
 <td style="text-align:right">15</td>
-<td style="text-align:left">Click <em>Update Release</em></td>
-<td style="text-align:left"><em>Release updated successfully!</em> message is displayed</td>
+<td style="text-align:left">Click <em>Browse</em> and select the attachment.<br>Eg: attachment1.xlsx</td>
+<td style="text-align:left">File name is displayed in the dialog</td>
 </tr>
 <tr>
 <td style="text-align:right">16</td>
-<td style="text-align:left">Click on <em>Components</em> tab</td>
-<td style="text-align:left">The new component should be added to the components list (e.g. filter by <em>Keyword Search</em>)</td>
+<td style="text-align:left">Click <em>Upload</em> button</td>
+<td style="text-align:left">The file is uploaded and dialog is closed. Also the attached file is listed in the <em>Attachment</em> page</td>
+</tr>
+<tr>
+<td style="text-align:right">17</td>
+<td style="text-align:left">Change the attachment <em>Type</em> to real type.<br>Eg: Component license information (Combined)</td>
+<td style="text-align:left">Type changed successfully</td>
+</tr>
+<tr>
+<td style="text-align:right">18</td>
+<td style="text-align:left">Click <em>Update Release</em> button</td>
+<td style="text-align:left">Message: <em>Success:Release {name} ({version}) updated successfully!</em> is displayed</td>
 </tr>
 </tbody>
 </table>
-<h2 id="modify-a-component-and-release-with-vendor-present">Modify a component and release with vendor present</h2>
+<h2 id="tc02-verify-data-after-add-a-component-and-release-with-vendor-present">TC02: Verify data after add a component and release with vendor present</h2>
 <table>
 <thead>
 <tr>
@@ -713,17 +725,32 @@ User successfully signed in and Home page is …">
 <tbody>
 <tr>
 <td style="text-align:right">1</td>
-<td style="text-align:left">Search for an existing component (e.g. created in TC01) and click <em>Edit</em></td>
-<td style="text-align:left"><em>You are editing the original document</em> message is displayed</td>
+<td style="text-align:left">Search for the component is created in TC01:<br>- Click <em>Components</em> portlet<br>- At Advanced Search area, input <em>Component 1@1</em> in the <em>Component Name</em> textbox.<br>- Click <em>Search</em> button</td>
+<td style="text-align:left">The new component display in the table with:<br>- Vendor: add vendor01<br>- Component Name: <em>Component 1@1</em> is displayed with hyper link.<br>- Main licenses: blank<br>- Component Type: OSS</td>
 </tr>
 <tr>
 <td style="text-align:right">2</td>
-<td style="text-align:left">Execute steps 5-16 from TC01</td>
-<td></td>
+<td style="text-align:left">Click hyper link of name <em>Component 1@1</em></td>
+<td style="text-align:left">Redirect to view component <em>Component 1@1</em> page</td>
+</tr>
+<tr>
+<td style="text-align:right">3</td>
+<td style="text-align:left">Click <em>Release Overview</em> tab</td>
+<td style="text-align:left">The release display with:<br>- Name: Component 1@1<br>- Version displays with hyper link: version1.0.0.x<br>- Clearing State: New<br>- Clearing Report: no report<br>- Release Mainline State: Open</td>
+</tr>
+<tr>
+<td style="text-align:right">4</td>
+<td style="text-align:left">Click hyper link <em>version1.0.0.x</em></td>
+<td style="text-align:left">Redirect to view screen of release <em>Component 1@1 version1.0.0.x</em><br>Data of the release:<br>- Summary tab:<br>+ display text with: COMPONENT 1@1 VERSION1.0.0.X<br>+ CPE ID: UUID_1002<br>+ Created on: date of created.<br>+ Created by: user created.<br>+ Modified On: date of modified.<br>+ Modified By: user modified.<br>+ Clearing State: New<br>+ Release Mainline State: Open<br>+ Release Vendor with:<br>   Full Name:	add vendor 01<br>   Short Name: add vendor01<br>   URL: <a href="https://github.com/eclipse-sw360/sw360">https://github.com/eclipse-sw360/sw360</a></td>
+</tr>
+<tr>
+<td style="text-align:right">5</td>
+<td style="text-align:left">Click <em>Attachments</em> tab</td>
+<td style="text-align:left">Display file name <em>attachment1.xlsx</em> in the table.</td>
 </tr>
 </tbody>
 </table>
-<h2 id="add-and-modify-a-component-and-release-with-all-fields-filled-in">Add and modify a component and release with all fields filled in</h2>
+<h2 id="tc03-modify-a-component-and-release-with-vendor-present">TC03: Modify a component and release with vendor present</h2>
 <table>
 <thead>
 <tr>
@@ -735,87 +762,99 @@ User successfully signed in and Home page is …">
 <tbody>
 <tr>
 <td style="text-align:right">1</td>
-<td style="text-align:left">Click on <em>Components</em> tab</td>
-<td style="text-align:left"><em>Components</em> page is displayed</td>
+<td style="text-align:left">Search for an existing component (e.g. created in TC01: <em>Component 1@1</em>) and click <em>Edit</em> icon</td>
+<td style="text-align:left"><em>Success:You are editing the original document</em> message is displayed</td>
 </tr>
 <tr>
 <td style="text-align:right">2</td>
-<td style="text-align:left">Click <em>Add Component</em></td>
-<td style="text-align:left"><em>New Component</em> page is displayed with mandatory fields marked with red star</td>
+<td style="text-align:left">Click <em>Releases</em> tab</td>
+<td style="text-align:left">Release list is displayed</td>
 </tr>
 <tr>
 <td style="text-align:right">3</td>
-<td style="text-align:left">Fill in all editable fields under <em>Basic Information</em></td>
-<td style="text-align:left">Values are entered in the fields</td>
+<td style="text-align:left">Click <em>Add Release</em> button</td>
+<td style="text-align:left">Redirect to Add Release page</td>
 </tr>
 <tr>
 <td style="text-align:right">4</td>
-<td style="text-align:left">Click <em>Add Component</em></td>
-<td style="text-align:left">The page remain the same and the message <em>You are editing the original document.</em> is displayed</td>
+<td style="text-align:left">Fill in a release <em>Version</em> and <em>CPE ID</em><br><em>Eg:</em><br>- Version: v1.0.0.1<br>- CPE ID: cpe:id:123456</td>
+<td style="text-align:left">Values are entered in the fields:<br>- Version: v1.0.0.1<br>- CPE ID: cpe:id:123456</td>
 </tr>
 <tr>
 <td style="text-align:right">5</td>
-<td style="text-align:left">Click <em>Add Release</em></td>
-<td style="text-align:left">The page changes to <em>New Release Edit</em> page</td>
+<td style="text-align:left">Click <em>Create Release</em> button</td>
+<td style="text-align:left">- Redirect to the edit new release page.<br>- The message <em>Success:You are editing the original document.</em> is displayed</td>
 </tr>
 <tr>
 <td style="text-align:right">6</td>
-<td style="text-align:left">Fill in all editable fields under <em>Release Summary</em> and <em>Release Repository</em></td>
-<td style="text-align:left">Values are entered in the fields</td>
+<td style="text-align:left">Click <em>Vendor</em> field</td>
+<td style="text-align:left"><em>Search Vendor</em> dialog is displayed</td>
 </tr>
 <tr>
 <td style="text-align:right">7</td>
-<td style="text-align:left">Click <em>Add Release</em></td>
-<td style="text-align:left">The page remain the same and the message <em>You are editing the original document.</em> is displayed</td>
+<td style="text-align:left">Click <em>Search</em> button.<br>Select a vendor (eg: select  vendor with full name <em>VendorUp</em>) <br>Click <em>Select Vendor</em> button.</td>
+<td style="text-align:left">Dialog is closed and selected Vendor is  added under <em>Vendor</em> field: VendorUp</td>
 </tr>
 <tr>
 <td style="text-align:right">8</td>
-<td style="text-align:left">Click on <em>Linked Releases</em> link</td>
-<td style="text-align:left"><em>Linked Releases</em> page displayed successfully</td>
+<td style="text-align:left">Click <em>Attachments</em> tab<br>Click <em>Add Attachment</em> button<br>Click <em>Browse</em> and select the attachment. Eg:  attachment2.img<br>Click <em>Upload</em> button</td>
+<td style="text-align:left">The file is uploaded and dialog is closed.  Also the attached file is listed in the Attachment page</td>
 </tr>
 <tr>
 <td style="text-align:right">9</td>
-<td style="text-align:left"><em>Click to add Releases</em></td>
-<td style="text-align:left"><em>Search Release</em> dialog is displayed</td>
+<td style="text-align:left">Click <em>Update Release</em> button</td>
+<td style="text-align:left">Message <em>Success:Release Component 1@1  (v1.0.0.1) updated successfully!</em> is displayed</td>
 </tr>
+</tbody>
+</table>
+<h2 id="tc04-verify-data-after--modify-a-component-and-release-with-vendor-present">TC04: Verify data after  modify a component and release with vendor present</h2>
+<table>
+<thead>
 <tr>
-<td style="text-align:right">10</td>
-<td style="text-align:left">Click <em>Search by name</em> and <em>Select</em> a release to be added</td>
-<td style="text-align:left">Dialog is closed and selected release is displayed under <em>Linked Releases</em> section</td>
+<th style="text-align:right">Step</th>
+<th style="text-align:left">Action</th>
+<th style="text-align:left">Result</th>
 </tr>
+</thead>
+<tbody>
 <tr>
-<td style="text-align:right">11</td>
-<td style="text-align:left">Click on <em>Clearing Details</em> link</td>
-<td style="text-align:left"><em>Clearing Details</em> dialog is displayed</td>
+<td style="text-align:right">1</td>
+<td style="text-align:left">Continue TC03</td>
+<td></td>
 </tr>
 <tr>
-<td style="text-align:right">12</td>
-<td style="text-align:left">Fill in all editable fields</td>
-<td style="text-align:left">Values are entered in the fields</td>
+<td style="text-align:right">2</td>
+<td style="text-align:left">Click <em>Summary</em> tab</td>
+<td style="text-align:left">Data in the tab:<br>- Modified On: date of modified.<br>- Modified By: user modified.<br>Data of other fields in the tab is same data before updated.</td>
 </tr>
 <tr>
-<td style="text-align:right">13</td>
-<td style="text-align:left">Click on <em>Attachments</em> link and upload a file</td>
-<td style="text-align:left">File attached successfully</td>
+<td style="text-align:right">3</td>
+<td style="text-align:left">Click <em>Release Overview</em> tab</td>
+<td style="text-align:left">New release with version <em>v1.0.0.1</em>  is added in the release  table.</td>
 </tr>
 <tr>
-<td style="text-align:right">14</td>
-<td style="text-align:left">Click <em>Update Release</em></td>
-<td style="text-align:left"><em>Release updated successfully!</em> message is displayed</td>
+<td style="text-align:right">4</td>
+<td style="text-align:left">Click <em>v1.0.0.1</em> hyper link</td>
+<td style="text-align:left">Text display with: <em>COMPONENT 1@1  V1.0.0.1</em> at the right corner.<br>- At Summary tab: <br>  + CPE ID: cpe:id:123456<br>  + Release Vendor: display with Full Name, Short Name and URL correctly with  vendor <em>VendorUp</em>  <br>- At Attachments tab: attachment <em>attachment2.img</em> display in  the attachment table with correct information.</td>
 </tr>
 <tr>
-<td style="text-align:right">15</td>
-<td style="text-align:left">Check all fields of the release under <em>Summary</em>, <em>Linked Releases</em>, <em>Clearing Details</em> and <em>Attachments</em></td>
-<td style="text-align:left">Values are filled in correctly</td>
+<td style="text-align:right">5</td>
+<td style="text-align:left">Click <em>Component 1@1</em> hyper link</td>
+<td style="text-align:left">Redirect to view screen of <em>Component 1@1</em>  component.</td>
 </tr>
 <tr>
-<td style="text-align:right">16</td>
-<td style="text-align:left">Click <em>Edit</em> button, modify some fields and <em>Update Release</em></td>
-<td style="text-align:left">Values are updated successfully</td>
+<td style="text-align:right">6</td>
+<td style="text-align:left">Click <em>Attachments</em> tab</td>
+<td style="text-align:left">Data in the tab is same data before updated.</td>
+</tr>
+<tr>
+<td style="text-align:right">7</td>
+<td style="text-align:left">Click <em>Vulnerabilities</em> tab</td>
+<td style="text-align:left">Data in the tab is same data before updated.</td>
 </tr>
 </tbody>
 </table>
-<h2 id="delete-a-component-that-is-first-linked-to-a-project-and-then-not-and-a-project">Delete a component that is first linked to a project and then not, and a project</h2>
+<h2 id="tc05-add-and-modify-a-component-and-release-with-all-fields-filled-in">TC05: Add and modify a component and release with all fields filled in</h2>
 <table>
 <thead>
 <tr>
@@ -827,52 +866,67 @@ User successfully signed in and Home page is …">
 <tbody>
 <tr>
 <td style="text-align:right">1</td>
-<td style="text-align:left">Create a new component</td>
-<td style="text-align:left">Component is created successfully</td>
+<td style="text-align:left">Click <em>Components</em> tab<br>Click <em>Add Component</em> button<br>Fill in all editable fields<br>Click <em>Create Component</em> button</td>
+<td style="text-align:left">- Redirect to edit component screen with the  message <em>Success:You are editing the original document.</em> is displayed in the  left corner.<br>- Create component successfully. Data match with input  data.</td>
 </tr>
 <tr>
 <td style="text-align:right">2</td>
-<td style="text-align:left">Add a new release to this component</td>
-<td style="text-align:left">Release is added successfully</td>
+<td style="text-align:left">Click <em>Releases</em> tab.<br>Click <em>Add Releases</em> button.<br>At <em>Summary</em> tab, fill in all editable fields under <em>Release Summary</em> and <em>Release Repository</em>.<br>Click <em>Create Release</em> button.<br></td>
+<td style="text-align:left">Redirect to edit release screen.<br>Created release successfully. Data match with input data.</td>
 </tr>
 <tr>
 <td style="text-align:right">3</td>
-<td style="text-align:left">Create a new project</td>
-<td style="text-align:left">Project is created successfully</td>
+<td style="text-align:left">Click <em>Linked Releases</em> tab<br>Click <em>Click to add Releases</em> button</td>
+<td style="text-align:left">The dialog <em>Link Releases</em> is displayed.</td>
 </tr>
 <tr>
 <td style="text-align:right">4</td>
-<td style="text-align:left">Add the linked release created above to this project</td>
-<td style="text-align:left">Release linked successfully</td>
+<td style="text-align:left">Input search name into textbox<br>Click <em>Search</em> button<br>Select 3 releases.<br>Click <em>Link Releases</em> button</td>
+<td style="text-align:left">Dialog is closed and selected release is displayed under <em>Linked Releases</em> section.</td>
 </tr>
 <tr>
 <td style="text-align:right">5</td>
-<td style="text-align:left">Go to components, try to delete the newly created component (that is linked to a project)</td>
-<td style="text-align:left">Message <em>I could not delete the component!</em> is displayed.</td>
+<td style="text-align:left">Click <em>Linked Packages</em> tab<br>Click <em>Add Packages</em> button</td>
+<td style="text-align:left">The dialog <em>Link Packages</em> is displayed.</td>
 </tr>
 <tr>
 <td style="text-align:right">6</td>
-<td style="text-align:left">Click <em>OK</em></td>
-<td style="text-align:left">Component is not deleted</td>
+<td style="text-align:left">Input an exist orphan package name into textbox.<br>Click <em>Search</em> button.<br>Select a package.<br>Click <em>Link Packages</em> button.</td>
+<td style="text-align:left">Dialog is closed and selected package is displayed under <em>Linked Packages</em> table</td>
 </tr>
 <tr>
 <td style="text-align:right">7</td>
-<td style="text-align:left">Go to Projects, delete the newly created project</td>
-<td style="text-align:left">Project is deleted successfully</td>
+<td style="text-align:left">Click <em>Clearing Details</em> tab<br>Fill in all editable fields</td>
+<td style="text-align:left">Values are entered in the fields</td>
 </tr>
 <tr>
 <td style="text-align:right">8</td>
-<td style="text-align:left">Go to components, delete the newly created components (not linked anymore to a project)</td>
-<td style="text-align:left">Message <em>Do you want to delete component?</em> is displayed</td>
+<td style="text-align:left">Click <em>ECC Details</em> tab<br>Fill in all editable fields</td>
+<td style="text-align:left">Values are entered in the fields</td>
 </tr>
 <tr>
 <td style="text-align:right">9</td>
-<td style="text-align:left">Click <em>OK</em></td>
-<td style="text-align:left">Component is deleted successfully</td>
+<td style="text-align:left">Click <em>Attachments</em> tab<br>Click <em>Add Attachment</em> button<br>Click <em>Browse</em> and select the attachment. <em>Eg</em>: attachment3.xlsx<br>Click <em>Upload</em> button</td>
+<td style="text-align:left">The file is uploaded and dialog is closed. Also the attached file is listed in the Attachment page</td>
+</tr>
+<tr>
+<td style="text-align:right">10</td>
+<td style="text-align:left">Click <em>Update Release</em> button</td>
+<td style="text-align:left">- <em>Success:Release {componentName} ({version}) updated successfully!</em> message is displayed.<br>- Redirect to the view release screen.</td>
+</tr>
+<tr>
+<td style="text-align:right">11</td>
+<td style="text-align:left">Check all fields of the release by click tabs: <em>Summary, Linked Releases, Linked Packages, Clearing Details and Attachments</em>.</td>
+<td style="text-align:left">Values are filled in correctly, match with input data.</td>
+</tr>
+<tr>
+<td style="text-align:right">12</td>
+<td style="text-align:left">Click <em>Edit Release</em> button, modify some fields.<br>Eg: <br>- <em>Version</em> field ( in <em>Summary</em> tab): rename version name_updated<br>      - <em>ECC Status</em> field (in <em>ECC Details</em> tab): Approved.<br>Click <em>Update Release</em> button.</td>
+<td style="text-align:left">Values are updated successfully</td>
 </tr>
 </tbody>
 </table>
-<h2 id="add-new-attachments-to-an-existing-release-and-delete-attachments">Add new attachments to an existing release and delete attachments</h2>
+<h2 id="tc06-delete-a-component-that-is-first-linked-to-a-project-and-then-not-and-a-project">TC06: Delete a component that is first linked to a project and then not, and a project</h2>
 <table>
 <thead>
 <tr>
@@ -884,82 +938,149 @@ User successfully signed in and Home page is …">
 <tbody>
 <tr>
 <td style="text-align:right">1</td>
-<td style="text-align:left">Search for an existing component (e.g. created in TC01) and click <em>Release Overview</em></td>
-<td style="text-align:left">The list of releases are displayed</td>
+<td style="text-align:left">Create a new component<br><em>Eg:</em> component with name <em>Component @1234</em></td>
+<td style="text-align:left">Component is created successfully</td>
 </tr>
 <tr>
 <td style="text-align:right">2</td>
-<td style="text-align:left">Click on release version that needs a new attachment</td>
-<td style="text-align:left"><em>Release Summary: name</em> page is displayed for the selected release</td>
+<td style="text-align:left">Add a new release to this component<br><em>Eg:</em> release <em>Rel1</em></td>
+<td style="text-align:left">Release is added successfully</td>
 </tr>
 <tr>
 <td style="text-align:right">3</td>
-<td style="text-align:left">Click on <em>Edit</em></td>
-<td style="text-align:left"><em>You are editing the original document.</em> message is displayed</td>
+<td style="text-align:left">Create a new project <em>P1</em></td>
+<td style="text-align:left">Project is created successfully</td>
 </tr>
 <tr>
 <td style="text-align:right">4</td>
-<td style="text-align:left">Click on <em>Attachments</em> link</td>
-<td style="text-align:left"><em>Attachments</em> page is displayed</td>
+<td style="text-align:left">Add the linked release <em>Rel1</em> to project <em>P1</em>.</td>
+<td style="text-align:left">Release linked successfully</td>
 </tr>
 <tr>
 <td style="text-align:right">5</td>
-<td style="text-align:left">Click on <em>Add Attachment</em></td>
-<td style="text-align:left"><em>Upload Attachment</em> dialog is displayed</td>
+<td style="text-align:left">Click <em>Components</em> portlet.<br>Search component <em>Component @1234</em> by name at advanced search.</td>
+<td style="text-align:left">Component <em>Component @1234</em> display on the result table.</td>
 </tr>
 <tr>
 <td style="text-align:right">6</td>
-<td style="text-align:left">Click <em>Browse</em> and select several attachments</td>
-<td style="text-align:left">File names are displayed in the dialog</td>
+<td style="text-align:left">Click delete icon of component <em>Component @1234</em></td>
+<td style="text-align:left">A warning <em>The component Component @1234 cannot be deleted, since it contains 1 releases. Please delete the releases first.</em></td>
 </tr>
 <tr>
 <td style="text-align:right">7</td>
-<td style="text-align:left">Click <em>Cancel</em> near some files not to be added</td>
-<td style="text-align:left">File names are removed from the list</td>
+<td style="text-align:left">Click <em>OK</em> button in the warning dialog.</td>
+<td style="text-align:left">The dialog is closed, component is not deleted</td>
 </tr>
 <tr>
 <td style="text-align:right">8</td>
-<td style="text-align:left">Click <em>Upload</em> button for the remaining files</td>
-<td style="text-align:left">The files are uploaded and dialog is closed. Also the attached file are listed in the <em>Attachment</em> page</td>
+<td style="text-align:left">Click <em>Components</em> portlet.<br>Search for the component <em>Component @1234</em> and click hyper link of component <em>Component @1234</em>.</td>
+<td style="text-align:left">View screen of <em>Component @1234</em> component is display</td>
 </tr>
 <tr>
 <td style="text-align:right">9</td>
-<td style="text-align:left">Change some <em>Attachment type</em> to real type, e.g. <em>Source file</em> if it is a source file</td>
-<td style="text-align:left">Type changed successfully</td>
+<td style="text-align:left">Click <em>Release</em> Overview.<br>Click Delete icon button of release <em>Rel1</em>.<br>Click <em>Delete Release</em> button in the dialog.</td>
+<td style="text-align:left">- Dialog <em>Delete Releases</em> is displayed.<br>- Delete the release is failure.<br>- The message: <em>I could not delete the release, since it is used by another component (release) or project</em> display.</td>
 </tr>
 <tr>
 <td style="text-align:right">10</td>
-<td style="text-align:left">Click <em>Update Release</em></td>
-<td style="text-align:left"><em>Release updated successfully!</em> message is displayed</td>
+<td style="text-align:left">Go to project <em>P1</em>, delete project <em>P1</em>.</td>
+<td style="text-align:left">The project is deleted successfully</td>
 </tr>
 <tr>
 <td style="text-align:right">11</td>
-<td style="text-align:left">Click on <em>Edit</em></td>
-<td style="text-align:left"><em>You are editing the original document.</em> message is displayed</td>
+<td style="text-align:left">Go to component <em>Component @1234</em>, at  <em>Release Overview</em> tab, click Delete icon button of release <em>Rel1</em>.</td>
+<td style="text-align:left">Show message: <em>Do you really want to delete the release {componentName} ({version}) ?</em></td>
 </tr>
 <tr>
 <td style="text-align:right">12</td>
-<td style="text-align:left">Click on <em>Attachments</em> link</td>
-<td style="text-align:left"><em>Attachments</em> page is displayed</td>
+<td style="text-align:left">Click <em>Delete Release</em> button</td>
+<td style="text-align:left">Release is deleted successfully</td>
 </tr>
 <tr>
 <td style="text-align:right">13</td>
-<td style="text-align:left">Click on <em>Delete</em> icon to delete an attachment</td>
-<td style="text-align:left">Message <em>Do you really want to delete this attachment?</em> is displayed</td>
+<td style="text-align:left">Click <em>Edit Component</em> button.<br>Click <em>Delete Component</em> button.</td>
+<td style="text-align:left">The dialog is displayed with message: <em>Do you really want to delete the component {componentName} ?</em></td>
 </tr>
 <tr>
 <td style="text-align:right">14</td>
-<td style="text-align:left">Click <em>OK</em></td>
-<td style="text-align:left">Attachment is deleted successfully</td>
+<td style="text-align:left">Click <em>Delete Component</em> button</td>
+<td style="text-align:left">Component is deleted successfully</td>
+</tr>
+</tbody>
+</table>
+<h2 id="tc07-add-new-attachments-to-an-existing-release-and-delete-attachments">TC07: Add new attachments to an existing release and delete attachments</h2>
+<table>
+<thead>
+<tr>
+<th style="text-align:right">Step</th>
+<th style="text-align:left">Action</th>
+<th style="text-align:left">Result</th>
 </tr>
+</thead>
+<tbody>
 <tr>
-<td style="text-align:right">15</td>
-<td style="text-align:left">Click <em>Update Release</em></td>
-<td style="text-align:left"><em>Release updated successfully!</em> message is displayed</td>
+<td style="text-align:right">1</td>
+<td style="text-align:left">Search for an existing component (e.g. created in TC01) and click <em>Release Overview</em> tab</td>
+<td style="text-align:left">The list of releases are displayed</td>
+</tr>
+<tr>
+<td style="text-align:right">2</td>
+<td style="text-align:left">Click edit icon in the Action column of release version that needs a new attachment. <em>Eg:</em> release <em>Rel1</em>.</td>
+<td style="text-align:left">Edit release <em>Rel1</em> page is displayed.</td>
+</tr>
+<tr>
+<td style="text-align:right">3</td>
+<td style="text-align:left">Click <em>Attachments</em> tab<br>Click <em>Add Attachment</em> button<br>Click <em>Browse</em> and select several attachments.<br><em>Eg:</em> 5 attachment files (att1, att2, att3, att4, att5)</td>
+<td style="text-align:left">File names are displayed in the dialog</td>
+</tr>
+<tr>
+<td style="text-align:right">4</td>
+<td style="text-align:left">Click <em>Delete</em> button near some files not to be added.<br><em>Eg:</em> delete 2 attachment files (att1, att3)</td>
+<td style="text-align:left">File names are removed from the list</td>
+</tr>
+<tr>
+<td style="text-align:right">5</td>
+<td style="text-align:left">Click <em>Upload</em> button for the remaining files.</td>
+<td style="text-align:left">The attached file are listed in the <em>Attachment</em> page: att2, att4, att5</td>
+</tr>
+<tr>
+<td style="text-align:right">6</td>
+<td style="text-align:left">Change some <em>Attachment type</em> to real type, e.g. <em>source file, clearing report, CLI,&hellip;</em></td>
+<td style="text-align:left">Type changed successfully</td>
+</tr>
+<tr>
+<td style="text-align:right">7</td>
+<td style="text-align:left">Click <em>Update Release</em> button</td>
+<td style="text-align:left">Release <em>Ree1</em> is updated correctly.</td>
+</tr>
+<tr>
+<td style="text-align:right">8</td>
+<td style="text-align:left">Click <em>Edit Release</em> button</td>
+<td style="text-align:left"><em>Success:You are editing the original document.</em> message is displayed</td>
+</tr>
+<tr>
+<td style="text-align:right">9</td>
+<td style="text-align:left">Click <em>Attachments</em> tab</td>
+<td style="text-align:left"><em>Attachments</em> page is displayed</td>
+</tr>
+<tr>
+<td style="text-align:right">10</td>
+<td style="text-align:left">Click delete icon to delete an attachment</td>
+<td style="text-align:left">Show message: <em>Do you really want to delete attachment {attachmentName}({attachmentId})?</em></td>
+</tr>
+<tr>
+<td style="text-align:right">11</td>
+<td style="text-align:left">Click <em>Delete Attachment button</em></td>
+<td style="text-align:left">Attachment is deleted successfully, data of attachment is removed from attachment table.</td>
+</tr>
+<tr>
+<td style="text-align:right">12</td>
+<td style="text-align:left">Click <em>Update Release</em> button</td>
+<td style="text-align:left">Release Ree1 is updated correctly with message <em>Success: Release {componentName}({version}) updated successfully!</em></td>
 </tr>
 </tbody>
 </table>
-<h2 id="duplicate-an-existing-release">Duplicate an existing release</h2>
+<h2 id="tc08-duplicate-an-existing-release">TC08: Duplicate an existing release</h2>
 <table>
 <thead>
 <tr>
@@ -971,47 +1092,47 @@ User successfully signed in and Home page is …">
 <tbody>
 <tr>
 <td style="text-align:right">1</td>
-<td style="text-align:left">Search for an existing component with release with all fields filled in (e.g. created in TC03) and click <em>Release Overview</em></td>
+<td style="text-align:left">Search for an existing component with release with all fields filled in (Eg: created in TC05) and click <em>Release Overview</em></td>
 <td style="text-align:left">The list of releases are displayed</td>
 </tr>
 <tr>
 <td style="text-align:right">2</td>
 <td style="text-align:left">Click <em>Duplicate</em> button under Action column</td>
-<td style="text-align:left">The page changes to <em>Release name Edit</em></td>
+<td style="text-align:left">The page changes to create duplicate release screen</td>
 </tr>
 <tr>
 <td style="text-align:right">3</td>
 <td style="text-align:left">Check all fields from copied release</td>
-<td style="text-align:left">All fields from <em>Release Summary</em> and <em>Repository</em> are unchanged</td>
+<td style="text-align:left">- <em>Summary</em> tab:<br>  + <em>CPE ID</em> field: blank<br>  + Remain fields are unchanged (exclude disable fields).<br>- <em>Linked Releases</em> tab: there is no linked release.</td>
 </tr>
 <tr>
 <td style="text-align:right">4</td>
-<td style="text-align:left">Change the <em>Version</em> field to a new one, fill in a <em>CPE ID</em> and click <em>Add Release</em></td>
-<td style="text-align:left"><em>You are editing the original document.</em> message is displayed.</td>
+<td style="text-align:left">Change the <em>Version</em> field and fill in a <em>CPE ID</em>.<br><em>Eg:</em>  Version: ver_duplicate<br>       CPE ID: CPE ID_duplicate<br>Click <em>Create Release</em> button</td>
+<td style="text-align:left">- Redirect to edit release screen.<br>- Create duplicate release is success with message: <em>Success:You are editing the original document.</em><br>- Data of duplicate release is correct.</td>
 </tr>
 <tr>
 <td style="text-align:right">5</td>
-<td style="text-align:left">Modify some other fields, e.g. <em>Release Date</em> and click <em>Clearing Details</em></td>
+<td style="text-align:left">Modify some other fields.<br><em>Eg:</em> Release Date: 2023-06-12. <br>Click <em>Clearing Details</em> tab</td>
 <td style="text-align:left"><em>Clearing Details</em> page is displayed and does not contain any field from copied release</td>
 </tr>
 <tr>
 <td style="text-align:right">6</td>
-<td style="text-align:left">Click <em>Update Release</em></td>
-<td style="text-align:left"><em>Release Component updated successfully!</em> message is displayed</td>
+<td style="text-align:left">Click <em>Update Release</em> button</td>
+<td style="text-align:left">The release is updated successfully with data correctly</td>
 </tr>
 <tr>
 <td style="text-align:right">7</td>
-<td style="text-align:left">Click on component name link on top of the page</td>
+<td style="text-align:left">Click component name link on top of the page</td>
 <td style="text-align:left">Summary page for the component is displayed</td>
 </tr>
 <tr>
 <td style="text-align:right">8</td>
-<td style="text-align:left">Click on _Release Overview</td>
+<td style="text-align:left">Click <em>Release Overview</em> tab</td>
 <td style="text-align:left">The new copied release is listed among previous releases</td>
 </tr>
 </tbody>
 </table>
-<h2 id="search-for-and-create-a-new-vendor-for-a-new-release">Search for and create a new vendor for a new release</h2>
+<h2 id="tc09-search-for-and-create-a-new-vendor-for-a-new-release">TC09: Search for and create a new vendor for a new release</h2>
 <table>
 <thead>
 <tr>
@@ -1023,52 +1144,57 @@ User successfully signed in and Home page is …">
 <tbody>
 <tr>
 <td style="text-align:right">1</td>
-<td style="text-align:left">Search for an existing component and click <em>Edit</em></td>
-<td style="text-align:left"><em>You are editing the original document</em> message is displayed</td>
+<td style="text-align:left">Click <em>Components</em> portlet<br>At advanced Search, search for an existing component.<br><em>Eg:</em> input <em>Comp1</em> in the Component Name text box.<br>Click <em>Search</em> button.</td>
+<td style="text-align:left">Component <em>Comp1</em> display in the result table.</td>
 </tr>
 <tr>
 <td style="text-align:right">2</td>
-<td style="text-align:left">Click <em>Add Release</em></td>
-<td style="text-align:left">The page changes to <em>New Release Edit</em> page</td>
+<td style="text-align:left">Click edit icon in Actions column of component <em>Comp1</em>.</td>
+<td style="text-align:left">Edit screen of component <em>Comp1</em> is displayed with message:  <em>Success:You are editing the original document</em></td>
 </tr>
 <tr>
 <td style="text-align:right">3</td>
-<td style="text-align:left">Fill in a release <em>Version</em> and <em>CPE ID</em></td>
-<td style="text-align:left">Values are entered in the fields</td>
+<td style="text-align:left">Click <em>Releases</em> tab<br>Click <em>Add Releases</em> button</td>
+<td style="text-align:left">The page changes to <em>New Release Edit</em> page</td>
 </tr>
 <tr>
 <td style="text-align:right">4</td>
-<td style="text-align:left">Click <em>Vendor</em> field</td>
-<td style="text-align:left"><em>Search Vendor</em> dialog is displayed</td>
+<td style="text-align:left">Fill in a release <em>Version</em> and <em>CPE ID</em><br><em>Eg:</em><br>     + Version: @1.0.2<br>     + CPE ID: moshiano_002</td>
+<td style="text-align:left">Values are entered in the fields</td>
 </tr>
 <tr>
 <td style="text-align:right">5</td>
-<td style="text-align:left">Click <em>Add New Vendor</em></td>
-<td style="text-align:left"><em>Create New Vendor</em> dialog is displayed</td>
+<td style="text-align:left">Click <em>Vendor</em> field</td>
+<td style="text-align:left"><em>Search Vendor</em> dialog is displayed</td>
 </tr>
 <tr>
 <td style="text-align:right">6</td>
-<td style="text-align:left">Fill in <em>Full name</em>, <em>Short name</em> and <em>URL</em></td>
-<td style="text-align:left">Values are entered in the fields</td>
+<td style="text-align:left">Click <em>Add Vendor</em></td>
+<td style="text-align:left"><em>Create New Vendor</em> dialog is displayed</td>
 </tr>
 <tr>
 <td style="text-align:right">7</td>
-<td style="text-align:left">Click <em>Add Vendor</em></td>
-<td style="text-align:left">Dialog closes and the new vendor is displayed in release <em>Vendor</em> field</td>
+<td style="text-align:left">Fill in <em>Full name</em>, <em>Short name</em> and <em>URL</em><br><em>Eg:</em><br>Full Name: Fullvendor_0909<br>Short Name: Short_ven090<br>URL: <a href="https://github.com/">https://github.com/</a></td>
+<td style="text-align:left">Values are entered in the fields</td>
 </tr>
 <tr>
 <td style="text-align:right">8</td>
-<td style="text-align:left">Click <em>Add Release</em></td>
-<td style="text-align:left">The page remain the same and the message <em>You are editing the original document.</em> is displayed</td>
+<td style="text-align:left">Click <em>Add Vendor</em></td>
+<td style="text-align:left">Dialog closes and the new vendor is displayed in release <em>Vendor</em> field with full name <em>Fullvendor_0909</em></td>
 </tr>
 <tr>
 <td style="text-align:right">9</td>
-<td style="text-align:left">Click on component name link on top of the page</td>
+<td style="text-align:left">Click <em>Create Release</em></td>
+<td style="text-align:left">Redirect to edit release page with the message <em>Success:You are editing the original document.</em> is displayed</td>
+</tr>
+<tr>
+<td style="text-align:right">10</td>
+<td style="text-align:left">Click component name link on top of the page</td>
 <td style="text-align:left">Summary page for the component is displayed. The new vendor for the new release, as well as existing vendors from previous releases are listed under <em>Vendors</em> field for the component</td>
 </tr>
 </tbody>
 </table>
-<h2 id="link-a-release-to-the-project-in-view-component-page-and-check-used-by-projects">Link a release to the project in view component page and check used by projects</h2>
+<h2 id="tc10-link-a-release-to-the-project-in-view-component-page-and-check-used-by-projects">TC10: Link a release to the project in view component page and check used by projects</h2>
 <table>
 <thead>
 <tr>
@@ -1090,27 +1216,27 @@ User successfully signed in and Home page is …">
 </tr>
 <tr>
 <td style="text-align:right">3</td>
-<td style="text-align:left">Click on <em>Search</em> button then choose a project to link</td>
+<td style="text-align:left">Click <em>Search</em> button then choose a project to link</td>
 <td style="text-align:left"><em>Link to Project</em> button on the dialog is enabled</td>
 </tr>
 <tr>
 <td style="text-align:right">4</td>
-<td style="text-align:left">Click on _<em>Link to Project</em> button</td>
+<td style="text-align:left">Click <em>Link to Project</em> button</td>
 <td style="text-align:left"><em>The release {component name} ({version}) has been successfully linked to project {project name}</em><br><em>Click <ins>here<ins></em> <em>to edit the release relation as well as the project mainline state in the project.</em> message is displayed</td>
 </tr>
 <tr>
 <td style="text-align:right">5</td>
-<td style="text-align:left">Click on <em>here</em> hyperlink in the dialog</td>
+<td style="text-align:left">Click <em>here</em> hyperlink in the dialog</td>
 <td style="text-align:left">Redirect to the <em>edit project</em> page with the release was linked (displayed on  <em>License Clearing</em> page)</td>
 </tr>
 <tr>
 <td style="text-align:right">6</td>
-<td style="text-align:left">Re-open the release at view page and click on <em>Summary</em> tab</td>
+<td style="text-align:left">Re-open the release at view page and click <em>Summary</em> tab</td>
 <td style="text-align:left">Used by project information is updated correspondingly</td>
 </tr>
 </tbody>
 </table>
-<h2 id="link-a-release-to-a-project-in-the-view-release-page">Link a release to a project in the view release page</h2>
+<h2 id="tc11-link-a-release-to-a-project-in-the-view-release-page">TC11: Link a release to a project in the view release page</h2>
 <table>
 <thead>
 <tr>
@@ -1127,32 +1253,32 @@ User successfully signed in and Home page is …">
 </tr>
 <tr>
 <td style="text-align:right">2</td>
-<td style="text-align:left">Click on <em>a release name</em> hyperlink. Eg: release R1</td>
+<td style="text-align:left">Click <em>a release name</em> hyperlink. Eg: release R1</td>
 <td style="text-align:left">Redirect to the <em>view release</em> page</td>
 </tr>
 <tr>
 <td style="text-align:right">3</td>
-<td style="text-align:left">Click on <em>Link to Project</em> button</td>
+<td style="text-align:left">Click <em>Link to Project</em> button</td>
 <td style="text-align:left">The dialog <em>Link Release to Project</em> is displayed with <em>Link to Project</em> button is disabled</td>
 </tr>
 <tr>
 <td style="text-align:right">4</td>
-<td style="text-align:left">Click on <em>Search</em> button then choose a project to link</td>
+<td style="text-align:left">Click <em>Search</em> button then choose a project to link</td>
 <td style="text-align:left"><em>Link to Project</em> button on the dialog is enabled</td>
 </tr>
 <tr>
 <td style="text-align:right">5</td>
-<td style="text-align:left">Click on _<em>Link to Project</em> button</td>
+<td style="text-align:left">Click <em>Link to Project</em> button</td>
 <td style="text-align:left"><em>The release {component name} ({version}) has been successfully linked to project {project name}</em><br><em>Click <ins>here<ins></em> <em>to edit the release relation as well as the project mainline state in the project.</em> message is displayed</td>
 </tr>
 <tr>
 <td style="text-align:right">6</td>
-<td style="text-align:left">Click on <em>here</em> hyperlink in the dialog</td>
+<td style="text-align:left">Click <em>here</em> hyperlink in the dialog</td>
 <td style="text-align:left">Redirect to the <em>edit project</em> page with the release was linked (displayed on  <em>License Clearing</em> page)</td>
 </tr>
 </tbody>
 </table>
-<h2 id="import-a-new-component-by-spdxxml-rdf-file">Import a new component by .spdx/.xml/ .rdf file</h2>
+<h2 id="tc12-import-a-new-component-by-spdxxml-rdf-file">TC12: Import a new component by .spdx/.xml/ .rdf file</h2>
 <table>
 <thead>
 <tr>
@@ -1164,12 +1290,12 @@ User successfully signed in and Home page is …">
 <tbody>
 <tr>
 <td style="text-align:right">1</td>
-<td style="text-align:left">Click on <em>Components</em> tab</td>
+<td style="text-align:left">Click <em>Components</em> tab</td>
 <td style="text-align:left"><em>Components</em> page is displayed</td>
 </tr>
 <tr>
 <td style="text-align:right">2</td>
-<td style="text-align:left">Click on <em>Import SBOM</em> button</td>
+<td style="text-align:left">Click <em>Import SBOM</em> button</td>
 <td style="text-align:left">A dialog <em>Upload SBOM</em> is displayed</td>
 </tr>
 <tr>
@@ -1179,12 +1305,12 @@ User successfully signed in and Home page is …">
 </tr>
 <tr>
 <td style="text-align:right">4</td>
-<td style="text-align:left">Click on <em>Import</em> button</td>
+<td style="text-align:left">Click <em>Import</em> button</td>
 <td style="text-align:left">The dialog is closed. New releases and new components are imported successfully</td>
 </tr>
 </tbody>
 </table>
-<h2 id="export-components-without-releases">Export components without releases</h2>
+<h2 id="tc13-export-components-without-releases">TC13: Export components without releases</h2>
 <table>
 <thead>
 <tr>
@@ -1196,17 +1322,17 @@ User successfully signed in and Home page is …">
 <tbody>
 <tr>
 <td style="text-align:right">1</td>
-<td style="text-align:left">Click on <em>Components</em> tab</td>
+<td style="text-align:left">Click <em>Components</em> tab</td>
 <td style="text-align:left"><em>Components</em> page is displayed</td>
 </tr>
 <tr>
 <td style="text-align:right">2</td>
-<td style="text-align:left">Click on <em>Export Spreadsheet</em> button and choose <em>Components only</em> option</td>
-<td style="text-align:left">A new file with name&rsquo;s format <em>components-{yyyy}-{mm}-{dd}.xlsx</em> is downloaded<br> The content of the downloaded file includes information of all components in the system</td>
+<td style="text-align:left">Click <em>Export Spreadsheet</em> button and choose <em>Components only</em> option</td>
+<td style="text-align:left">- A new file with name&rsquo;s format <em>components-{yyyy}-{mm}-{dd}.xlsx</em> is downloaded<br>- The content of the downloaded file includes information of all components in the system</td>
 </tr>
 </tbody>
 </table>
-<h2 id="export-components-with-releases">Export components with releases</h2>
+<h2 id="tc14-export-components-with-releases">TC14: Export components with releases</h2>
 <table>
 <thead>
 <tr>
@@ -1218,17 +1344,17 @@ User successfully signed in and Home page is …">
 <tbody>
 <tr>
 <td style="text-align:right">1</td>
-<td style="text-align:left">Click on <em>Components</em> tab</td>
+<td style="text-align:left">Click <em>Components</em> tab</td>
 <td style="text-align:left"><em>Components</em> page is displayed</td>
 </tr>
 <tr>
 <td style="text-align:right">2</td>
-<td style="text-align:left">Click on <em>Export Spreadsheet</em> button and choose <em>Components with releases</em> option</td>
-<td style="text-align:left">New file with name <em>components-{yyyy}-{mm}-{dd}.xlsx</em> is downloaded.<br> The content of the downloaded file includes information of all components and releases in the system</td>
+<td style="text-align:left">Click <em>Export Spreadsheet</em> button and choose <em>Components with releases</em> option</td>
+<td style="text-align:left">- New file with name <em>components-{yyyy}-{mm}-{dd}.xlsx</em> is downloaded.<br>- The content of the downloaded file includes information of all components and releases in the system</td>
 </tr>
 </tbody>
 </table>
-<h2 id="create-a-clearing-request-for-a-release">Create a clearing request for a release</h2>
+<h2 id="tc15-create-a-clearing-request-for-a-release">TC15: Create a clearing request for a release</h2>
 <table>
 <thead>
 <tr>
@@ -1250,27 +1376,27 @@ User successfully signed in and Home page is …">
 </tr>
 <tr>
 <td style="text-align:right">3</td>
-<td style="text-align:left">Click on <em>Attachments</em> tab, then add a source file (Eg: .rdf file) with <em>Type</em> is <em>Source file</em></td>
+<td style="text-align:left">Click <em>Attachments</em> tab, then add a source file (Eg: .rdf file) with <em>Type</em> is <em>Source file</em></td>
 <td style="text-align:left">The data is updated correspondingly</td>
 </tr>
 <tr>
 <td style="text-align:right">4</td>
-<td style="text-align:left">Click on <em>Update Release</em> button</td>
+<td style="text-align:left">Click <em>Update Release</em> button</td>
 <td style="text-align:left">The message <em>Success:Release {release name} updated successfully!</em> is displayed</td>
 </tr>
 <tr>
 <td style="text-align:right">5</td>
-<td style="text-align:left">Click on <em>Clearing details</em> tab, then click on <em>Possology Process</em> icon beside <em>Clearing State</em> field and wait for the process to finish</td>
+<td style="text-align:left">Click <em>Clearing details</em> tab, then click <em>Fossology Process</em> icon beside <em>Clearing State</em> field and wait for the process to finish</td>
 <td style="text-align:left">The message <em>The FOSSology process already finished. You should find the resulting report as attachment at this release.</em> is displayed in the <em>Fossology Process</em> dialog</td>
 </tr>
 <tr>
 <td style="text-align:right">6</td>
-<td style="text-align:left">Click on <em>Close</em> button in the dialog</td>
+<td style="text-align:left">Click <em>Close</em> button in the dialog</td>
 <td style="text-align:left">The dialog is closed</td>
 </tr>
 <tr>
 <td style="text-align:right">7</td>
-<td style="text-align:left">Reload this page, then click on <em>Attachments</em> tab</td>
+<td style="text-align:left">Reload this page, then click <em>Attachments</em> tab</td>
 <td style="text-align:left">A new file is listed in <em>Attachments</em> page with name&rsquo;s format <em>{component name}-{version}-{yyyymmdd}-{hhmm}-SPDX.rdf</em></td>
 </tr>
 </tbody>
@@ -1279,7 +1405,7 @@ User successfully signed in and Home page is …">
 	
 	
 	<div class="text-muted mt-5 pt-3 border-top">
-  Last modified September 18, 2023: <a href="https://github.com/eclipse/sw360.website/commit/3e5bcd6f7364c112b6b04dd464903cca726649e3">feat(docs): Add test case for component, release (3e5bcd6)</a>
+  Last modified March 1, 2024: <a href="https://github.com/eclipse/sw360.website/commit/d3f2afc39299a13832ed866406e60a6aabd4e6e7">feat(docs): Update test case for Component, Release (d3f2afc)</a>
 </div>
 
 </div>
@@ -1328,24 +1454,24 @@ User successfully signed in and Home page is …">
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/testcases/test-cases-licenses/index.html b/docs/development/testcases/test-cases-licenses/index.html
index 85bbd3f..7d9060e 100644
--- a/docs/development/testcases/test-cases-licenses/index.html
+++ b/docs/development/testcases/test-cases-licenses/index.html
@@ -315,6 +315,10 @@ User successfully signed in and Home page is …">
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -322,7 +326,22 @@ User successfully signed in and Home page is …">
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -334,29 +353,10 @@ User successfully signed in and Home page is …">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -375,10 +375,6 @@ User successfully signed in and Home page is …">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -391,6 +387,10 @@ User successfully signed in and Home page is …">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -803,24 +803,24 @@ User successfully signed in and Home page is …">
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/testcases/test-cases-moderations/index.html b/docs/development/testcases/test-cases-moderations/index.html
index cef5296..73209e3 100644
--- a/docs/development/testcases/test-cases-moderations/index.html
+++ b/docs/development/testcases/test-cases-moderations/index.html
@@ -314,6 +314,10 @@ Open first browser instance ((e.g. &ldquo;firefox.exe -p …">
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -321,7 +325,22 @@ Open first browser instance ((e.g. &ldquo;firefox.exe -p …">
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -333,29 +352,10 @@ Open first browser instance ((e.g. &ldquo;firefox.exe -p …">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -374,10 +374,6 @@ Open first browser instance ((e.g. &ldquo;firefox.exe -p …">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -390,6 +386,10 @@ Open first browser instance ((e.g. &ldquo;firefox.exe -p …">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -862,24 +862,24 @@ Open first browser instance ((e.g. &ldquo;firefox.exe -p …">
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/development/testcases/test-cases-projects/index.html b/docs/development/testcases/test-cases-projects/index.html
index 835255c..5241462 100644
--- a/docs/development/testcases/test-cases-projects/index.html
+++ b/docs/development/testcases/test-cases-projects/index.html
@@ -315,6 +315,10 @@ User successfully signed in and Home page …">
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -322,7 +326,22 @@ User successfully signed in and Home page …">
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -334,29 +353,10 @@ User successfully signed in and Home page …">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -375,10 +375,6 @@ User successfully signed in and Home page …">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -391,6 +387,10 @@ User successfully signed in and Home page …">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -999,24 +999,24 @@ User successfully signed in and Home page …">
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/index.html b/docs/index.html
index cac3630..5221c39 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -299,6 +299,10 @@ SW360 is a software catalogue application that has been developed to facilitate
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -306,7 +310,22 @@ SW360 is a software catalogue application that has been developed to facilitate
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -318,29 +337,10 @@ SW360 is a software catalogue application that has been developed to facilitate
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -359,10 +359,6 @@ SW360 is a software catalogue application that has been developed to facilitate
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -375,6 +371,10 @@ SW360 is a software catalogue application that has been developed to facilitate
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -749,24 +749,24 @@ SW360 is a software catalogue application that has been developed to facilitate
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/index.xml b/docs/index.xml
index 2e77bbc..b436047 100644
--- a/docs/index.xml
+++ b/docs/index.xml
@@ -2645,7 +2645,7 @@ We will add the license text to licenses in the thrift file:&lt;/p&gt;
       <description>
         
         
-        &lt;h2 id=&#34;add-a-component-and-release-with-vendor-present&#34;&gt;Add a component and release with vendor present&lt;/h2&gt;
+        &lt;h2 id=&#34;tc01-add-a-component-and-release-with-vendor-present&#34;&gt;TC01: Add a component and release with vendor present&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -2662,82 +2662,92 @@ We will add the license text to licenses in the thrift file:&lt;/p&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Components&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Components&lt;/em&gt; tab&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Components&lt;/em&gt; page is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Component&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;New Component&lt;/em&gt; page is displayed with mandatory fields marked with red star&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Component&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;- &lt;em&gt;New Component&lt;/em&gt; page is displayed with mandatory fields marked with red star: Name, Categories, Component Type. &lt;br&gt;- A message &lt;em&gt;Success:New Component&lt;/em&gt; is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Fill in a component &lt;em&gt;Name&lt;/em&gt; and &lt;em&gt;Categories&lt;/em&gt; and click &lt;em&gt;Add Component&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The page remain the same and the message &lt;em&gt;You are editing the original document.&lt;/em&gt; is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Fill in a component &lt;em&gt;Name&lt;/em&gt;, &lt;em&gt;Categories&lt;/em&gt; and &lt;em&gt;Component Type&lt;/em&gt; fields. &lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt;&lt;br&gt;- Name: Component 1@1&lt;br&gt;- Categories: Categories_1@1&lt;br&gt;- Component Type: OSS&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The page changes to &lt;em&gt;New Release Edit&lt;/em&gt; page&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Create Component&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;- Create component successfully. &lt;br&gt;- Redirect to the edit component page.&lt;br&gt;-Show message: &lt;em&gt;Success:You are editing the original document.&lt;/em&gt;&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;6&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Fill in a release &lt;em&gt;Version&lt;/em&gt; and &lt;em&gt;CPE ID&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Releases&lt;/em&gt; tab&lt;br&gt;Click &lt;em&gt;Add Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Redirect to Add Release page&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;7&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The page remain the same and the message &lt;em&gt;You are editing the original document.&lt;/em&gt; is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Fill in a release &lt;em&gt;Version&lt;/em&gt; and &lt;em&gt;CPE ID&lt;/em&gt;&lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt;&lt;br&gt;- Version: version1.0.0.x&lt;br&gt;- CPE ID: UUID_1002&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields:&lt;br&gt;- Version: version1.0.0.x&lt;br&gt;- CPE ID: UUID_1002&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;8&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Vendor&lt;/em&gt; field&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Search Vendor&lt;/em&gt; dialog is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Create Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;- Create a release successfully.&lt;br&gt;- Redirect to the edit new release page.&lt;br&gt;- The message &lt;em&gt;Success:You are editing the original document.&lt;/em&gt; is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;9&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Search&lt;/em&gt; for a Vendor, select it and click &lt;em&gt;Select&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Dialog is closed and selected Vendor is added under &lt;em&gt;Vendor&lt;/em&gt; field&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Vendor&lt;/em&gt; field&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Search Vendor&lt;/em&gt; dialog is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;10&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Attachments&lt;/em&gt; link&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Attachments&lt;/em&gt; page is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Vendor&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Create new Vendor&lt;/em&gt; dialog display&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;11&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Add Attachment&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Upload Attachment&lt;/em&gt; dialog is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Input data in fields&lt;br&gt;- Full Name: add vendor 01&lt;br&gt;-Short Name: add vendor01&lt;br&gt;-URL: &lt;a href=&#34;https://github.com/eclipse-sw360/sw360&#34;&gt;https://github.com/eclipse-sw360/sw360&lt;/a&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;12&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Browse&lt;/em&gt; and select the attachment&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;File name is displayed in the dialog&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Vendor&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The vendor is added in Vendor field of the release with full name is &lt;em&gt;add vendor 01&lt;/em&gt;&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;13&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Upload&lt;/em&gt; button&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The file is uploaded and dialog is closed. Also the attached file is listed in the &lt;em&gt;Attachment&lt;/em&gt; page&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Attachments&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Attachments&lt;/em&gt; page is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;14&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Change the &lt;em&gt;Attachment type&lt;/em&gt; to real type, e.g. &lt;em&gt;Source file&lt;/em&gt; if it is a source file&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Type changed successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Attachment&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Upload Attachment&lt;/em&gt; dialog is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;15&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Release updated successfully!&lt;/em&gt; message is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Browse&lt;/em&gt; and select the attachment.&lt;br&gt;Eg: attachment1.xlsx&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;File name is displayed in the dialog&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;16&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Components&lt;/em&gt; tab&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The new component should be added to the components list (e.g. filter by &lt;em&gt;Keyword Search&lt;/em&gt;)&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Upload&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The file is uploaded and dialog is closed. Also the attached file is listed in the &lt;em&gt;Attachment&lt;/em&gt; page&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;17&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Change the attachment &lt;em&gt;Type&lt;/em&gt; to real type.&lt;br&gt;Eg: Component license information (Combined)&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Type changed successfully&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;18&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Message: &lt;em&gt;Success:Release {name} ({version}) updated successfully!&lt;/em&gt; is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;modify-a-component-and-release-with-vendor-present&#34;&gt;Modify a component and release with vendor present&lt;/h2&gt;
+&lt;h2 id=&#34;tc02-verify-data-after-add-a-component-and-release-with-vendor-present&#34;&gt;TC02: Verify data after add a component and release with vendor present&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -2749,17 +2759,32 @@ We will add the license text to licenses in the thrift file:&lt;/p&gt;
 &lt;tbody&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;1&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Search for an existing component (e.g. created in TC01) and click &lt;em&gt;Edit&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;You are editing the original document&lt;/em&gt; message is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Search for the component is created in TC01:&lt;br&gt;- Click &lt;em&gt;Components&lt;/em&gt; portlet&lt;br&gt;- At Advanced Search area, input &lt;em&gt;Component 1@1&lt;/em&gt; in the &lt;em&gt;Component Name&lt;/em&gt; textbox.&lt;br&gt;- Click &lt;em&gt;Search&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The new component display in the table with:&lt;br&gt;- Vendor: add vendor01&lt;br&gt;- Component Name: &lt;em&gt;Component 1@1&lt;/em&gt; is displayed with hyper link.&lt;br&gt;- Main licenses: blank&lt;br&gt;- Component Type: OSS&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Execute steps 5-16 from TC01&lt;/td&gt;
-&lt;td&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click hyper link of name &lt;em&gt;Component 1@1&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Redirect to view component &lt;em&gt;Component 1@1&lt;/em&gt; page&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Release Overview&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The release display with:&lt;br&gt;- Name: Component 1@1&lt;br&gt;- Version displays with hyper link: version1.0.0.x&lt;br&gt;- Clearing State: New&lt;br&gt;- Clearing Report: no report&lt;br&gt;- Release Mainline State: Open&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click hyper link &lt;em&gt;version1.0.0.x&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Redirect to view screen of release &lt;em&gt;Component 1@1 version1.0.0.x&lt;/em&gt;&lt;br&gt;Data of the release:&lt;br&gt;- Summary tab:&lt;br&gt;+ display text with: COMPONENT 1@1 VERSION1.0.0.X&lt;br&gt;+ CPE ID: UUID_1002&lt;br&gt;+ Created on: date of created.&lt;br&gt;+ Created by: user created.&lt;br&gt;+ Modified On: date of modified.&lt;br&gt;+ Modified By: user modified.&lt;br&gt;+ Clearing State: New&lt;br&gt;+ Release Mainline State: Open&lt;br&gt;+ Release Vendor with:&lt;br&gt;   Full Name:	add vendor 01&lt;br&gt;   Short Name: add vendor01&lt;br&gt;   URL: &lt;a href=&#34;https://github.com/eclipse-sw360/sw360&#34;&gt;https://github.com/eclipse-sw360/sw360&lt;/a&gt;&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Attachments&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Display file name &lt;em&gt;attachment1.xlsx&lt;/em&gt; in the table.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;add-and-modify-a-component-and-release-with-all-fields-filled-in&#34;&gt;Add and modify a component and release with all fields filled in&lt;/h2&gt;
+&lt;h2 id=&#34;tc03-modify-a-component-and-release-with-vendor-present&#34;&gt;TC03: Modify a component and release with vendor present&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -2771,87 +2796,99 @@ We will add the license text to licenses in the thrift file:&lt;/p&gt;
 &lt;tbody&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;1&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Components&lt;/em&gt; tab&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Components&lt;/em&gt; page is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Search for an existing component (e.g. created in TC01: &lt;em&gt;Component 1@1&lt;/em&gt;) and click &lt;em&gt;Edit&lt;/em&gt; icon&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Success:You are editing the original document&lt;/em&gt; message is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Component&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;New Component&lt;/em&gt; page is displayed with mandatory fields marked with red star&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Releases&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Release list is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Fill in all editable fields under &lt;em&gt;Basic Information&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Redirect to Add Release page&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Component&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The page remain the same and the message &lt;em&gt;You are editing the original document.&lt;/em&gt; is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Fill in a release &lt;em&gt;Version&lt;/em&gt; and &lt;em&gt;CPE ID&lt;/em&gt;&lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt;&lt;br&gt;- Version: v1.0.0.1&lt;br&gt;- CPE ID: cpe:id:123456&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields:&lt;br&gt;- Version: v1.0.0.1&lt;br&gt;- CPE ID: cpe:id:123456&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The page changes to &lt;em&gt;New Release Edit&lt;/em&gt; page&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Create Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;- Redirect to the edit new release page.&lt;br&gt;- The message &lt;em&gt;Success:You are editing the original document.&lt;/em&gt; is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;6&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Fill in all editable fields under &lt;em&gt;Release Summary&lt;/em&gt; and &lt;em&gt;Release Repository&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Vendor&lt;/em&gt; field&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Search Vendor&lt;/em&gt; dialog is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;7&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The page remain the same and the message &lt;em&gt;You are editing the original document.&lt;/em&gt; is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Search&lt;/em&gt; button.&lt;br&gt;Select a vendor (eg: select  vendor with full name &lt;em&gt;VendorUp&lt;/em&gt;) &lt;br&gt;Click &lt;em&gt;Select Vendor&lt;/em&gt; button.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Dialog is closed and selected Vendor is  added under &lt;em&gt;Vendor&lt;/em&gt; field: VendorUp&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;8&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Linked Releases&lt;/em&gt; link&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Linked Releases&lt;/em&gt; page displayed successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Attachments&lt;/em&gt; tab&lt;br&gt;Click &lt;em&gt;Add Attachment&lt;/em&gt; button&lt;br&gt;Click &lt;em&gt;Browse&lt;/em&gt; and select the attachment. Eg:  attachment2.img&lt;br&gt;Click &lt;em&gt;Upload&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The file is uploaded and dialog is closed.  Also the attached file is listed in the Attachment page&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;9&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Click to add Releases&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Search Release&lt;/em&gt; dialog is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Message &lt;em&gt;Success:Release Component 1@1  (v1.0.0.1) updated successfully!&lt;/em&gt; is displayed&lt;/td&gt;
 &lt;/tr&gt;
+&lt;/tbody&gt;
+&lt;/table&gt;
+&lt;h2 id=&#34;tc04-verify-data-after--modify-a-component-and-release-with-vendor-present&#34;&gt;TC04: Verify data after  modify a component and release with vendor present&lt;/h2&gt;
+&lt;table&gt;
+&lt;thead&gt;
 &lt;tr&gt;
-&lt;td style=&#34;text-align:right&#34;&gt;10&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Search by name&lt;/em&gt; and &lt;em&gt;Select&lt;/em&gt; a release to be added&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Dialog is closed and selected release is displayed under &lt;em&gt;Linked Releases&lt;/em&gt; section&lt;/td&gt;
+&lt;th style=&#34;text-align:right&#34;&gt;Step&lt;/th&gt;
+&lt;th style=&#34;text-align:left&#34;&gt;Action&lt;/th&gt;
+&lt;th style=&#34;text-align:left&#34;&gt;Result&lt;/th&gt;
 &lt;/tr&gt;
+&lt;/thead&gt;
+&lt;tbody&gt;
 &lt;tr&gt;
-&lt;td style=&#34;text-align:right&#34;&gt;11&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Clearing Details&lt;/em&gt; link&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Clearing Details&lt;/em&gt; dialog is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;1&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Continue TC03&lt;/td&gt;
+&lt;td&gt;&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
-&lt;td style=&#34;text-align:right&#34;&gt;12&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Fill in all editable fields&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields&lt;/td&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Summary&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Data in the tab:&lt;br&gt;- Modified On: date of modified.&lt;br&gt;- Modified By: user modified.&lt;br&gt;Data of other fields in the tab is same data before updated.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
-&lt;td style=&#34;text-align:right&#34;&gt;13&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Attachments&lt;/em&gt; link and upload a file&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;File attached successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Release Overview&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;New release with version &lt;em&gt;v1.0.0.1&lt;/em&gt;  is added in the release  table.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
-&lt;td style=&#34;text-align:right&#34;&gt;14&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Release updated successfully!&lt;/em&gt; message is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;v1.0.0.1&lt;/em&gt; hyper link&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Text display with: &lt;em&gt;COMPONENT 1@1  V1.0.0.1&lt;/em&gt; at the right corner.&lt;br&gt;- At Summary tab: &lt;br&gt;  + CPE ID: cpe:id:123456&lt;br&gt;  + Release Vendor: display with Full Name, Short Name and URL correctly with  vendor &lt;em&gt;VendorUp&lt;/em&gt;  &lt;br&gt;- At Attachments tab: attachment &lt;em&gt;attachment2.img&lt;/em&gt; display in  the attachment table with correct information.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
-&lt;td style=&#34;text-align:right&#34;&gt;15&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Check all fields of the release under &lt;em&gt;Summary&lt;/em&gt;, &lt;em&gt;Linked Releases&lt;/em&gt;, &lt;em&gt;Clearing Details&lt;/em&gt; and &lt;em&gt;Attachments&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Values are filled in correctly&lt;/td&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Component 1@1&lt;/em&gt; hyper link&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Redirect to view screen of &lt;em&gt;Component 1@1&lt;/em&gt;  component.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
-&lt;td style=&#34;text-align:right&#34;&gt;16&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Edit&lt;/em&gt; button, modify some fields and &lt;em&gt;Update Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Values are updated successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;6&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Attachments&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Data in the tab is same data before updated.&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;7&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Vulnerabilities&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Data in the tab is same data before updated.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;delete-a-component-that-is-first-linked-to-a-project-and-then-not-and-a-project&#34;&gt;Delete a component that is first linked to a project and then not, and a project&lt;/h2&gt;
+&lt;h2 id=&#34;tc05-add-and-modify-a-component-and-release-with-all-fields-filled-in&#34;&gt;TC05: Add and modify a component and release with all fields filled in&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -2863,52 +2900,67 @@ We will add the license text to licenses in the thrift file:&lt;/p&gt;
 &lt;tbody&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;1&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Create a new component&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Component is created successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Components&lt;/em&gt; tab&lt;br&gt;Click &lt;em&gt;Add Component&lt;/em&gt; button&lt;br&gt;Fill in all editable fields&lt;br&gt;Click &lt;em&gt;Create Component&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;- Redirect to edit component screen with the  message &lt;em&gt;Success:You are editing the original document.&lt;/em&gt; is displayed in the  left corner.&lt;br&gt;- Create component successfully. Data match with input  data.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Add a new release to this component&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Release is added successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Releases&lt;/em&gt; tab.&lt;br&gt;Click &lt;em&gt;Add Releases&lt;/em&gt; button.&lt;br&gt;At &lt;em&gt;Summary&lt;/em&gt; tab, fill in all editable fields under &lt;em&gt;Release Summary&lt;/em&gt; and &lt;em&gt;Release Repository&lt;/em&gt;.&lt;br&gt;Click &lt;em&gt;Create Release&lt;/em&gt; button.&lt;br&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Redirect to edit release screen.&lt;br&gt;Created release successfully. Data match with input data.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Create a new project&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Project is created successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Linked Releases&lt;/em&gt; tab&lt;br&gt;Click &lt;em&gt;Click to add Releases&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The dialog &lt;em&gt;Link Releases&lt;/em&gt; is displayed.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Add the linked release created above to this project&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Release linked successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Input search name into textbox&lt;br&gt;Click &lt;em&gt;Search&lt;/em&gt; button&lt;br&gt;Select 3 releases.&lt;br&gt;Click &lt;em&gt;Link Releases&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Dialog is closed and selected release is displayed under &lt;em&gt;Linked Releases&lt;/em&gt; section.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Go to components, try to delete the newly created component (that is linked to a project)&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Message &lt;em&gt;I could not delete the component!&lt;/em&gt; is displayed.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Linked Packages&lt;/em&gt; tab&lt;br&gt;Click &lt;em&gt;Add Packages&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The dialog &lt;em&gt;Link Packages&lt;/em&gt; is displayed.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;6&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;OK&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Component is not deleted&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Input an exist orphan package name into textbox.&lt;br&gt;Click &lt;em&gt;Search&lt;/em&gt; button.&lt;br&gt;Select a package.&lt;br&gt;Click &lt;em&gt;Link Packages&lt;/em&gt; button.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Dialog is closed and selected package is displayed under &lt;em&gt;Linked Packages&lt;/em&gt; table&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;7&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Go to Projects, delete the newly created project&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Project is deleted successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Clearing Details&lt;/em&gt; tab&lt;br&gt;Fill in all editable fields&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;8&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Go to components, delete the newly created components (not linked anymore to a project)&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Message &lt;em&gt;Do you want to delete component?&lt;/em&gt; is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;ECC Details&lt;/em&gt; tab&lt;br&gt;Fill in all editable fields&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;9&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;OK&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Component is deleted successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Attachments&lt;/em&gt; tab&lt;br&gt;Click &lt;em&gt;Add Attachment&lt;/em&gt; button&lt;br&gt;Click &lt;em&gt;Browse&lt;/em&gt; and select the attachment. &lt;em&gt;Eg&lt;/em&gt;: attachment3.xlsx&lt;br&gt;Click &lt;em&gt;Upload&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The file is uploaded and dialog is closed. Also the attached file is listed in the Attachment page&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;10&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;- &lt;em&gt;Success:Release {componentName} ({version}) updated successfully!&lt;/em&gt; message is displayed.&lt;br&gt;- Redirect to the view release screen.&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;11&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Check all fields of the release by click tabs: &lt;em&gt;Summary, Linked Releases, Linked Packages, Clearing Details and Attachments&lt;/em&gt;.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Values are filled in correctly, match with input data.&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;12&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Edit Release&lt;/em&gt; button, modify some fields.&lt;br&gt;Eg: &lt;br&gt;- &lt;em&gt;Version&lt;/em&gt; field ( in &lt;em&gt;Summary&lt;/em&gt; tab): rename version name_updated&lt;br&gt;      - &lt;em&gt;ECC Status&lt;/em&gt; field (in &lt;em&gt;ECC Details&lt;/em&gt; tab): Approved.&lt;br&gt;Click &lt;em&gt;Update Release&lt;/em&gt; button.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Values are updated successfully&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;add-new-attachments-to-an-existing-release-and-delete-attachments&#34;&gt;Add new attachments to an existing release and delete attachments&lt;/h2&gt;
+&lt;h2 id=&#34;tc06-delete-a-component-that-is-first-linked-to-a-project-and-then-not-and-a-project&#34;&gt;TC06: Delete a component that is first linked to a project and then not, and a project&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -2920,82 +2972,149 @@ We will add the license text to licenses in the thrift file:&lt;/p&gt;
 &lt;tbody&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;1&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Search for an existing component (e.g. created in TC01) and click &lt;em&gt;Release Overview&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The list of releases are displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Create a new component&lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt; component with name &lt;em&gt;Component @1234&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Component is created successfully&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on release version that needs a new attachment&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Release Summary: name&lt;/em&gt; page is displayed for the selected release&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Add a new release to this component&lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt; release &lt;em&gt;Rel1&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Release is added successfully&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Edit&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;You are editing the original document.&lt;/em&gt; message is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Create a new project &lt;em&gt;P1&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Project is created successfully&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Attachments&lt;/em&gt; link&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Attachments&lt;/em&gt; page is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Add the linked release &lt;em&gt;Rel1&lt;/em&gt; to project &lt;em&gt;P1&lt;/em&gt;.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Release linked successfully&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Add Attachment&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Upload Attachment&lt;/em&gt; dialog is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Components&lt;/em&gt; portlet.&lt;br&gt;Search component &lt;em&gt;Component @1234&lt;/em&gt; by name at advanced search.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Component &lt;em&gt;Component @1234&lt;/em&gt; display on the result table.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;6&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Browse&lt;/em&gt; and select several attachments&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;File names are displayed in the dialog&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click delete icon of component &lt;em&gt;Component @1234&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;A warning &lt;em&gt;The component Component @1234 cannot be deleted, since it contains 1 releases. Please delete the releases first.&lt;/em&gt;&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;7&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Cancel&lt;/em&gt; near some files not to be added&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;File names are removed from the list&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;OK&lt;/em&gt; button in the warning dialog.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The dialog is closed, component is not deleted&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;8&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Upload&lt;/em&gt; button for the remaining files&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The files are uploaded and dialog is closed. Also the attached file are listed in the &lt;em&gt;Attachment&lt;/em&gt; page&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Components&lt;/em&gt; portlet.&lt;br&gt;Search for the component &lt;em&gt;Component @1234&lt;/em&gt; and click hyper link of component &lt;em&gt;Component @1234&lt;/em&gt;.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;View screen of &lt;em&gt;Component @1234&lt;/em&gt; component is display&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;9&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Change some &lt;em&gt;Attachment type&lt;/em&gt; to real type, e.g. &lt;em&gt;Source file&lt;/em&gt; if it is a source file&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Type changed successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Release&lt;/em&gt; Overview.&lt;br&gt;Click Delete icon button of release &lt;em&gt;Rel1&lt;/em&gt;.&lt;br&gt;Click &lt;em&gt;Delete Release&lt;/em&gt; button in the dialog.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;- Dialog &lt;em&gt;Delete Releases&lt;/em&gt; is displayed.&lt;br&gt;- Delete the release is failure.&lt;br&gt;- The message: &lt;em&gt;I could not delete the release, since it is used by another component (release) or project&lt;/em&gt; display.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;10&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Release updated successfully!&lt;/em&gt; message is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Go to project &lt;em&gt;P1&lt;/em&gt;, delete project &lt;em&gt;P1&lt;/em&gt;.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The project is deleted successfully&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;11&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Edit&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;You are editing the original document.&lt;/em&gt; message is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Go to component &lt;em&gt;Component @1234&lt;/em&gt;, at  &lt;em&gt;Release Overview&lt;/em&gt; tab, click Delete icon button of release &lt;em&gt;Rel1&lt;/em&gt;.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Show message: &lt;em&gt;Do you really want to delete the release {componentName} ({version}) ?&lt;/em&gt;&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;12&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Attachments&lt;/em&gt; link&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Attachments&lt;/em&gt; page is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Delete Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Release is deleted successfully&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;13&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Delete&lt;/em&gt; icon to delete an attachment&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Message &lt;em&gt;Do you really want to delete this attachment?&lt;/em&gt; is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Edit Component&lt;/em&gt; button.&lt;br&gt;Click &lt;em&gt;Delete Component&lt;/em&gt; button.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The dialog is displayed with message: &lt;em&gt;Do you really want to delete the component {componentName} ?&lt;/em&gt;&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;14&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;OK&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Attachment is deleted successfully&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Delete Component&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Component is deleted successfully&lt;/td&gt;
 &lt;/tr&gt;
+&lt;/tbody&gt;
+&lt;/table&gt;
+&lt;h2 id=&#34;tc07-add-new-attachments-to-an-existing-release-and-delete-attachments&#34;&gt;TC07: Add new attachments to an existing release and delete attachments&lt;/h2&gt;
+&lt;table&gt;
+&lt;thead&gt;
 &lt;tr&gt;
-&lt;td style=&#34;text-align:right&#34;&gt;15&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Release updated successfully!&lt;/em&gt; message is displayed&lt;/td&gt;
+&lt;th style=&#34;text-align:right&#34;&gt;Step&lt;/th&gt;
+&lt;th style=&#34;text-align:left&#34;&gt;Action&lt;/th&gt;
+&lt;th style=&#34;text-align:left&#34;&gt;Result&lt;/th&gt;
+&lt;/tr&gt;
+&lt;/thead&gt;
+&lt;tbody&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;1&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Search for an existing component (e.g. created in TC01) and click &lt;em&gt;Release Overview&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The list of releases are displayed&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click edit icon in the Action column of release version that needs a new attachment. &lt;em&gt;Eg:&lt;/em&gt; release &lt;em&gt;Rel1&lt;/em&gt;.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Edit release &lt;em&gt;Rel1&lt;/em&gt; page is displayed.&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Attachments&lt;/em&gt; tab&lt;br&gt;Click &lt;em&gt;Add Attachment&lt;/em&gt; button&lt;br&gt;Click &lt;em&gt;Browse&lt;/em&gt; and select several attachments.&lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt; 5 attachment files (att1, att2, att3, att4, att5)&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;File names are displayed in the dialog&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Delete&lt;/em&gt; button near some files not to be added.&lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt; delete 2 attachment files (att1, att3)&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;File names are removed from the list&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Upload&lt;/em&gt; button for the remaining files.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The attached file are listed in the &lt;em&gt;Attachment&lt;/em&gt; page: att2, att4, att5&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;6&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Change some &lt;em&gt;Attachment type&lt;/em&gt; to real type, e.g. &lt;em&gt;source file, clearing report, CLI,&amp;hellip;&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Type changed successfully&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;7&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Release &lt;em&gt;Ree1&lt;/em&gt; is updated correctly.&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;8&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Edit Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Success:You are editing the original document.&lt;/em&gt; message is displayed&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;9&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Attachments&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Attachments&lt;/em&gt; page is displayed&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;10&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click delete icon to delete an attachment&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Show message: &lt;em&gt;Do you really want to delete attachment {attachmentName}({attachmentId})?&lt;/em&gt;&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;11&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Delete Attachment button&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Attachment is deleted successfully, data of attachment is removed from attachment table.&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;12&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Release Ree1 is updated correctly with message &lt;em&gt;Success: Release {componentName}({version}) updated successfully!&lt;/em&gt;&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;duplicate-an-existing-release&#34;&gt;Duplicate an existing release&lt;/h2&gt;
+&lt;h2 id=&#34;tc08-duplicate-an-existing-release&#34;&gt;TC08: Duplicate an existing release&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -3007,47 +3126,47 @@ We will add the license text to licenses in the thrift file:&lt;/p&gt;
 &lt;tbody&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;1&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Search for an existing component with release with all fields filled in (e.g. created in TC03) and click &lt;em&gt;Release Overview&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Search for an existing component with release with all fields filled in (Eg: created in TC05) and click &lt;em&gt;Release Overview&lt;/em&gt;&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;The list of releases are displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Duplicate&lt;/em&gt; button under Action column&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The page changes to &lt;em&gt;Release name Edit&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The page changes to create duplicate release screen&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;Check all fields from copied release&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;All fields from &lt;em&gt;Release Summary&lt;/em&gt; and &lt;em&gt;Repository&lt;/em&gt; are unchanged&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;- &lt;em&gt;Summary&lt;/em&gt; tab:&lt;br&gt;  + &lt;em&gt;CPE ID&lt;/em&gt; field: blank&lt;br&gt;  + Remain fields are unchanged (exclude disable fields).&lt;br&gt;- &lt;em&gt;Linked Releases&lt;/em&gt; tab: there is no linked release.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Change the &lt;em&gt;Version&lt;/em&gt; field to a new one, fill in a &lt;em&gt;CPE ID&lt;/em&gt; and click &lt;em&gt;Add Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;You are editing the original document.&lt;/em&gt; message is displayed.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Change the &lt;em&gt;Version&lt;/em&gt; field and fill in a &lt;em&gt;CPE ID&lt;/em&gt;.&lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt;  Version: ver_duplicate&lt;br&gt;       CPE ID: CPE ID_duplicate&lt;br&gt;Click &lt;em&gt;Create Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;- Redirect to edit release screen.&lt;br&gt;- Create duplicate release is success with message: &lt;em&gt;Success:You are editing the original document.&lt;/em&gt;&lt;br&gt;- Data of duplicate release is correct.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Modify some other fields, e.g. &lt;em&gt;Release Date&lt;/em&gt; and click &lt;em&gt;Clearing Details&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Modify some other fields.&lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt; Release Date: 2023-06-12. &lt;br&gt;Click &lt;em&gt;Clearing Details&lt;/em&gt; tab&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Clearing Details&lt;/em&gt; page is displayed and does not contain any field from copied release&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;6&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Release Component updated successfully!&lt;/em&gt; message is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The release is updated successfully with data correctly&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;7&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on component name link on top of the page&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click component name link on top of the page&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;Summary page for the component is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;8&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on _Release Overview&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Release Overview&lt;/em&gt; tab&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;The new copied release is listed among previous releases&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;search-for-and-create-a-new-vendor-for-a-new-release&#34;&gt;Search for and create a new vendor for a new release&lt;/h2&gt;
+&lt;h2 id=&#34;tc09-search-for-and-create-a-new-vendor-for-a-new-release&#34;&gt;TC09: Search for and create a new vendor for a new release&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -3059,52 +3178,57 @@ We will add the license text to licenses in the thrift file:&lt;/p&gt;
 &lt;tbody&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;1&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Search for an existing component and click &lt;em&gt;Edit&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;You are editing the original document&lt;/em&gt; message is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Components&lt;/em&gt; portlet&lt;br&gt;At advanced Search, search for an existing component.&lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt; input &lt;em&gt;Comp1&lt;/em&gt; in the Component Name text box.&lt;br&gt;Click &lt;em&gt;Search&lt;/em&gt; button.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Component &lt;em&gt;Comp1&lt;/em&gt; display in the result table.&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The page changes to &lt;em&gt;New Release Edit&lt;/em&gt; page&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click edit icon in Actions column of component &lt;em&gt;Comp1&lt;/em&gt;.&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Edit screen of component &lt;em&gt;Comp1&lt;/em&gt; is displayed with message:  &lt;em&gt;Success:You are editing the original document&lt;/em&gt;&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Fill in a release &lt;em&gt;Version&lt;/em&gt; and &lt;em&gt;CPE ID&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Releases&lt;/em&gt; tab&lt;br&gt;Click &lt;em&gt;Add Releases&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;The page changes to &lt;em&gt;New Release Edit&lt;/em&gt; page&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Vendor&lt;/em&gt; field&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Search Vendor&lt;/em&gt; dialog is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Fill in a release &lt;em&gt;Version&lt;/em&gt; and &lt;em&gt;CPE ID&lt;/em&gt;&lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt;&lt;br&gt;     + Version: @1.0.2&lt;br&gt;     + CPE ID: moshiano_002&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add New Vendor&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Create New Vendor&lt;/em&gt; dialog is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Vendor&lt;/em&gt; field&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Search Vendor&lt;/em&gt; dialog is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;6&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Fill in &lt;em&gt;Full name&lt;/em&gt;, &lt;em&gt;Short name&lt;/em&gt; and &lt;em&gt;URL&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Vendor&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Create New Vendor&lt;/em&gt; dialog is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;7&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Vendor&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Dialog closes and the new vendor is displayed in release &lt;em&gt;Vendor&lt;/em&gt; field&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Fill in &lt;em&gt;Full name&lt;/em&gt;, &lt;em&gt;Short name&lt;/em&gt; and &lt;em&gt;URL&lt;/em&gt;&lt;br&gt;&lt;em&gt;Eg:&lt;/em&gt;&lt;br&gt;Full Name: Fullvendor_0909&lt;br&gt;Short Name: Short_ven090&lt;br&gt;URL: &lt;a href=&#34;https://github.com/&#34;&gt;https://github.com/&lt;/a&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Values are entered in the fields&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;8&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Release&lt;/em&gt;&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;The page remain the same and the message &lt;em&gt;You are editing the original document.&lt;/em&gt; is displayed&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Add Vendor&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Dialog closes and the new vendor is displayed in release &lt;em&gt;Vendor&lt;/em&gt; field with full name &lt;em&gt;Fullvendor_0909&lt;/em&gt;&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;9&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on component name link on top of the page&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Create Release&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Redirect to edit release page with the message &lt;em&gt;Success:You are editing the original document.&lt;/em&gt; is displayed&lt;/td&gt;
+&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td style=&#34;text-align:right&#34;&gt;10&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click component name link on top of the page&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;Summary page for the component is displayed. The new vendor for the new release, as well as existing vendors from previous releases are listed under &lt;em&gt;Vendors&lt;/em&gt; field for the component&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;link-a-release-to-the-project-in-view-component-page-and-check-used-by-projects&#34;&gt;Link a release to the project in view component page and check used by projects&lt;/h2&gt;
+&lt;h2 id=&#34;tc10-link-a-release-to-the-project-in-view-component-page-and-check-used-by-projects&#34;&gt;TC10: Link a release to the project in view component page and check used by projects&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -3126,27 +3250,27 @@ We will add the license text to licenses in the thrift file:&lt;/p&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Search&lt;/em&gt; button then choose a project to link&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Search&lt;/em&gt; button then choose a project to link&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Link to Project&lt;/em&gt; button on the dialog is enabled&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on _&lt;em&gt;Link to Project&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Link to Project&lt;/em&gt; button&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;The release {component name} ({version}) has been successfully linked to project {project name}&lt;/em&gt;&lt;br&gt;&lt;em&gt;Click &lt;ins&gt;here&lt;ins&gt;&lt;/em&gt; &lt;em&gt;to edit the release relation as well as the project mainline state in the project.&lt;/em&gt; message is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;here&lt;/em&gt; hyperlink in the dialog&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;here&lt;/em&gt; hyperlink in the dialog&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;Redirect to the &lt;em&gt;edit project&lt;/em&gt; page with the release was linked (displayed on  &lt;em&gt;License Clearing&lt;/em&gt; page)&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;6&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Re-open the release at view page and click on &lt;em&gt;Summary&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Re-open the release at view page and click &lt;em&gt;Summary&lt;/em&gt; tab&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;Used by project information is updated correspondingly&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;link-a-release-to-a-project-in-the-view-release-page&#34;&gt;Link a release to a project in the view release page&lt;/h2&gt;
+&lt;h2 id=&#34;tc11-link-a-release-to-a-project-in-the-view-release-page&#34;&gt;TC11: Link a release to a project in the view release page&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -3163,32 +3287,32 @@ We will add the license text to licenses in the thrift file:&lt;/p&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;a release name&lt;/em&gt; hyperlink. Eg: release R1&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;a release name&lt;/em&gt; hyperlink. Eg: release R1&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;Redirect to the &lt;em&gt;view release&lt;/em&gt; page&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Link to Project&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Link to Project&lt;/em&gt; button&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;The dialog &lt;em&gt;Link Release to Project&lt;/em&gt; is displayed with &lt;em&gt;Link to Project&lt;/em&gt; button is disabled&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Search&lt;/em&gt; button then choose a project to link&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Search&lt;/em&gt; button then choose a project to link&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Link to Project&lt;/em&gt; button on the dialog is enabled&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on _&lt;em&gt;Link to Project&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Link to Project&lt;/em&gt; button&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;The release {component name} ({version}) has been successfully linked to project {project name}&lt;/em&gt;&lt;br&gt;&lt;em&gt;Click &lt;ins&gt;here&lt;ins&gt;&lt;/em&gt; &lt;em&gt;to edit the release relation as well as the project mainline state in the project.&lt;/em&gt; message is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;6&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;here&lt;/em&gt; hyperlink in the dialog&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;here&lt;/em&gt; hyperlink in the dialog&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;Redirect to the &lt;em&gt;edit project&lt;/em&gt; page with the release was linked (displayed on  &lt;em&gt;License Clearing&lt;/em&gt; page)&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;import-a-new-component-by-spdxxml-rdf-file&#34;&gt;Import a new component by .spdx/.xml/ .rdf file&lt;/h2&gt;
+&lt;h2 id=&#34;tc12-import-a-new-component-by-spdxxml-rdf-file&#34;&gt;TC12: Import a new component by .spdx/.xml/ .rdf file&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -3200,12 +3324,12 @@ We will add the license text to licenses in the thrift file:&lt;/p&gt;
 &lt;tbody&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;1&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Components&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Components&lt;/em&gt; tab&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Components&lt;/em&gt; page is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Import SBOM&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Import SBOM&lt;/em&gt; button&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;A dialog &lt;em&gt;Upload SBOM&lt;/em&gt; is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
@@ -3215,12 +3339,12 @@ We will add the license text to licenses in the thrift file:&lt;/p&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Import&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Import&lt;/em&gt; button&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;The dialog is closed. New releases and new components are imported successfully&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;export-components-without-releases&#34;&gt;Export components without releases&lt;/h2&gt;
+&lt;h2 id=&#34;tc13-export-components-without-releases&#34;&gt;TC13: Export components without releases&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -3232,17 +3356,17 @@ We will add the license text to licenses in the thrift file:&lt;/p&gt;
 &lt;tbody&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;1&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Components&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Components&lt;/em&gt; tab&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Components&lt;/em&gt; page is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Export Spreadsheet&lt;/em&gt; button and choose &lt;em&gt;Components only&lt;/em&gt; option&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;A new file with name&amp;rsquo;s format &lt;em&gt;components-{yyyy}-{mm}-{dd}.xlsx&lt;/em&gt; is downloaded&lt;br&gt; The content of the downloaded file includes information of all components in the system&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Export Spreadsheet&lt;/em&gt; button and choose &lt;em&gt;Components only&lt;/em&gt; option&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;- A new file with name&amp;rsquo;s format &lt;em&gt;components-{yyyy}-{mm}-{dd}.xlsx&lt;/em&gt; is downloaded&lt;br&gt;- The content of the downloaded file includes information of all components in the system&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;export-components-with-releases&#34;&gt;Export components with releases&lt;/h2&gt;
+&lt;h2 id=&#34;tc14-export-components-with-releases&#34;&gt;TC14: Export components with releases&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -3254,17 +3378,17 @@ We will add the license text to licenses in the thrift file:&lt;/p&gt;
 &lt;tbody&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;1&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Components&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Components&lt;/em&gt; tab&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;&lt;em&gt;Components&lt;/em&gt; page is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;2&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Export Spreadsheet&lt;/em&gt; button and choose &lt;em&gt;Components with releases&lt;/em&gt; option&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;New file with name &lt;em&gt;components-{yyyy}-{mm}-{dd}.xlsx&lt;/em&gt; is downloaded.&lt;br&gt; The content of the downloaded file includes information of all components and releases in the system&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Export Spreadsheet&lt;/em&gt; button and choose &lt;em&gt;Components with releases&lt;/em&gt; option&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;- New file with name &lt;em&gt;components-{yyyy}-{mm}-{dd}.xlsx&lt;/em&gt; is downloaded.&lt;br&gt;- The content of the downloaded file includes information of all components and releases in the system&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
 &lt;/table&gt;
-&lt;h2 id=&#34;create-a-clearing-request-for-a-release&#34;&gt;Create a clearing request for a release&lt;/h2&gt;
+&lt;h2 id=&#34;tc15-create-a-clearing-request-for-a-release&#34;&gt;TC15: Create a clearing request for a release&lt;/h2&gt;
 &lt;table&gt;
 &lt;thead&gt;
 &lt;tr&gt;
@@ -3286,27 +3410,27 @@ We will add the license text to licenses in the thrift file:&lt;/p&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;3&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Attachments&lt;/em&gt; tab, then add a source file (Eg: .rdf file) with &lt;em&gt;Type&lt;/em&gt; is &lt;em&gt;Source file&lt;/em&gt;&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Attachments&lt;/em&gt; tab, then add a source file (Eg: .rdf file) with &lt;em&gt;Type&lt;/em&gt; is &lt;em&gt;Source file&lt;/em&gt;&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;The data is updated correspondingly&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;4&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Update Release&lt;/em&gt; button&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Update Release&lt;/em&gt; button&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;The message &lt;em&gt;Success:Release {release name} updated successfully!&lt;/em&gt; is displayed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;5&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Clearing details&lt;/em&gt; tab, then click on &lt;em&gt;Possology Process&lt;/em&gt; icon beside &lt;em&gt;Clearing State&lt;/em&gt; field and wait for the process to finish&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Clearing details&lt;/em&gt; tab, then click &lt;em&gt;Fossology Process&lt;/em&gt; icon beside &lt;em&gt;Clearing State&lt;/em&gt; field and wait for the process to finish&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;The message &lt;em&gt;The FOSSology process already finished. You should find the resulting report as attachment at this release.&lt;/em&gt; is displayed in the &lt;em&gt;Fossology Process&lt;/em&gt; dialog&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;6&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Click on &lt;em&gt;Close&lt;/em&gt; button in the dialog&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Click &lt;em&gt;Close&lt;/em&gt; button in the dialog&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;The dialog is closed&lt;/td&gt;
 &lt;/tr&gt;
 &lt;tr&gt;
 &lt;td style=&#34;text-align:right&#34;&gt;7&lt;/td&gt;
-&lt;td style=&#34;text-align:left&#34;&gt;Reload this page, then click on &lt;em&gt;Attachments&lt;/em&gt; tab&lt;/td&gt;
+&lt;td style=&#34;text-align:left&#34;&gt;Reload this page, then click &lt;em&gt;Attachments&lt;/em&gt; tab&lt;/td&gt;
 &lt;td style=&#34;text-align:left&#34;&gt;A new file is listed in &lt;em&gt;Attachments&lt;/em&gt; page with name&amp;rsquo;s format &lt;em&gt;{component name}-{version}-{yyyymmdd}-{hhmm}-SPDX.rdf&lt;/em&gt;&lt;/td&gt;
 &lt;/tr&gt;
 &lt;/tbody&gt;
@@ -6960,10 +7084,10 @@ The following example shows some ideas of the REST API. It can be obtained by&lt
 &lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-json&#34; data-lang=&#34;json&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;{
 &lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#309;font-weight:bold&#34;&gt;&amp;#34;access_token&amp;#34;&lt;/span&gt; : &lt;span style=&#34;color:#c30&#34;&gt;&amp;#34;eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOlsic3czNjAtUkVTVC1BUEkiXSwidXNlcl9uYW1lIjoiYWRtaW5Ac3czNjAub3JnIiwic2NvcGUiOlsiUkVBRCJdLCJleHAiOjE1NjM4MDYwNDQsImF1dGhvcml0aWVzIjpbIlJFQUQiXSwianRpIjoiZDY4ZWY1YWEtZTQ5My00Y2YxLWI2NGQtNWE5MTdkY2M2ZTYwIiwiY2xpZW50X2lkIjoiMTcyMmZmYzdkZWE3MTU3OGQ5ZWE1ZTZhNmMwMDA4NzMifQ.iO5sLrqRcZfzvMP5gjaJhk3caWyZLkUesdbMfqCGy4V5rbnU9QP1LjdybY0Udh8hvAvhlpqPfaxeKe1c3-gQs5MYlqG0lNQCyWcb7NRHj8VFlwLPuJRZJNk3tybvgITVm9r14pfAXogpVE0S4KihD2W1_SoKH4NzTa2vOEG0CK4VzCLetxUlUuePxZH8ugouqbS2d0SpyeeMTm-PzxzzeTb_4ulGpg63eE1v7GvTsI23uh2WfIgHBa1GRr5jWtE0Meq-5UFCVQkhMm8P-r8wO2iuRblCu6a-bWwy7bfdj3S2VDnqSQskE2dVrC_qMs-V2AGvCV1xvlF0P8A4tgwL-w&amp;#34;&lt;/span&gt;,
 &lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#309;font-weight:bold&#34;&gt;&amp;#34;token_type&amp;#34;&lt;/span&gt; : &lt;span style=&#34;color:#c30&#34;&gt;&amp;#34;bearer&amp;#34;&lt;/span&gt;,
-&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#309;font-weight:bold&#34;&gt;&amp;#34;refresh_token&amp;#34;&lt;/span&gt; : &lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;&amp;#34;eyJhbGciOiJSUzI&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;NiIsInR&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;5&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;cCI&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;6&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;IkpXVCJ&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;9&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;.eyJhdWQiOlsic&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;3&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;czNjAtUkVTVC&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;BUEkiXSwidXNlcl&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;9&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;uYW&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;lIjoiYWRtaW&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;5&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;Ac&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;3&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;czNjAub&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;3&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;JnIiwic&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;NvcGUiOlsiUkVBRCJdLCJhdGkiOiJkNjhlZjVhYS&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;lNDkzLTRjZjEtYjY&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;0&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;ZC&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;01&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;YTkxN&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;RjYzZlNjAiLCJleHAiOjE&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;NjM&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;4&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;MDYwNDQsImF&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;dGhvcml&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;0&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;aWVzIjpbIlJFQUQiXSwianRpIjoiM&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;VkZDcxODAtMTBlYi&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;00&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;Y&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;MwLTg&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;0&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;NTUtMGYwZmIyMWMwYmU&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;0&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;IiwiY&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;xpZW&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;50&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;X&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;lkIjoiMTcyMmZmYzdkZWE&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;3&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;MTU&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;3&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;OGQ&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;5&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;ZWE&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;ZTZhNmMwMDA&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;4&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;NzMifQ.iMGfdHWpJNseoxIk&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;7&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;tKCNTyC&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;w&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;4&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;_AJ&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;4&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;cSv&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;6&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;kO&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;64&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;_BkF&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;54&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;MLudvyf&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;9&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;uVSIHpAeHhSFdvhbjksynRqq_u&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;78&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;vW&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;8&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;ptY&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;la&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;65&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;Qx&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;8&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;glHz&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;0&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;sktWBfMDJsUA&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;4&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;ynU&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;iZbKU&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;92&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;f&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;OOf&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;3&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;wQRVt&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;38&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;-Y&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;mBUsDMIStyKTDeIXGT&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;3&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;LJr_&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;8&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;k&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;5&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;dRAGvayixaezxDFw&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;3&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;dWK&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;M&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;6&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;P&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;9&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;h-ZnfEP&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;47&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;HpIUZrG&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;8&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;cgwPmNCZ&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;9&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;gBXsqVnueDYZth&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;6&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;TaEKIvWbkZtwY&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;0&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;ikWKyJL&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;xLm&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;78&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;O&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;ii&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;3&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;lA&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;5&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;ENt&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;5&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;I&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;0&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;DTfTm&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;8&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;QuK_zcm&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;679&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;W&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;9&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;jF&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;0&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;jvwIR&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;71&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;fM&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;0&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;JSWjkBoXd&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;h&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;9&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;oLmE&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;CF&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;2&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;sFVaJor_ermk-L&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;0&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;LsA&lt;/span&gt;&lt;span style=&#34;color:#c30&#34;&gt;&amp;#34;,
-&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#c30&#34;&gt;  &amp;#34;&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;expires_in&lt;/span&gt;&lt;span style=&#34;color:#c30&#34;&gt;&amp;#34; : 3599,
-&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#c30&#34;&gt;  &amp;#34;&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;scope&lt;/span&gt;&lt;span style=&#34;color:#c30&#34;&gt;&amp;#34; : &amp;#34;&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;READ&lt;/span&gt;&lt;span style=&#34;color:#c30&#34;&gt;&amp;#34;,
-&lt;/span&gt;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#c30&#34;&gt;  &amp;#34;&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;jti&lt;/span&gt;&lt;span style=&#34;color:#c30&#34;&gt;&amp;#34; : &amp;#34;&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;d&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;68&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;ef&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;5&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;aa-e&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;493-4&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;cf&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;1&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;-b&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;64&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;d&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;-5&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;a&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;917&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;dcc&lt;/span&gt;&lt;span style=&#34;color:#f60&#34;&gt;6e60&lt;/span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;&amp;#34;&lt;/span&gt;
+&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#309;font-weight:bold&#34;&gt;&amp;#34;refresh_token&amp;#34;&lt;/span&gt; : &lt;span style=&#34;color:#c30&#34;&gt;&amp;#34;eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOlsic3czNjAtUkVTVC1BUEkiXSwidXNlcl9uYW1lIjoiYWRtaW5Ac3czNjAub3JnIiwic2NvcGUiOlsiUkVBRCJdLCJhdGkiOiJkNjhlZjVhYS1lNDkzLTRjZjEtYjY0ZC01YTkxN2RjYzZlNjAiLCJleHAiOjE1NjM4MDYwNDQsImF1dGhvcml0aWVzIjpbIlJFQUQiXSwianRpIjoiM2VkZDcxODAtMTBlYi00Y2MwLTg0NTUtMGYwZmIyMWMwYmU0IiwiY2xpZW50X2lkIjoiMTcyMmZmYzdkZWE3MTU3OGQ5ZWE1ZTZhNmMwMDA4NzMifQ.iMGfdHWpJNseoxIk7tKCNTyC1w4_AJ4cSv6kO64_BkF54MLudvyf9uVSIHpAeHhSFdvhbjksynRqq_u78vW8ptY1la65Qx8glHz0sktWBfMDJsUA4ynU2iZbKU92f2OOf3wQRVt38-Y1mBUsDMIStyKTDeIXGT3LJr_8k5dRAGvayixaezxDFw3dWK2M6P9h-ZnfEP47HpIUZrG8cgwPmNCZ9gBXsqVnueDYZth6TaEKIvWbkZtwY0ikWKyJL2xLm78O1ii3lA5ENt5I0DTfTm8QuK_zcm679W9jF0jvwIR71fM0JSWjkBoXd2h9oLmE2CF2sFVaJor_ermk-L0LsA&amp;#34;&lt;/span&gt;,
+&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#309;font-weight:bold&#34;&gt;&amp;#34;expires_in&amp;#34;&lt;/span&gt; : &lt;span style=&#34;color:#f60&#34;&gt;3599&lt;/span&gt;,
+&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#309;font-weight:bold&#34;&gt;&amp;#34;scope&amp;#34;&lt;/span&gt; : &lt;span style=&#34;color:#c30&#34;&gt;&amp;#34;READ&amp;#34;&lt;/span&gt;,
+&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#309;font-weight:bold&#34;&gt;&amp;#34;jti&amp;#34;&lt;/span&gt; : &lt;span style=&#34;color:#c30&#34;&gt;&amp;#34;d68ef5aa-e493-4cf1-b64d-5a917dcc6e60&amp;#34;&lt;/span&gt;
 &lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;}
 &lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;Of course, the username and password must be your user credentials and the client id and secret have to be replaced with the configured values. And again, the wanted value is the value of the field &lt;code&gt;access_token&lt;/code&gt; and probably &lt;code&gt;refresh_token&lt;/code&gt;.&lt;/p&gt;
 &lt;p&gt;More Links:&lt;/p&gt;
@@ -7922,87 +8046,6 @@ Now the “Linked Releases” table could show all dependencies of a project (bo
       </description>
     </item>
     
-    <item>
-      <title>Docs: Docker Deployment</title>
-      <link>https://www.eclipse.org/sw360/docs/deployment/deploy-docker/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://www.eclipse.org/sw360/docs/deployment/deploy-docker/</guid>
-      <description>
-        
-        
-        &lt;h1 id=&#34;a-quick-how-to-for-testing-sw360&#34;&gt;A quick how-to for testing SW360&lt;/h1&gt;
-&lt;h2 id=&#34;requirements&#34;&gt;Requirements&lt;/h2&gt;
-&lt;h3 id=&#34;platform-requirements&#34;&gt;Platform Requirements&lt;/h3&gt;
-&lt;p&gt;As you need Apache Thrift 0.11.0 (see &lt;a href=&#34;https://github.com/eclipse/sw360#required-software&#34;&gt;https://github.com/eclipse/sw360#required-software&lt;/a&gt; ), using the latest Ubuntu LTS (18.04) won&amp;rsquo;t work, so we start on Ubuntu 19.10 if you want to install from packages. As an alternative, consider the following script from the sw360 repository:&lt;/p&gt;
-&lt;p&gt;&lt;a href=&#34;https://github.com/eclipse/sw360/blob/master/scripts/install-thrift.sh&#34;&gt;https://github.com/eclipse/sw360/blob/master/scripts/install-thrift.sh&lt;/a&gt;&lt;/p&gt;
-&lt;p&gt;We&amp;rsquo;ll go the Docker way and follow the instructions of the &lt;a href=&#34;https://github.com/sw360/sw360chores&#34;&gt;sw360chores project&lt;/a&gt;. There is a nice diagram there, explaining the rather complex setup.&lt;/p&gt;
-&lt;h3 id=&#34;sw360chores-requirements&#34;&gt;sw360chores Requirements&lt;/h3&gt;
-&lt;blockquote&gt;
-&lt;p&gt;the perl interpreter to run ./sw360chores.pl&lt;/p&gt;
-&lt;/blockquote&gt;
-&lt;p&gt;You should already have it in your default, even if minimal, installation&lt;/p&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ which perl 
-&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;/usr/bin/perl
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;blockquote&gt;
-&lt;p&gt;git which is used in some prepare scripts&lt;/p&gt;
-&lt;/blockquote&gt;
-&lt;p&gt;&lt;code&gt;sudo apt install git&lt;/code&gt;&lt;/p&gt;
-&lt;blockquote&gt;
-&lt;p&gt;a current version of docker (min 1.30) [https://docs.docker.com/]&lt;/p&gt;
-&lt;/blockquote&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;sudo apt install docker.io
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;blockquote&gt;
-&lt;p&gt;docker-compose (min 1.21) [https://docs.docker.com/compose/install/]&lt;/p&gt;
-&lt;/blockquote&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;sudo apt install docker-compose
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;And you actually also need curl,&lt;/p&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;sudo apt install curl
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;h3 id=&#34;sw360-requirements&#34;&gt;Sw360 Requirements&lt;/h3&gt;
-&lt;p&gt;From the &lt;a href=&#34;https://github.com/eclipse/sw360#required-software&#34;&gt;sw360 Readme&lt;/a&gt;:&lt;/p&gt;
-&lt;blockquote&gt;
-&lt;p&gt;Java 1.8.X&lt;/p&gt;
-&lt;/blockquote&gt;
-&lt;p&gt;And when they say &amp;ldquo;1.8.X&amp;rdquo;, they mean it: it won&amp;rsquo;t work with a later version. So it&amp;rsquo;s better to uninstall the potential other versions of Java (/!\ this is expected to break other things on your environment if you depend on Java for anything), and then install the required version&lt;/p&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt; sudo apt install openjdk-8-jdk openjdk-8-jre
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;blockquote&gt;
-&lt;p&gt;In order to build you will need:&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;A git client&lt;/li&gt;
-&lt;li&gt;Apache Maven 3.6.X&lt;/li&gt;
-&lt;li&gt;Apache Thrift 0.11.0&lt;/li&gt;
-&lt;/ul&gt;
-&lt;/blockquote&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;sudo apt install maven
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;That will install maven Apache Maven 3.6.1 but you need to have installed the correct version (8) of Java &lt;em&gt;before hand&lt;/em&gt; otherwise it will install a too recent one.&lt;/p&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;sudo apt install thrift-compiler
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;That will install Thrift version 0.11.0, if you have not installed thrift using the script above.&lt;/p&gt;
-&lt;h2 id=&#34;cloning-the-repos&#34;&gt;Cloning the repos&lt;/h2&gt;
-&lt;h3 id=&#34;generating-an-ssh-key-pair-for-your-machine&#34;&gt;Generating an ssh key-pair for your machine&lt;/h3&gt;
-&lt;p&gt;If you don&amp;rsquo;t already have one, generate a key pair with no passphrase, in default location:&lt;/p&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;ssh-keygen -t rsa -b 4096 -C &amp;#34;your_email@example.com&amp;#34;
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;Not 100% sure, but not having one may create problems, so&amp;hellip;&lt;/p&gt;
-&lt;h3 id=&#34;cloning-sw360-chores&#34;&gt;Cloning sw360 chores&lt;/h3&gt;
-&lt;p&gt;I created a &lt;code&gt;code&lt;/code&gt; folder at the root of the user&amp;rsquo;s directory, just to make things simple.&lt;/p&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;~$ cd code
-&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;~/code$ git clone https://github.com/sw360/sw360chores.git
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;h3 id=&#34;cloning-eclipsesw360&#34;&gt;Cloning eclipse/sw360&lt;/h3&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;~/code$ git clone https://github.com/eclipse/sw360.git
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;h2 id=&#34;compiling-and-deploying-sw360-code&#34;&gt;Compiling and deploying SW360 Code&lt;/h2&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-go&#34; data-lang=&#34;go&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;~$&lt;/span&gt; cd code&lt;span style=&#34;color:#555&#34;&gt;/&lt;/span&gt;sw360&lt;span style=&#34;color:#555&#34;&gt;/&lt;/span&gt;
-&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;~&lt;/span&gt;&lt;span style=&#34;color:#555&#34;&gt;/&lt;/span&gt;code&lt;span style=&#34;color:#555&#34;&gt;/&lt;/span&gt;sw360&lt;span style=&#34;color:#a00;background-color:#faa&#34;&gt;$&lt;/span&gt; mvn &lt;span style=&#34;color:#069;font-weight:bold&#34;&gt;package&lt;/span&gt; &lt;span style=&#34;color:#555&#34;&gt;-&lt;/span&gt;P deploy &lt;span style=&#34;color:#555&#34;&gt;-&lt;/span&gt;Dbase.deploy.dir=&lt;span style=&#34;color:#555&#34;&gt;/&lt;/span&gt;home&lt;span style=&#34;color:#555&#34;&gt;/&lt;/span&gt;inno3&lt;span style=&#34;color:#555&#34;&gt;/&lt;/span&gt;code&lt;span style=&#34;color:#555&#34;&gt;/&lt;/span&gt;sw360chores&lt;span style=&#34;color:#555&#34;&gt;/&lt;/span&gt;_deploy &lt;span style=&#34;color:#555&#34;&gt;-&lt;/span&gt;DskipTests
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;h2 id=&#34;launching-the-containers&#34;&gt;Launching the containers&lt;/h2&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ cd ~/code/sw360chores/
-&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;~/code/sw360chores$ ./sw360chores.pl --build -- up
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;And yes, there is a space between &lt;code&gt;--&lt;/code&gt; and &lt;code&gt;up&lt;/code&gt;.&lt;/p&gt;
-&lt;p&gt;If everything goes fine, you should see a line like&lt;/p&gt;
-&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;background-color:#f0f3f3;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-fallback&#34; data-lang=&#34;fallback&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;sw360_1                | 15-Jan-2020 12:33:38.480 INFO [main] org.apache.catalina.startup.Catalina.start Server startup in [144,475] milliseconds 
-&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;You should be able to login at &lt;a href=&#34;https://localhost:8443&#34;&gt;https://localhost:8443&lt;/a&gt; with the default credentials &lt;code&gt;setup@sw360.org&lt;/code&gt; and the password &lt;code&gt;sw360fossy&lt;/code&gt; (found &lt;a href=&#34;https://github.com/eclipse/sw360/wiki/Deploy-Liferay#liferay-administrator-steps&#34;&gt;here&lt;/a&gt;).&lt;/p&gt;
-&lt;p&gt;Please go ahead now with the setup of the Liferay - links can be found in the main wiki page.&lt;/p&gt;
-
-      </description>
-    </item>
-    
     <item>
       <title>Docs: Export and Import</title>
       <link>https://www.eclipse.org/sw360/docs/deployment/deploy-export-and-import/</link>
@@ -8420,5 +8463,188 @@ save (on the right)&lt;/p&gt;
       </description>
     </item>
     
+    <item>
+      <title>Docs: Initial Setup of Liferay 7.3 and sw360</title>
+      <link>https://www.eclipse.org/sw360/docs/deployment/legacy/deploy-liferay7.3/</link>
+      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
+      
+      <guid>https://www.eclipse.org/sw360/docs/deployment/legacy/deploy-liferay7.3/</guid>
+      <description>
+        
+        
+        &lt;p&gt;After successful installation, the vagrant ends like the following terminal output:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.07.32.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Then if you open the server with the URL &lt;code&gt;https://localhost:8443/&lt;/code&gt; the following screen should appear:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.09.12.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Note that the actual image changes with every liferay version. If there is weird html output without images and plain text, then likely some port settings did not work and the pages generated have wrong URLs inside.&lt;/p&gt;
+&lt;p&gt;Sign in_the icon_the upper left corner. If you did not change the values in &lt;code&gt;configuration.rb&lt;/code&gt;the default login is &lt;code&gt;setup@sw360.org&lt;/code&gt; and &lt;code&gt;sw360fossy&lt;/code&gt;.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.09.26.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;After login the sw360 is not setup, thus the server does not display much, but a screen like the following:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.09.33.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;h1 id=&#34;user-and-login-settings-in-liferay&#34;&gt;User and Login Settings in Liferay&lt;/h1&gt;
+&lt;p&gt;Go into the control panel area by clicking the items icon (nine small cubes) in the upper right corner and select the control panel tab:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.09.41.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;In this area, go for Security &amp;gt; Password Policies:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.09.53.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Edit this password policy and disable &lt;code&gt;change Required&lt;/code&gt; if you wish to do so. Click on Save_the bottom of the page to save the selection.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.09.59.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Then, go: in &lt;code&gt;Configuration&lt;/code&gt; &amp;gt;  &lt;code&gt;Instance Settings&lt;/code&gt; &amp;gt; &lt;code&gt;Users&lt;/code&gt; &amp;gt;&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.10.17.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;In this area, select &lt;code&gt;Default User Associations&lt;/code&gt; to enter SW360 and apply it also to existing users. Click on Save to save the selection:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.10.30.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Then, in &lt;code&gt;Configuration&lt;/code&gt; &amp;gt;  &lt;code&gt;Instance Settings&lt;/code&gt; &amp;gt; &lt;code&gt;User Authentication&lt;/code&gt; &amp;gt; &lt;code&gt;General&lt;/code&gt; to disable all kind of auto login to make sure only authenticated users can log in. You may want to switch off the e-mail verification, because for most of the development times it will not be of much value.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.10.50.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Finally, sice Liferay 7.3 some of the bundled modules need to be activated:&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;jquery&lt;/li&gt;
+&lt;li&gt;font awesome&lt;/li&gt;
+&lt;/ul&gt;
+&lt;p&gt;In oder to do this, please select from the &lt;code&gt;Configuration&lt;/code&gt; &amp;gt;  &lt;code&gt;System Settings&lt;/code&gt; &amp;gt; &lt;code&gt;Third Party&lt;/code&gt; and go to jquery, select the enablement and click on Update:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.27.08.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Do the same for Font Awesome:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.27.13.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Note that you need to reload the browser or load a new browser window to take changes to effect.&lt;/p&gt;
+&lt;h1 id=&#34;setup-sw360-for-liferay-import-lar-files&#34;&gt;Setup SW360 for Liferay: Import *.lar Files&lt;/h1&gt;
+&lt;p&gt;For the setup of SW360 in Liferay, the portal description files, &lt;code&gt;*.lar&lt;/code&gt; files need not be imported. there is no way except from doing this in the UI. If we are wrong with this, please let us know, because it is very annoying that these ever occurring steps cannot be automated with Liferay.&lt;/p&gt;
+&lt;p&gt;In order to go ahead, switch to the &lt;code&gt;SW360&lt;/code&gt; area where you can apply site settings:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.11.20.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;The go into &amp;gt;  &lt;code&gt;Publishing&lt;/code&gt; &amp;gt; &lt;code&gt;Import&lt;/code&gt; which shows like this:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.11.25.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Then, click on the plus sign in order to import the *.lar file for public pages. You will find the lar files in the &lt;a href=&#34;https://github.com/eclipse/sw360/tree/master/frontend/configuration&#34;&gt;frontend/configuration&lt;/a&gt; folder of the sw360 repository.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.23.15.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;As for import settings, follow the selection as shown on the screenshot. It is very important that for the &lt;code&gt;PublicPages.lar&lt;/code&gt; file the selection &lt;code&gt;Public Pages&lt;/code&gt; is made.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.23.26.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Importing permission makes sure that pages are visible according to users rights. For public pages, it is irrelevant_the moment. Overwriting and the write as current user needs to be selected.&lt;/p&gt;
+&lt;p&gt;After successful importing, the same steps shall be repeated for the &lt;code&gt;PrivatePages.lar&lt;/code&gt; file.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.23.48.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Make sure that &lt;code&gt;Private Pages&lt;/code&gt; is selected. Follow the other selections made as shown on the screenshot &amp;hellip; importing permissions &amp;hellip; mirror with overwriting, use the current author &amp;hellip;&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.23.53.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;If you click then the liferay logo_the upper left corner where the SW360 is, you will return to the application and the following screen should appear:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.24.18.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;You can close the left menu area by clicking on the upper left icon:&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.24.21.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;Click &lt;code&gt;Start&lt;/code&gt; to open the private pages. You are still logged in, so the setup account is used to view the pages.&lt;/p&gt;
+&lt;p&gt;&lt;strong&gt;Important&lt;/strong&gt; The setup account does not belong to a group. Thus, not all view are functional because they require a group membership to work correctly.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.24.31.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;h1 id=&#34;import-user-accounts-for-testing&#34;&gt;Import User Accounts for Testing&lt;/h1&gt;
+&lt;p&gt;Click the SW360 &lt;code&gt;Admin&lt;/code&gt; menu which is_the right and selection the &lt;code&gt;User&lt;/code&gt; item.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.24.48.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;At the bottom of that view, select a User file to import for testing. Skip it if you will create users differently. You can find a &lt;a href=&#34;https://github.com/sw360/sw360vagrant/blob/master/shared/test_users_with_passwords_12345.csv&#34;&gt;user account import file&lt;/a&gt; to import in the &lt;code&gt;sw360vagrant&lt;/code&gt; project in the folder &lt;code&gt;shared&lt;/code&gt;. After the user have been imported successfully, they should appear in the table view.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.24.53.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;After the user have been imported successfully, they should appear in the table view. You can logout for now and use one of the just added accounts (see below):&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.24.58.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;h1 id=&#34;real-login&#34;&gt;Real Login&lt;/h1&gt;
+&lt;p&gt;One example user is &lt;code&gt;user@sw360.org&lt;/code&gt; with the password &lt;code&gt;12345&lt;/code&gt;. Note that in the import file with the example accounts, the passwort is provided with a hash. If you would like to generate new (salted) hashes, you can change your password and export the user list using the same portlet where you have imported the users. This functionality can be also used to migrate accounts between servers.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.25.07.png&#34;/&gt; 
+&lt;/figure&gt;
+
+&lt;p&gt;After the successful login, SW360 will look as follows.&lt;/p&gt;
+
+&lt;figure&gt;
+    &lt;img src=&#34;https://www.eclipse.org/sw360/sw360/img/sw360screenshots/deploy73/2020-08-13_20.27.32.png&#34;/&gt; 
+&lt;/figure&gt;
+
+
+      </description>
+    </item>
+    
   </channel>
 </rss>
diff --git a/docs/userguide/bestpractices/component-naming/index.html b/docs/userguide/bestpractices/component-naming/index.html
index 91fbc7c..126c1cb 100644
--- a/docs/userguide/bestpractices/component-naming/index.html
+++ b/docs/userguide/bestpractices/component-naming/index.html
@@ -306,6 +306,10 @@ Usage and Handling of Components If you create a component entry, most likely yo
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -313,7 +317,22 @@ Usage and Handling of Components If you create a component entry, most likely yo
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -325,29 +344,10 @@ Usage and Handling of Components If you create a component entry, most likely yo
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -366,10 +366,6 @@ Usage and Handling of Components If you create a component entry, most likely yo
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -382,6 +378,10 @@ Usage and Handling of Components If you create a component entry, most likely yo
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -746,24 +746,24 @@ Moment.js – consider this name.</p>
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/userguide/bestpractices/good-record-creation-structure/index.html b/docs/userguide/bestpractices/good-record-creation-structure/index.html
index 025d9a2..003f20e 100644
--- a/docs/userguide/bestpractices/good-record-creation-structure/index.html
+++ b/docs/userguide/bestpractices/good-record-creation-structure/index.html
@@ -306,6 +306,10 @@ What is the name of the vendor, the name of the component and what is the releas
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -313,7 +317,22 @@ What is the name of the vendor, the name of the component and what is the releas
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -325,29 +344,10 @@ What is the name of the vendor, the name of the component and what is the releas
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -366,10 +366,6 @@ What is the name of the vendor, the name of the component and what is the releas
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -382,6 +378,10 @@ What is the name of the vendor, the name of the component and what is the releas
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -815,24 +815,24 @@ What is the name of the vendor, the name of the component and what is the releas
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/userguide/bestpractices/index.html b/docs/userguide/bestpractices/index.html
index a0a5764..8c7d786 100644
--- a/docs/userguide/bestpractices/index.html
+++ b/docs/userguide/bestpractices/index.html
@@ -301,6 +301,10 @@ If you create a component entry, most …">
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -308,7 +312,22 @@ If you create a component entry, most …">
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -320,29 +339,10 @@ If you create a component entry, most …">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -361,10 +361,6 @@ If you create a component entry, most …">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -377,6 +373,10 @@ If you create a component entry, most …">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -811,24 +811,24 @@ If you create a component entry, most …">
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/userguide/bestpractices/license-naming/index.html b/docs/userguide/bestpractices/license-naming/index.html
index c00bb0b..b1831c8 100644
--- a/docs/userguide/bestpractices/license-naming/index.html
+++ b/docs/userguide/bestpractices/license-naming/index.html
@@ -313,6 +313,10 @@ License or Exception Identifier (aka &ldquo;SPDX Short Identifier&rdquo;) Short
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -320,7 +324,22 @@ License or Exception Identifier (aka &ldquo;SPDX Short Identifier&rdquo;) Short
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -332,29 +351,10 @@ License or Exception Identifier (aka &ldquo;SPDX Short Identifier&rdquo;) Short
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -373,10 +373,6 @@ License or Exception Identifier (aka &ldquo;SPDX Short Identifier&rdquo;) Short
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -389,6 +385,10 @@ License or Exception Identifier (aka &ldquo;SPDX Short Identifier&rdquo;) Short
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -846,24 +846,24 @@ License or Exception Identifier (aka &ldquo;SPDX Short Identifier&rdquo;) Short
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/userguide/bestpractices/user-attachment-file-types/index.html b/docs/userguide/bestpractices/user-attachment-file-types/index.html
index d416ca8..d052d3b 100644
--- a/docs/userguide/bestpractices/user-attachment-file-types/index.html
+++ b/docs/userguide/bestpractices/user-attachment-file-types/index.html
@@ -308,6 +308,10 @@ In summary, the following the types currently are as follows:"/>
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -315,7 +319,22 @@ In summary, the following the types currently are as follows:"/>
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -327,29 +346,10 @@ In summary, the following the types currently are as follows:"/>
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -368,10 +368,6 @@ In summary, the following the types currently are as follows:"/>
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -384,6 +380,10 @@ In summary, the following the types currently are as follows:"/>
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -736,24 +736,24 @@ In summary, the following the types currently are as follows:"/>
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/userguide/bestpractices/workflows/index.html b/docs/userguide/bestpractices/workflows/index.html
index a09dc32..40badc6 100644
--- a/docs/userguide/bestpractices/workflows/index.html
+++ b/docs/userguide/bestpractices/workflows/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -696,24 +696,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/userguide/components/index.html b/docs/userguide/components/index.html
index 77a7f8e..bb06a18 100644
--- a/docs/userguide/components/index.html
+++ b/docs/userguide/components/index.html
@@ -310,6 +310,10 @@ Sl.No. Description 1 Advanced Search 2 Add Component 3 Import SPDX BOM 4 Export
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -317,7 +321,22 @@ Sl.No. Description 1 Advanced Search 2 Add Component 3 Import SPDX BOM 4 Export
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -329,29 +348,10 @@ Sl.No. Description 1 Advanced Search 2 Add Component 3 Import SPDX BOM 4 Export
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -370,10 +370,6 @@ Sl.No. Description 1 Advanced Search 2 Add Component 3 Import SPDX BOM 4 Export
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -386,6 +382,10 @@ Sl.No. Description 1 Advanced Search 2 Add Component 3 Import SPDX BOM 4 Export
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -1099,24 +1099,24 @@ from the actions column, this will redirect you to a release view page where you
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/userguide/dependency_network/index.html b/docs/userguide/dependency_network/index.html
index 5c3ed3e..bf4c9ca 100644
--- a/docs/userguide/dependency_network/index.html
+++ b/docs/userguide/dependency_network/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -792,24 +792,24 @@ Now the “Linked Releases” table could show all dependencies of a project (bo
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/userguide/faq/index.html b/docs/userguide/faq/index.html
index 8ce1358..042ef64 100644
--- a/docs/userguide/faq/index.html
+++ b/docs/userguide/faq/index.html
@@ -306,6 +306,10 @@ Q: Who should be listed as Contributor? A: By default only the owner (or creator
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -313,7 +317,22 @@ Q: Who should be listed as Contributor? A: By default only the owner (or creator
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -325,29 +344,10 @@ Q: Who should be listed as Contributor? A: By default only the owner (or creator
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -366,10 +366,6 @@ Q: Who should be listed as Contributor? A: By default only the owner (or creator
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -382,6 +378,10 @@ Q: Who should be listed as Contributor? A: By default only the owner (or creator
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -692,24 +692,24 @@ Q: Who should be listed as Contributor? A: By default only the owner (or creator
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/userguide/index.html b/docs/userguide/index.html
index 529ce21..05111c4 100644
--- a/docs/userguide/index.html
+++ b/docs/userguide/index.html
@@ -298,6 +298,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -305,7 +309,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -317,29 +336,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -358,10 +358,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -374,6 +370,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -855,24 +855,24 @@ COTS license obligations must be analyzed individually for every commercial cont
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/userguide/licenses/index.html b/docs/userguide/licenses/index.html
index 5ad2169..97bd8fb 100644
--- a/docs/userguide/licenses/index.html
+++ b/docs/userguide/licenses/index.html
@@ -310,6 +310,10 @@ Sl.No. Description 1 Quick Filter 2 Add License 3 Export Spreadsheet, refer to P
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -317,7 +321,22 @@ Sl.No. Description 1 Quick Filter 2 Add License 3 Export Spreadsheet, refer to P
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -329,29 +348,10 @@ Sl.No. Description 1 Quick Filter 2 Add License 3 Export Spreadsheet, refer to P
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -370,10 +370,6 @@ Sl.No. Description 1 Quick Filter 2 Add License 3 Export Spreadsheet, refer to P
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -386,6 +382,10 @@ Sl.No. Description 1 Quick Filter 2 Add License 3 Export Spreadsheet, refer to P
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -801,24 +801,24 @@ where you can add License details.</p>
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/userguide/login/index.html b/docs/userguide/login/index.html
index 6110ada..21ad911 100644
--- a/docs/userguide/login/index.html
+++ b/docs/userguide/login/index.html
@@ -305,6 +305,10 @@ You will see a &ldquo;Welcome to SW360!&rdquo; homepage which is a public area w
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -312,7 +316,22 @@ You will see a &ldquo;Welcome to SW360!&rdquo; homepage which is a public area w
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -324,29 +343,10 @@ You will see a &ldquo;Welcome to SW360!&rdquo; homepage which is a public area w
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -365,10 +365,6 @@ You will see a &ldquo;Welcome to SW360!&rdquo; homepage which is a public area w
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -381,6 +377,10 @@ You will see a &ldquo;Welcome to SW360!&rdquo; homepage which is a public area w
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -647,24 +647,24 @@ The Sign In button will redirect to the private area in order to work with the p
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/userguide/preferrences/index.html b/docs/userguide/preferrences/index.html
index 71cedb0..67b7c45 100644
--- a/docs/userguide/preferrences/index.html
+++ b/docs/userguide/preferrences/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -693,24 +693,24 @@ To open the Preferences page, click on the <strong>Preference</strong> tab from
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/userguide/project/index.html b/docs/userguide/project/index.html
index ee0c6f1..8b6d74b 100644
--- a/docs/userguide/project/index.html
+++ b/docs/userguide/project/index.html
@@ -307,6 +307,10 @@ Sl.No. Description 1 Advanced Search 2 Add Project 3 Import SPDX BOM 4 Export Sp
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -314,7 +318,22 @@ Sl.No. Description 1 Advanced Search 2 Add Project 3 Import SPDX BOM 4 Export Sp
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -326,29 +345,10 @@ Sl.No. Description 1 Advanced Search 2 Add Project 3 Import SPDX BOM 4 Export Sp
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -367,10 +367,6 @@ Sl.No. Description 1 Advanced Search 2 Add Project 3 Import SPDX BOM 4 Export Sp
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -383,6 +379,10 @@ Sl.No. Description 1 Advanced Search 2 Add Project 3 Import SPDX BOM 4 Export Sp
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -1723,24 +1723,24 @@ Generating a license info will create a read me OSS document combining all the l
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/userguide/requests/index.html b/docs/userguide/requests/index.html
index 91dc923..6cf3ddf 100644
--- a/docs/userguide/requests/index.html
+++ b/docs/userguide/requests/index.html
@@ -308,6 +308,10 @@ Moderation Requests: The requests that are created when a user with limited righ
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -315,7 +319,22 @@ Moderation Requests: The requests that are created when a user with limited righ
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -327,29 +346,10 @@ Moderation Requests: The requests that are created when a user with limited righ
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -368,10 +368,6 @@ Moderation Requests: The requests that are created when a user with limited righ
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -384,6 +380,10 @@ Moderation Requests: The requests that are created when a user with limited righ
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -895,24 +895,24 @@ Moderation requests are further categorized into two types:</p>
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/userguide/search/index.html b/docs/userguide/search/index.html
index a874ca0..6e6ad42 100644
--- a/docs/userguide/search/index.html
+++ b/docs/userguide/search/index.html
@@ -311,6 +311,10 @@ Type the keyword in the text field. The checkbox in Restrict To Type allows you
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -318,7 +322,22 @@ Type the keyword in the text field. The checkbox in Restrict To Type allows you
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -330,29 +349,10 @@ Type the keyword in the text field. The checkbox in Restrict To Type allows you
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -371,10 +371,6 @@ Type the keyword in the text field. The checkbox in Restrict To Type allows you
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -387,6 +383,10 @@ Type the keyword in the text field. The checkbox in Restrict To Type allows you
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -650,24 +650,24 @@ Type the keyword in the text field. The checkbox in Restrict To Type allows you
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/userguide/spdx_document/index.html b/docs/userguide/spdx_document/index.html
index 44d540b..4e7e2bc 100644
--- a/docs/userguide/spdx_document/index.html
+++ b/docs/userguide/spdx_document/index.html
@@ -302,6 +302,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -309,7 +313,22 @@
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -321,29 +340,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -362,10 +362,6 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -378,6 +374,10 @@
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -719,24 +719,24 @@
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/docs/userguide/sw360-homepage/index.html b/docs/userguide/sw360-homepage/index.html
index fa0cd54..1731977 100644
--- a/docs/userguide/sw360-homepage/index.html
+++ b/docs/userguide/sw360-homepage/index.html
@@ -306,6 +306,10 @@ Sl.No Name Description 1 Main Menu Main menu consists primarily of the various t
   <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"/>
   <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_16_to_17"><span class="">Upgrade SW360 from 16.0 to 17.0</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"/>
+  <label for="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18-check"><a href="/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/" title="Upgrade SW360 from 17.00 to 18.1.0" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentupgradingupgrade_version_sw360_17_to_18"><span class="">Upgrade SW360 from 17.0 to 18.1.0</span></a></label>
+  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacy-li">
@@ -313,7 +317,22 @@ Sl.No Name Description 1 Main Menu Main menu consists primarily of the various t
   <label for="m-sw360docsdeploymentlegacy-check"><a href="/sw360/docs/deployment/legacy/" title="Legacy Deployment Guides" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacy"><span class="">Legacy Guides</span></a></label>
   
   <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentlegacynativeinstall-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstall-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstall-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentlegacynativeinstall"><span class="">Native Install</span></a></label>
+  
+  <ul class="ul-4 foldable">
+    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
+  
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-li">
+  <input type="checkbox" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"/>
+  <label for="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacynativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
+  
+</li>
+  </ul>
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay"><span class="">Initial Setup of Liferay 6.2 and sw360</span></a></label>
   
@@ -325,29 +344,10 @@ Sl.No Name Description 1 Main Menu Main menu consists primarily of the various t
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay73-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-liferay73-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.3/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay73"><span class="">Initial Setup of Liferay 7.3 and sw360</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-liferay74-li">
-  <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-liferay74-check"/>
-  <label for="m-sw360docsdeploymentlegacydeploy-liferay74-check"><a href="/sw360/docs/deployment/legacy/deploy-liferay7.4/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-liferay74"><span class="">Initial Setup of Liferay 7.4 and sw360</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentlegacydeploy-natively-11-li">
   <input type="checkbox" id="m-sw360docsdeploymentlegacydeploy-natively-11-check"/>
   <label for="m-sw360docsdeploymentlegacydeploy-natively-11-check"><a href="/sw360/docs/deployment/legacy/deploy-natively-11/" title="Ubuntu 18.04 LTS, Java 11" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentlegacydeploy-natively-11"><span class="">Ubuntu 18.04 and Java 11</span></a></label>
   
-</li>
-  </ul>
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section with-child" id="m-sw360docsdeploymentnativeinstall-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstall-check"/>
-  <label for="m-sw360docsdeploymentnativeinstall-check"><a href="/sw360/docs/deployment/nativeinstall/" class="align-left pl-0  td-sidebar-link td-sidebar-link__section" id="m-sw360docsdeploymentnativeinstall"><span class="">Native Install</span></a></label>
-  
-  <ul class="ul-3 foldable">
-    <li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/" title="Native Install v14 and v16" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1400-and-1600"><span class="">Native-Install v14 and v16</span></a></label>
-  
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-li">
-  <input type="checkbox" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"/>
-  <label for="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700-check"><a href="/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/" title="Native Install v17" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentnativeinstallnative-install-sw360-version-1700"><span class="">Native-Install v17</span></a></label>
-  
 </li>
   </ul>
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-authorization-concept-li">
@@ -366,10 +366,6 @@ Sl.No Name Description 1 Main Menu Main menu consists primarily of the various t
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-cve-search-check"/>
   <label for="m-sw360docsdeploymentdeploy-cve-search-check"><a href="/sw360/docs/deployment/deploy-cve-search/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-cve-search"><span class="">CVE Scheduler</span></a></label>
   
-</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-docker-li">
-  <input type="checkbox" id="m-sw360docsdeploymentdeploy-docker-check"/>
-  <label for="m-sw360docsdeploymentdeploy-docker-check"><a href="/sw360/docs/deployment/deploy-docker/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-docker"><span class="">Docker Deployment</span></a></label>
-  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-export-and-import-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-export-and-import-check"/>
   <label for="m-sw360docsdeploymentdeploy-export-and-import-check"><a href="/sw360/docs/deployment/deploy-export-and-import/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-export-and-import"><span class="">Export and Import</span></a></label>
@@ -382,6 +378,10 @@ Sl.No Name Description 1 Main Menu Main menu consists primarily of the various t
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-specialdeployment-check"/>
   <label for="m-sw360docsdeploymentdeploy-specialdeployment-check"><a href="/sw360/docs/deployment/deploy-specialdeployment/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-specialdeployment"><span class="">Special Deployment Guides</span></a></label>
   
+</li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-initial-setup18-li">
+  <input type="checkbox" id="m-sw360docsdeploymentdeploy-initial-setup18-check"/>
+  <label for="m-sw360docsdeploymentdeploy-initial-setup18-check"><a href="/sw360/docs/deployment/deploy-initial-setup18/" title="SW360 18.x.x Series Initial Setup" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-initial-setup18"><span class="">sw360_18_series</span></a></label>
+  
 </li><li class="td-sidebar-nav__section-title td-sidebar-nav__section without-child" id="m-sw360docsdeploymentdeploy-requirements-li">
   <input type="checkbox" id="m-sw360docsdeploymentdeploy-requirements-check"/>
   <label for="m-sw360docsdeploymentdeploy-requirements-check"><a href="/sw360/docs/deployment/deploy-requirements/" class="align-left pl-0  td-sidebar-link td-sidebar-link__page" id="m-sw360docsdeploymentdeploy-requirements"><span class="">System Requirements</span></a></label>
@@ -701,24 +701,24 @@ Sl.No Name Description 1 Main Menu Main menu consists primarily of the various t
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/img/clients/Cariad.png b/img/clients/Cariad.png
new file mode 100644
index 0000000..1b57fbe
Binary files /dev/null and b/img/clients/Cariad.png differ
diff --git a/img/clients/Toshiba.png b/img/clients/Toshiba.png
new file mode 100644
index 0000000..e12d7e5
Binary files /dev/null and b/img/clients/Toshiba.png differ
diff --git a/img/sw360screenshots/deploy74/26.png b/img/sw360screenshots/deploy74/26.png
new file mode 100644
index 0000000..1dc76a0
Binary files /dev/null and b/img/sw360screenshots/deploy74/26.png differ
diff --git a/index.html b/index.html
index 99256a7..4241908 100644
--- a/index.html
+++ b/index.html
@@ -349,24 +349,24 @@ Enable easy onboarding of
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/presentations/index.html b/presentations/index.html
index fdb1c98..b0582bd 100644
--- a/presentations/index.html
+++ b/presentations/index.html
@@ -276,24 +276,24 @@ Using SW360 for OSS Compliance Management Process</a>&rdquo; Kouki Hama , Toshib
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/screenshots/index.html b/screenshots/index.html
index 1dbfa91..ee435c8 100644
--- a/screenshots/index.html
+++ b/screenshots/index.html
@@ -375,24 +375,24 @@ For each project, a number of attributes can be maintained, most notably externa
               width="100"
               alt="Siemens"
           /></a>
-          <a href="https://www.bosch-si.com/">
+          <a href="https://www.global.toshiba/ww/top.html">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/BoschSI.png"
+              src="https://www.eclipse.org/sw360//img/clients/Toshiba.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="120"
+              alt="Toshiba"
           /></a>
-          <a href="https://verifa.io/">
+          <a href="https://cariad.technology">
             <img
-              src="https://www.eclipse.org/sw360//img/clients/Verifa.png"
+              src="https://www.eclipse.org/sw360//img/clients/Cariad.png"
               class="footer-img"
-              width="100"
-              alt="Bosch Software Innovation"
+              width="140"
+              alt="Cariad"
           /></a>
         </p>
 
         
-        <small>&copy; 2023 The Eclipse Foundation All Rights Reserved</small>
+        <small>&copy; 2024 The Eclipse Foundation All Rights Reserved</small>
          
         <div style="margin-top: 10px"><a href="http://www.eclipse.org/">
           <img
diff --git a/sitemap.xml b/sitemap.xml
index 5ad40e6..b28ff65 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -54,7 +54,7 @@
     <lastmod>2022-06-28T20:46:15+02:00</lastmod>
   </url><url>
     <loc>https://www.eclipse.org/sw360/docs/development/testcases/test-cases-components/</loc>
-    <lastmod>2023-09-18T10:02:24+07:00</lastmod>
+    <lastmod>2024-03-01T14:13:57+07:00</lastmod>
   </url><url>
     <loc>https://www.eclipse.org/sw360/docs/development/dev-external-documents-with-couchdb/</loc>
     <lastmod>2022-06-28T20:46:15+02:00</lastmod>
@@ -126,13 +126,13 @@
     <lastmod>2022-06-28T22:06:55+02:00</lastmod>
   </url><url>
     <loc>https://www.eclipse.org/sw360/docs/deployment/</loc>
-    <lastmod>2022-06-28T20:23:29+02:00</lastmod>
+    <lastmod>2024-04-09T18:22:28+02:00</lastmod>
   </url><url>
     <loc>https://www.eclipse.org/sw360/docs/deployment/legacy/</loc>
     <lastmod>2022-06-28T18:31:48+02:00</lastmod>
   </url><url>
-    <loc>https://www.eclipse.org/sw360/docs/deployment/nativeinstall/</loc>
-    <lastmod>2023-01-05T09:51:35+07:00</lastmod>
+    <loc>https://www.eclipse.org/sw360/docs/deployment/legacy/nativeinstall/</loc>
+    <lastmod>2024-04-09T18:22:28+02:00</lastmod>
   </url><url>
     <loc>https://www.eclipse.org/sw360/docs/userguide/bestpractices/workflows/</loc>
     <lastmod>2023-03-29T01:57:54-07:00</lastmod>
@@ -169,9 +169,6 @@
   </url><url>
     <loc>https://www.eclipse.org/sw360/docs/userguide/dependency_network/</loc>
     <lastmod>2023-09-15T15:01:02+07:00</lastmod>
-  </url><url>
-    <loc>https://www.eclipse.org/sw360/docs/deployment/deploy-docker/</loc>
-    <lastmod>2022-06-22T22:10:18+02:00</lastmod>
   </url><url>
     <loc>https://www.eclipse.org/sw360/docs/deployment/deploy-export-and-import/</loc>
     <lastmod>2022-06-22T22:10:18+02:00</lastmod>
@@ -184,27 +181,27 @@
   </url><url>
     <loc>https://www.eclipse.org/sw360/docs/deployment/legacy/deploy-liferay7.3/</loc>
     <lastmod>2022-07-08T12:18:26+02:00</lastmod>
-  </url><url>
-    <loc>https://www.eclipse.org/sw360/docs/deployment/legacy/deploy-liferay7.4/</loc>
-    <lastmod>2023-01-13T17:23:07+07:00</lastmod>
   </url><url>
     <loc>https://www.eclipse.org/sw360/docs/deployment/upgrading/deploy-upgrade-to-liferay-7.3-and-java-11/</loc>
     <lastmod>2022-06-22T22:10:18+02:00</lastmod>
   </url><url>
-    <loc>https://www.eclipse.org/sw360/docs/deployment/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/</loc>
-    <lastmod>2022-12-22T10:56:05+07:00</lastmod>
+    <loc>https://www.eclipse.org/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/</loc>
+    <lastmod>2024-04-09T18:22:28+02:00</lastmod>
   </url><url>
-    <loc>https://www.eclipse.org/sw360/docs/deployment/nativeinstall/native-install-sw360-version-17.0.0/</loc>
-    <lastmod>2023-06-22T11:25:27+07:00</lastmod>
+    <loc>https://www.eclipse.org/sw360/docs/deployment/legacy/nativeinstall/native-install-sw360-version-17.0.0/</loc>
+    <lastmod>2024-04-09T18:22:28+02:00</lastmod>
   </url><url>
     <loc>https://www.eclipse.org/sw360/docs/deployment/deploy-secure-deployment/</loc>
-    <lastmod>2022-06-22T22:10:18+02:00</lastmod>
+    <lastmod>2024-04-09T18:22:28+02:00</lastmod>
   </url><url>
     <loc>https://www.eclipse.org/sw360/docs/userguide/spdx_document/</loc>
     <lastmod>2023-10-03T14:42:00+02:00</lastmod>
   </url><url>
     <loc>https://www.eclipse.org/sw360/docs/deployment/deploy-specialdeployment/</loc>
     <lastmod>2022-06-28T18:31:48+02:00</lastmod>
+  </url><url>
+    <loc>https://www.eclipse.org/sw360/docs/deployment/deploy-initial-setup18/</loc>
+    <lastmod>2024-04-09T18:22:28+02:00</lastmod>
   </url><url>
     <loc>https://www.eclipse.org/sw360/docs/deployment/deploy-requirements/</loc>
     <lastmod>2022-06-22T22:10:18+02:00</lastmod>
@@ -213,7 +210,7 @@
     <lastmod>2022-11-24T16:37:26+01:00</lastmod>
   </url><url>
     <loc>https://www.eclipse.org/sw360/docs/deployment/baremetal/deploy-natively/</loc>
-    <lastmod>2022-11-24T16:37:26+01:00</lastmod>
+    <lastmod>2024-04-09T18:22:28+02:00</lastmod>
   </url><url>
     <loc>https://www.eclipse.org/sw360/docs/deployment/upgrading/upgrade-sw360-from-14.0.0-to-15.0.0/</loc>
     <lastmod>2022-07-07T09:02:59+07:00</lastmod>
@@ -223,6 +220,9 @@
   </url><url>
     <loc>https://www.eclipse.org/sw360/docs/deployment/upgrading/upgrade_version_sw360_16_to_17/</loc>
     <lastmod>2023-07-19T11:47:56+02:00</lastmod>
+  </url><url>
+    <loc>https://www.eclipse.org/sw360/docs/deployment/upgrading/upgrade_version_sw360_17_to_18/</loc>
+    <lastmod>2024-02-28T09:35:24+07:00</lastmod>
   </url><url>
     <loc>https://www.eclipse.org/sw360/docs/administrationguide/vulnerabilitymanagement/vulnerabilities/</loc>
     <lastmod>2023-03-29T03:48:06-07:00</lastmod>
+ echo 'Changes have been detected, publishing to repo '\''www.eclipse.org/sw360'\'''
Changes have been detected, publishing to repo 'www.eclipse.org/sw360'
+ git config user.email sw360-bot@eclipse.org
+ git config user.name 'SW360 Bot'
+ git commit -m 'Website build sw360.website-169'
[main 68f4ee7] Website build sw360.website-169
 97 files changed, 4456 insertions(+), 3905 deletions(-)
 rename docs/deployment/{legacy/deploy-liferay7.4 => deploy-initial-setup18}/index.html (90%)
 rename docs/deployment/{ => legacy}/nativeinstall/index.html (91%)
 rename docs/deployment/{ => legacy}/nativeinstall/index.xml (99%)
 rename docs/deployment/{ => legacy}/nativeinstall/native-install-sw360-version-14.0.0-and-16.0.0/index.html (96%)
 rename docs/deployment/{ => legacy}/nativeinstall/native-install-sw360-version-17.0.0/index.html (95%)
 rename docs/deployment/{deploy-docker => upgrading/upgrade_version_sw360_17_to_18}/index.html (78%)
 create mode 100644 img/clients/Cariad.png
 create mode 100644 img/clients/Toshiba.png
 create mode 100644 img/sw360screenshots/deploy74/26.png
+ git log --graph --abbrev-commit --date=relative -n 5
* commit 68f4ee7
| Author: SW360 Bot <sw360-bot@eclipse.org>
| Date:   1 second ago
| 
|     Website build sw360.website-169
| 
* commit d7e65f9
| Author: SW360 Bot <sw360-bot@eclipse.org>
| Date:   3 months ago
| 
|     Website build sw360.website-165
| 
* commit e2b6017
| Author: SW360 Bot <sw360-bot@eclipse.org>
| Date:   4 months ago
| 
|     Website build sw360.website-162
| 
* commit d81c5a1
| Author: SW360 Bot <sw360-bot@eclipse.org>
| Date:   6 months ago
| 
|     Website build sw360.website-161
| 
* commit d514d3e
| Author: SW360 Bot <sw360-bot@eclipse.org>
| Date:   7 months ago
| 
|     Website build sw360.website-160
+ git push origin HEAD:main
To github.com:eclipse-sw360/sw360.website.published.git
   d7e65f9..68f4ee7  HEAD -> main
[Pipeline] }
$ ssh-agent -k
unset SSH_AUTH_SOCK;
unset SSH_AGENT_PID;
echo Agent pid 189 killed;
[ssh-agent] Stopped.
[Pipeline] // sshagent
[Pipeline] }
[Pipeline] // dir
[Pipeline] }
[Pipeline] // stage
[Pipeline] }
[Pipeline] // withEnv
[Pipeline] }
[Pipeline] // withEnv
[Pipeline] }
[Pipeline] // node
[Pipeline] }
[Pipeline] // podTemplate
[Pipeline] End of Pipeline
Finished: SUCCESS