diff --git a/rocky/reports/report_types/dns_report/report.html b/rocky/reports/report_types/dns_report/report.html
index 731f4677024..affc75e7d61 100644
--- a/rocky/reports/report_types/dns_report/report.html
+++ b/rocky/reports/report_types/dns_report/report.html
@@ -1,117 +1,123 @@
{% load i18n %}
- {% if data.ipv4 %}
-
-
-
- IPv4 |
-
-
-
-
- {% for ip in data.ipv4 %}{{ ip }} | {% endfor %}
-
-
-
- {% endif %}
- {% if not data.enough_ipv6_webservers %}
-
-
IPv6 {% translate "Warning" %}:
-
- {% blocktranslate trimmed %}
+
{% if data.other_records %}
{% translate "Other records found" %}
-
-
-
- {% translate "Record" %} |
- {% translate "Value" %} |
- {% translate "Found by" %} |
-
-
-
- {% for ooi in data.other_records %}
-
- {{ ooi.human_readable }} |
- {{ ooi.content }} |
- {{ ooi.origin }} |
-
- {% endfor %}
-
-
-
{% translate "Security measures" %}
-
+
+
{% translate "Security measures" %}
+
{% endif %}
diff --git a/rocky/reports/report_types/tls_report/report.html b/rocky/reports/report_types/tls_report/report.html
index 8f9fbcd8252..5ac68d3d048 100644
--- a/rocky/reports/report_types/tls_report/report.html
+++ b/rocky/reports/report_types/tls_report/report.html
@@ -2,42 +2,44 @@
Ciphers
{% if data.suites %}
-
-
-
- {% translate "Status" %} |
- {% translate "Protocol" %} |
- {% translate "Name" %} |
- {% translate "Encryption Algorithm" %} |
- {% translate "Bits" %} |
- {% translate "Key Size" %} |
- {% translate "Code" %} |
-
-
-
- {% for protocol, suites in data.suites.items %}
- {% for suite in suites %}
+
+
{% else %}
-
{% translate "No ciphers found for this IPService" %}
+
{% translate "No ciphers found for this IPService" %}
{% endif %}
{% if data.findings %}
{% translate "Findings" %}