diff --git a/dojo/templates_classic/issue-trackers/jira_full/jira-description.tpl b/dojo/templates_classic/issue-trackers/jira_full/jira-description.tpl
index 610fabeae01..c919e0bcf17 100644
--- a/dojo/templates_classic/issue-trackers/jira_full/jira-description.tpl
+++ b/dojo/templates_classic/issue-trackers/jira_full/jira-description.tpl
@@ -43,13 +43,23 @@
 *Commit hash:* {{ finding.test.engagement.commit_hash }}
 {% endif %}
 
+{% if V3_FEATURE_LOCATIONS %}
+{% if finding.locations.all %}
+*Systems/Locations*:
+||Location||Status||
+{% for location_ref in finding.locations.all %}|{{ location_ref.location }}|{{ location_ref.get_status_display }}|
+{% endfor %}
+{% endif %}
+{% else %}
+{% comment %} TODO: Delete this after the move to Locations {% endcomment %}
 {% if finding.endpoints.all %}
 *Systems/Endpoints*:
 ||System/Endpoint||Status||
 {% for endpoint in finding|get_vulnerable_endpoints %}|{{ endpoint }}|{{ endpoint|endpoint_display_status:finding }}|
 {% endfor %}{% for endpoint in finding|get_mitigated_endpoints %}|{{ endpoint }}|{{ endpoint|endpoint_display_status:finding }}|
 {% endfor %}
-{%endif%}
+{% endif %}
+{% endif %}
 
 
 {% if finding.component_name %}
diff --git a/dojo/templates_classic/issue-trackers/jira_full/jira-finding-group-description.tpl b/dojo/templates_classic/issue-trackers/jira_full/jira-finding-group-description.tpl
index 1d53270ff80..4fb79642fc3 100644
--- a/dojo/templates_classic/issue-trackers/jira_full/jira-finding-group-description.tpl
+++ b/dojo/templates_classic/issue-trackers/jira_full/jira-finding-group-description.tpl
@@ -47,13 +47,23 @@ h3. [{{ finding.title|jiraencode}}|{{ finding_url|full_url }}]
 {% if finding.cve %}*CVE:* [{{ finding.cve }}|{{ finding.cve|vulnerability_url }}]{% else %}*CVE:* Unknown{% endif %}
 {% if finding.cvssv3_score %} *CVSSv3 Score:* {{ finding.cvssv3_score }} {% endif %}
 
+{% if V3_FEATURE_LOCATIONS %}
+{% if finding.locations.all %}
+*Systems/Locations*:
+||Location||Status||
+{% for location_ref in finding.locations.all %}|{{ location_ref.location }}|{{ location_ref.get_status_display }}|
+{% endfor %}
+{% endif %}
+{% else %}
+{% comment %} TODO: Delete this after the move to Locations {% endcomment %}
 {% if finding.endpoints.all %}
 *Systems/Endpoints*:
 ||System/Endpoint||Status||
 {% for endpoint in finding|get_vulnerable_endpoints %}|{{ endpoint }}|{{ endpoint|endpoint_display_status:finding }}|
 {% endfor %}{% for endpoint in finding|get_mitigated_endpoints %}|{{ endpoint }}|{{ endpoint|endpoint_display_status:finding }}|
 {% endfor %}
-{%endif%}
+{% endif %}
+{% endif %}
 
 {% if finding.sast_source_object %}
 *Source Object*: {{ finding.sast_source_object }}