diff --git a/docs/assets/images/DD-Architecture.drawio b/docs/assets/images/DD-Architecture.drawio
deleted file mode 100644
index d7adcfb2153..00000000000
--- a/docs/assets/images/DD-Architecture.drawio
+++ /dev/null
@@ -1 +0,0 @@
-7Vtbc9o6EP41PJZBvgGPARKaaZLmJJmT9FHYwig1FpVlLv31R7Llq7gYysU9Q8hM0EqW5G+/lXZXSkPvT5dDCmeTR+Igr6G1nGVDHzQ0DRia1hC/LWcVSzqWHgtcih3ZKBO84t9ICltSGmIHBYWGjBCP4VlRaBPfRzYryCClZFFsNiZecdQZdJEieLWhp0rfscMmUgqsblbxFWF3IofuaO24YgqTxvJNggl0yCIn0m8bep8SwuJv02UfeQK8BJf4ubsNtenEKPJZlQd+Db7ffx1M6bfpYAjmd2/hJ11+kZOdQy+UL9zQLI/31xuJKbOVxMH6FYp59sbEZ1+CSEs3vAEfn2u6l9Xzb674O0Bjro0B+SRJf3xio6RWApL2rlES+g4SEwW8ejHBDL3OoC1qF5xXXDZhU09WQ2pLnhhiRtjz+sQjNOpJH5viI2cqm3Fg+FMedn1eoLGuenNEGeZ6vpFyRsQwAR8V+y4vm1npRao36TY3XPwjmjJKfqJcTS/6pC+b15NUnZgBWuZEUm9DRKaI0RVvktQmHFqVyouMku1ENsmx0UiEUJqBm/adMYV/kWTZgzhAIc7T8P7p4880m9MZsI4EnVWCzlKhA+ugs06GnKGAhBy+5sgioWxCXOJD7zaT9jIYBZezNg9E0DYC7xMxtpLowZCRIrRoidlH7vsP0VXTlKXBUvYcFVZJwefv+5E1FMUf+brssaiUPFdZjQEJqY22YCU3Dwapi9g2TOWmIoDcygqKPMjwvLi4H13FmmIc4fvr8L52xqHXzjh0BbkBZHAEA1R78Azj0uAZCnj8KRTN+Z3Qn4jWDkOztLHpF8fQ3IxhD0FWOwStTt0QtBQEFdBgMIt99TFeCux6M4J9hujtnAMRSLBSf1lsKQ4MJun2l0O06Hb5xBebpQdHyHsmAWaYCNfORqLznM/3UGowIoyR6UanMHEd03741GbiVaZLV0Q9Tfg7pKgZBlFlWcklB9UYiM9xlK91raLyVd0bbVX15qlU39mteuQ7NyIsy7S1xknJHJPU3djipDh3WEwzKgXcVWDJALYHgwDbiVg2W2eI+zpgmzwjsMMzOtwTAhUdnJzqzTVWn8gq+0FyhGdhoDnitUurTqtEqfh95FP5oLTUkQ66zW7+p+iPlMOX2BFUuo3ImoJwOH+7V/6eir9avfirlxzf9v+Cv0CNyrcROOPX0TgMqnP4UA4eL7qUwcbO6LJe3DWOxt1yR/qZ2aqGyQezdZ+0RmV+Okdg674r8/nZbdSM3e2maeYWVLPAUU3rNM3D6F5e8w1wZrqbKrvPl/crLudgq4FcPu8Hjk3e8+T9gJq+eoGjEWaP/yi6v3TioJx60S6eOACdixrIIYlxUDCPzFpObiDmpexj/dpqdkvxYHltrbpIKx2VcxWnXqTVEPB6rlXx0KOlQHc99agInRq3XfeN6uipccTVZitCpzosV5utCJ162vaIgkBcJ0pu0NDkvktPHFLQ2oFaQ1O+Hr/9MYQVzt92ZlU25/Nk0jufLFnn2R6cLhGlZ0QxB0OcpqW+974x7Ebd7nSZJX41yYfsmWD+W3J/mnrx8LpnV4TuGqJUgO4JeW/9Bzj/92X1+jgOPmwK3tZcWrz3McPQ4y9ev+25jN9ZLxitxW/NTlL3m4tnSNBso9rO3eboFxf/2gQNL2aX4ePm2b8U6Lf/AQ==
\ No newline at end of file
diff --git a/docs/assets/images/DD-Architecture.png b/docs/assets/images/DD-Architecture.png
new file mode 100644
index 00000000000..ae776df9609
Binary files /dev/null and b/docs/assets/images/DD-Architecture.png differ
diff --git a/docs/assets/images/beta-classic-uis.png b/docs/assets/images/beta-classic-uis.png
new file mode 100644
index 00000000000..4e6a98fcd49
Binary files /dev/null and b/docs/assets/images/beta-classic-uis.png differ
diff --git a/docs/assets/images/beta-ui-overview.png b/docs/assets/images/beta-ui-overview.png
new file mode 100644
index 00000000000..14ef167956b
Binary files /dev/null and b/docs/assets/images/beta-ui-overview.png differ
diff --git a/docs/assets/images/program_insights.png b/docs/assets/images/program_insights.png
new file mode 100644
index 00000000000..ba08f445ac7
Binary files /dev/null and b/docs/assets/images/program_insights.png differ
diff --git a/docs/assets/svgs/.gitkeep b/docs/assets/svgs/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/docs/assets/svgs/DD-Architecture.svg b/docs/assets/svgs/DD-Architecture.svg
deleted file mode 100644
index 4ebf0f92aee..00000000000
--- a/docs/assets/svgs/DD-Architecture.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/docs/content/en/about_defectdojo/ui_pro_vs_os.md b/docs/content/en/about_defectdojo/ui_pro_vs_os.md
new file mode 100644
index 00000000000..7b596850cb2
--- /dev/null
+++ b/docs/content/en/about_defectdojo/ui_pro_vs_os.md
@@ -0,0 +1,53 @@
+---
+title: "🎨 Beta UI Features"
+description: "Working with different UIs in DefectDojo"
+draft: "false"
+weight: 4
+pro-feature: true
+---
+
+Note: The Beta UI and associated features are only available in DefectDojo Pro.
+
+In late 2023, DefectDojo Inc. released a new UI for DefectDojo Pro, which has since been in Beta for Pro customers to test and experiment with.
+
+The Beta UI brings the following enhancements to DefectDojo:
+
+- Modern and sleek design, built using Vue.js
+- Optimized data delivery and load times, especially for large datasets
+- Access to new Pro features, including [API Connectors](/en/connecting_your_tools/connectors/about_connectors/), [Universal Importer](/en/connecting_your_tools/external_tools/), and Pro Metrics views
+- Improved UI workflows: better filtering, dashboards, and navigation
+
+## Switching To The Beta UI
+
+To access the Beta UI, open your User Options menu from the top-right hand corner. You can also switch back to the Classic UI from the same menu.
+
+
+
+## Navigational Changes
+
+
+
+1. The **Sidebar** has been reorganized: Pro Metrics and the Homepage can be found in the first section.
+
+2. Import methods can be found in the **Import** section: set up [API Connectors](/en/connecting_your_tools/connectors/about_connectors/), use the Import Scan form to [Add Findings](/en/connecting_your_tools/import_scan_files/import_scan_ui/), or use [Smart Upload](/en/connecting_your_tools/import_scan_files/smart_upload/) to handle infrastructure scanning tools.
+
+3. The **Manage** section allows you to view different objects in the [Product Hierarchy](/en/working_with_findings/organizing_engagements_tests/product_hierarchy/), with views for Product Types, Products, Engagements, Tests, Findings, Risk Acceptances, Endpoints and Components.
+
+4. The **Settings** section allows you to configure your DefectDojo instance, including your License, Cloud Settings, Users, Feature Configuration and admin-level Enterprise Settings.
+
+The Enterprise settings section contains the System Settings, Jira Instances, Deduplication Settings, SAML, OAuth, Login and MFA forms.
+
+5. The beta UI also has a **new table format** to help with navigation. This table is used with all [Product Hierarchy](/en/working_with_findings/organizing_engagements_tests/product_hierarchy/). Each column can be clicked on to apply a relevant filter, and columns can be reordered to present data however you like.
+
+6. The table also has a **"Toggle Columns"** menu which can add or remove columns from the table.
+
+## New Dashboards
+
+New metrics visualizations are included in the Beta UI. All of these reports can be filtered and exported as PDF to share them with a wider audience.
+
+
+
+- The **Executive Insights** dashboard displays the current state of your Products and Product Types.
+- **Program Insights** dashboard displays the effectiveness of your security team and the cost savings associated with separating duplicates and false positives from actionable Findings.
+- **Remediation Insights** displays your effectiveness at remediating Findings.
+- **Tool Insights** displays the effectiveness of your tool suite (and Connectors pipelines) at detecting and reporting vulnerabilities.
diff --git a/docs/content/en/api/api-v2-docs.md b/docs/content/en/api/api-v2-docs.md
index 263a790f77a..b1ae1b8d890 100644
--- a/docs/content/en/api/api-v2-docs.md
+++ b/docs/content/en/api/api-v2-docs.md
@@ -5,9 +5,6 @@ draft: false
weight: 2
---
-
-
-
DefectDojo\'s API is created using [Django Rest
Framework](http://www.django-rest-framework.org/). The documentation of
each endpoint is available within each DefectDojo installation at
diff --git a/docs/content/en/customize_dojo/notifications/configure_system_notifs.md b/docs/content/en/customize_dojo/notifications/configure_system_notifs.md
index 04ff29f635e..cc09adb3a45 100644
--- a/docs/content/en/customize_dojo/notifications/configure_system_notifs.md
+++ b/docs/content/en/customize_dojo/notifications/configure_system_notifs.md
@@ -20,4 +20,23 @@ Both an account’s Personal Notifications and the global System Notifications c
-To set destinations for system wide email notifications (Email, Slack or MS Teams), see our [Guide](../email_slack_teams).
\ No newline at end of file
+To set destinations for system wide email notifications (Email, Slack or MS Teams), see our [Guide](../email_slack_teams).
+
+## Template Notifications
+
+Superusers also have access to a "Template" form. The Template Form allows you to set the default Personal Notifications that are enabled for any new user.
+
+## Where System Notifications Are Sent
+
+System notifications will be sent to:
+- the single email address specified in System Settings (if enabled)
+- any DefectDojo users with accounts and appropriate RBAC permissions
+- the System-wide Slack or Teams account.
+
+As with any notification in DefectDojo, System Notifications will only be sent to users that have access to the relevant data. So even if Product Notifications are set up System-Wide, users will only receive notifications for the Products that they have access to view.
+
+This restriction does not apply to System Notifications that are sent to a specific Email or Slack channel.
+
+See our guide on [Role-Based Access Control](../../user_management/about_perms_and_roles/) for more information on RBAC and setting permissions.
+
+However, the connected System Email, Slack and Teams accounts cannot apply RBAC as they are not associated with a specific DefectDojo user. **All selected system-wide notifications will be sent to these locations, so you should ensure that these channels can only be accessed by specific people in your organization.**
\ No newline at end of file
diff --git a/docs/content/en/open_source/archived_docs/usage/models.md b/docs/content/en/open_source/archived_docs/usage/models.md
index 9a9e68fce3c..f08996d96dc 100644
--- a/docs/content/en/open_source/archived_docs/usage/models.md
+++ b/docs/content/en/open_source/archived_docs/usage/models.md
@@ -3,9 +3,10 @@ title: "Core data classes"
description: "DefectDojo is made to be flexible to conform to your program, rather than making your team conform to the tool."
draft: false
weight: 1
+exclude_search: true
---
-{{ readFile "/docs/assets/svgs/DD-Hierarchy.svg" | safeHTML }}
+
## Product Type
diff --git a/docs/content/en/open_source/installation/architecture.md b/docs/content/en/open_source/installation/architecture.md
index 9a315959653..f998751ac21 100644
--- a/docs/content/en/open_source/installation/architecture.md
+++ b/docs/content/en/open_source/installation/architecture.md
@@ -5,7 +5,7 @@ draft: false
weight: 1
---
-{{ readFile "/docs/assets/svgs/DD-Architecture.svg" | safeHTML }}
+
## NGINX
diff --git a/docs/content/en/share_your_findings/jira_integration/add_jira_to_product.md b/docs/content/en/share_your_findings/jira_integration/add_jira_to_product.md
index 2d26e695d69..a56b5d06f5e 100644
--- a/docs/content/en/share_your_findings/jira_integration/add_jira_to_product.md
+++ b/docs/content/en/share_your_findings/jira_integration/add_jira_to_product.md
@@ -37,19 +37,19 @@ Jira settings are located near the bottom of the Product Settings page.
-#### **Jira Instance**
+### Jira Instance
If you have multiple instances of Jira set up, for separate products or teams within your organization, you can indicate which Jira Project you want DefectDojo to create Issues in. Select a Project from the drop\-down menu.
If this menu doesn't list any Jira instances, confirm that those Projects are connected in your global Jira Configuration for DefectDojo \- yourcompany.defectdojo.com/jira.
-#### **Project key**
+### Project key
This is the key of the Project that you want to use with DefectDojo. The Project Key for a given project can be found in the URL.
-#### **Issue template**
+### Issue template
Here you can determine how much DefectDojo metadata you want to send to Jira. Select one of two options:
@@ -65,7 +65,7 @@ Here is an example of a **jira\_full** Issue:
-#### **Component**
+### Component
If you manage your Jira project using Components, you can assign the appropriate Component for DefectDojo here.
@@ -87,19 +87,23 @@ Select the relevant labels that you want the Issue to be created with in Jira, e
-#### **Default assignee**
+### Default assignee
The name of the default assignee in Jira. If left blank, DefectDojo will follow the default behaviour in your Jira Project when creating Issues.
-#### Checkbox options
+## Additional Jira Options
-
+### Enable Connection With Jira Project
-#### **Add vulnerability Id as a Jira label**
+Jira integrations can be removed from your instance only if no related Issues have been created. If Issues have been created, there is no way to completely remove a Jira Instance from DefectDojo.
+
+However, you can disable your Jira integration by disabling it at the Product level. This will not delete or change any existing Jira tickets created by DefectDojo, but will disable any further updates.
+
+### Add Vulnerability Id as a Jira label
This allows you to add the Vulnerability ID data as a Jira Label automatically. Vulnerability IDs are added to Findings from individual security tools \- these may be Common Vulnerabilities and Exposures (CVE) IDs or a different format, specific to the tool reporting the Finding.
-#### **Enable engagement epic mapping**
+### Enable Engagement Epic Mapping
In DefectDojo, Engagements represent a collection of work. Each Engagement contains one or more tests, which contain one or more Findings which need to be mitigated. Epics in Jira work in a similar way, and this checkbox allows you to push Engagements to Jira as Epics.
@@ -110,21 +114,21 @@ In DefectDojo, Engagements represent a collection of work. Each Engagement conta
-#### **Push All Issues**
+### Push All Issues
If checked, DefectDojo will automatically push any Active and Verified Findings to Jira as Issues. If left unchecked, all Findings will need to be pushed to Jira manually.
-#### **Push notes**
+### Push Notes
If enabled, Jira comments will populate on the associated Finding in DefectDojo, under Notes on the issue(screenshot), and vice versa; Notes on Findings will be added to the associated Jira Issue as Comments.
-#### **Send SLA notifications as comment?**
+### Send SLA Notifications As Comments
If enabled, any Issue which breaches DefectDojo’s Service Level Agreement rules will have comments added to the Jira issue indicating this. These comments will be posted daily until the Issue is resolved.
Service Level Agreements can be configured under **Configuration \> SLA Configuration** in DefectDojo and assigned to each Product.
-#### **Send Risk Acceptance expiration notifications as comment?**
+### Send Risk Acceptance Expiration Notifications As Comment?
If enabled, any Issue where the associated DefectDojo Risk Acceptance expires will have a comment added to the Jira issue indicating this. These comments will be posted daily until the Issue is resolved.
diff --git a/docs/content/en/share_your_findings/jira_integration/connect_to_jira.md b/docs/content/en/share_your_findings/jira_integration/connect_to_jira.md
index 100a7125ea5..7e16921542b 100644
--- a/docs/content/en/share_your_findings/jira_integration/connect_to_jira.md
+++ b/docs/content/en/share_your_findings/jira_integration/connect_to_jira.md
@@ -149,6 +149,14 @@ If this doesn’t work correctly, it could be due to a Firewall issue on your Ji
* DefectDojo's Firewall Rules include a checkbox for **Jira Cloud,** which needs to be enabled before DefectDojo can receive Webhook messages from Jira.
+## Disconnecting from Jira
+
+Jira integrations can be removed from your instance only if no related Issues have been created. If Issues have been created, there is no way to completely remove a Jira Instance from DefectDojo.
+
+However, you can disable your Jira integration by disabling it at the Product level. From the **Edit Product** form (Classic UI) or from the **Jira Product Settings** (Beta UI) you can uncheck the "Enable Connection With Jira Project" option. This will not delete or change any existing Jira tickets created by DefectDojo, but will disable any further updates.
+
+See our guide on [Adding Jira To a Product](../jira_integration/add_jira_to_product) for more information on Product-level settings.
+
## Next steps
* Now that you've set up your Jira Configuration, **[link it to one or more of your Products](../add_jira_to_product)** to have your Findings populate into Jira.
diff --git a/docs/content/en/share_your_findings/jira_integration/troubleshooting_jira.md b/docs/content/en/share_your_findings/jira_integration/troubleshooting_jira.md
index bcb8fbfe044..88a95811760 100644
--- a/docs/content/en/share_your_findings/jira_integration/troubleshooting_jira.md
+++ b/docs/content/en/share_your_findings/jira_integration/troubleshooting_jira.md
@@ -1,6 +1,6 @@
---
title: "Troubleshooting Jira errors"
-description: "Set up a Jira Configuration in DefectDojo - step 1 of working with Jira"
+description: "Fixing issues with a Jira integration"
---
Here are some common issues with the Jira integration, and ways to address them.
diff --git a/docs/content/en/share_your_findings/pro_reports/working_with_generated_reports.md b/docs/content/en/share_your_findings/pro_reports/working_with_generated_reports.md
index f304aa92f76..a63f07cf01f 100644
--- a/docs/content/en/share_your_findings/pro_reports/working_with_generated_reports.md
+++ b/docs/content/en/share_your_findings/pro_reports/working_with_generated_reports.md
@@ -7,7 +7,9 @@ weight: 2
Once you have created one or more **Reports** in DefectDojo you can take further actions, including:
* Using a report as a template for subsequent reports
+
* Re-running a report with updated data
+
* Deleting an old or unused report
diff --git a/dojo/__init__.py b/dojo/__init__.py
index c5a06c6f17c..5eec1f14dd1 100644
--- a/dojo/__init__.py
+++ b/dojo/__init__.py
@@ -4,6 +4,6 @@
# Django starts so that shared_task will use this app.
from .celery import app as celery_app # noqa: F401
-__version__ = "2.42.1"
+__version__ = "2.42.2"
__url__ = "https://github.com/DefectDojo/django-DefectDojo"
__docs__ = "https://documentation.defectdojo.com"
diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml
index 682a3d78bcc..859f8982ecf 100644
--- a/helm/defectdojo/Chart.yaml
+++ b/helm/defectdojo/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
appVersion: "2.43.0-dev"
description: A Helm chart for Kubernetes to install DefectDojo
name: defectdojo
-version: 1.6.169-dev
+version: 1.6.170-dev
icon: https://www.defectdojo.org/img/favicon.ico
maintainers:
- name: madchap