diff --git a/config/analytics.yml b/config/analytics.yml
index 2153786ea..d12f78bb5 100644
--- a/config/analytics.yml
+++ b/config/analytics.yml
@@ -70,19 +70,16 @@
   :assessments:
     - age_range_max
     - age_range_min
-    - age_range_note
     - application_form_id
     - created_at
     - id
     - induction_required
     - recommendation
-    - recommendation_assessor_note
     - recommended_at
     - references_verified
     - scotland_full_registration
     - started_at
     - subjects
-    - subjects_note
     - unsigned_consent_document_generated
     - updated_at
     - working_days_since_started
@@ -97,13 +94,11 @@
     - qualification_id
     - received_at
     - requested_at
-    - review_note
     - review_passed
     - reviewed_at
     - unsigned_document_downloaded
     - updated_at
     - verified_at
-    - verify_note
     - verify_passed
   :countries:
     - code
@@ -161,7 +156,6 @@
     - id
     - received_at
     - requested_at
-    - review_note
     - review_passed
     - reviewed_at
     - updated_at
@@ -173,12 +167,10 @@
     - contact_job
     - contact_name
     - created_at
-    - failure_reason_assessor_feedback
     - failure_reason_key
     - further_information_request_id
     - id
     - information_type
-    - response
     - updated_at
     - work_history_id
   :notes:
@@ -186,22 +178,18 @@
     - author_id
     - created_at
     - id
-    - text
     - updated_at
   :professional_standing_requests:
     - assessment_id
     - created_at
     - expired_at
     - id
-    - location_note
     - received_at
     - requested_at
-    - review_note
     - review_passed
     - reviewed_at
     - updated_at
     - verified_at
-    - verify_note
     - verify_passed
   :qualifications:
     - application_form_id
@@ -223,46 +211,32 @@
     - qualification_id
     - received_at
     - requested_at
-    - review_note
     - review_passed
     - reviewed_at
     - updated_at
     - verified_at
-    - verify_note
     - verify_passed
   :reference_requests:
-    - additional_information_response
     - assessment_id
-    - children_comment
     - children_response
-    - contact_comment
     - contact_job
     - contact_name
     - contact_response
     - created_at
-    - dates_comment
     - dates_response
     - expired_at
-    - hours_comment
     - hours_response
     - id
-    - lessons_comment
     - lessons_response
-    - misconduct_comment
     - misconduct_response
     - received_at
-    - reports_comment
     - reports_response
     - requested_at
-    - review_note
     - review_passed
     - reviewed_at
-    - satisfied_comment
     - satisfied_response
-    - slug
     - updated_at
     - verified_at
-    - verify_note
     - verify_passed
     - work_history_id
   :regions:
@@ -294,7 +268,6 @@
     - updated_at
   :selected_failure_reasons:
     - assessment_section_id
-    - assessor_feedback
     - created_at
     - id
     - key
@@ -353,7 +326,6 @@
   :uploads:
     - created_at
     - document_id
-    - filename
     - id
     - malware_scan_result
     - translation
diff --git a/config/analytics_blocklist.yml b/config/analytics_blocklist.yml
index 73b5dca28..34c7e1c09 100644
--- a/config/analytics_blocklist.yml
+++ b/config/analytics_blocklist.yml
@@ -22,7 +22,13 @@
     - record_id
     - record_type
   :assessments:
+    - age_range_note
     - qualifications_assessor_note
+    - recommendation_assessor_note
+    - subjects_note
+  :consent_requests:
+    - verify_note
+    - review_note
   :countries:
     - other_information
     - sanction_information
@@ -34,11 +40,40 @@
     - id
     - name
     - updated_at
+  :further_information_requests:
+    - review_note
+  :further_information_request_items:
+    - failure_reason_assessor_feedback
+    - response
+  :notes:
+    - text
+  :professional_standing_requests:
+    - location_note
+    - review_note
+    - verify_note
+  :qualification_requests:
+    - review_note
+    - verify_note
+  :reference_requests:
+    - additional_information_response
+    - children_comment
+    - contact_comment
+    - dates_comment
+    - hours_comment
+    - lessons_comment
+    - misconduct_comment
+    - reports_comment
+    - review_note
+    - satisfied_comment
+    - slug
+    - verify_note
   :regions:
     - other_information
     - sanction_information
     - status_information
     - teaching_qualification_information
+  :selected_failure_reasons:
+    - assessor_feedback
   :sessions:
     - created_at
     - data
@@ -82,3 +117,5 @@
     - subjects_note
     - updated_at
     - work_history_id
+  :uploads:
+    - filename
diff --git a/config/analytics_pii.yml b/config/analytics_pii.yml
index bcf72a1a8..0b9ab98ef 100644
--- a/config/analytics_pii.yml
+++ b/config/analytics_pii.yml
@@ -1,52 +1,23 @@
 ---
 :shared:
-  :active_storage_blobs:
-    - filename
-  :active_storage_attachments:
-    - name
   :application_forms:
-    - given_names
-    - family_name
+    - alternative_family_name
+    - alternative_given_names
     - date_of_birth
-    - age_range_min
-    - age_range_max
+    - family_name
+    - given_names
     - has_alternative_name
-    - alternative_given_names
-    - alternative_family_name
     - registration_number
-    - has_work_history
-    - subjects
-  :further_information_requests:
-    - review_note
   :further_information_request_items:
-    - failure_reason_assessor_feedback
-    - response
-    - contact_name
     - contact_email
-  :notes:
-    - text
-  :professional_standing_requests:
-    - location_note
-    - review_note
-    - verify_note
-  :qualifications:
-    - institution_name
-  :qualification_requests:
-    - review_note
-    - verify_note
-  :reference_requests:
-    - additional_information_response
-    - review_note
-    - verify_note
-  :selected_failure_reasons:
-    - assessor_feedback
+    - contact_name
   :staff:
-    - email
-    - unconfirmed_email
+    - azure_ad_uid
     - current_sign_in_ip
+    - email
     - last_sign_in_ip
     - name
-    - azure_ad_uid
+    - unconfirmed_email
   :teachers:
     - canonical_email
     - current_sign_in_ip
@@ -55,8 +26,6 @@
     - unconfirmed_email
   :work_histories:
     - canonical_contact_email
-    - city
     - contact_email
     - contact_name
     - email
-    - school_name