diff --git a/config/analytics.yml b/config/analytics.yml
index 19e9d8ad9..70c8cd52d 100644
--- a/config/analytics.yml
+++ b/config/analytics.yml
@@ -1,4 +1,3 @@
----
 :shared:
   :application_forms:
     - action_required_by
@@ -284,7 +283,6 @@
     - work_history_id
   :staff:
     - assess_permission
-    - azure_ad_uid
     - change_email_permission
     - change_name_permission
     - change_work_history_permission
diff --git a/config/analytics_blocklist.yml b/config/analytics_blocklist.yml
index 34c7e1c09..10756130f 100644
--- a/config/analytics_blocklist.yml
+++ b/config/analytics_blocklist.yml
@@ -1,4 +1,3 @@
----
 :shared:
   :active_storage_variant_records:
     - blob_id
@@ -81,6 +80,7 @@
     - session_id
     - updated_at
   :staff:
+    - azure_ad_uid
     - confirmation_token
     - encrypted_password
     - invitation_token
diff --git a/config/analytics_hidden_pii.yml b/config/analytics_hidden_pii.yml
new file mode 100644
index 000000000..ce6529335
--- /dev/null
+++ b/config/analytics_hidden_pii.yml
@@ -0,0 +1,30 @@
+:shared:
+  :application_forms:
+    - alternative_family_name
+    - alternative_given_names
+    - date_of_birth
+    - family_name
+    - given_names
+    - registration_number
+  :further_information_request_items:
+    - contact_email
+    - contact_name
+  :mail_delivery_failures:
+    - email_address
+  :staff:
+    - current_sign_in_ip
+    - email
+    - last_sign_in_ip
+    - name
+    - unconfirmed_email
+  :teachers:
+    - canonical_email
+    - current_sign_in_ip
+    - email
+    - last_sign_in_ip
+    - unconfirmed_email
+  :work_histories:
+    - canonical_contact_email
+    - contact_email
+    - contact_name
+    - email
diff --git a/config/analytics_pii.yml b/config/analytics_pii.yml
index 90eb89765..0967ef424 100644
--- a/config/analytics_pii.yml
+++ b/config/analytics_pii.yml
@@ -1,33 +1 @@
----
-:shared:
-  :application_forms:
-    - alternative_family_name
-    - alternative_given_names
-    - date_of_birth
-    - family_name
-    - given_names
-    - has_alternative_name
-    - registration_number
-  :further_information_request_items:
-    - contact_email
-    - contact_name
-  :mail_delivery_failures:
-    - email_address
-  :staff:
-    - azure_ad_uid
-    - current_sign_in_ip
-    - email
-    - last_sign_in_ip
-    - name
-    - unconfirmed_email
-  :teachers:
-    - canonical_email
-    - current_sign_in_ip
-    - email
-    - last_sign_in_ip
-    - unconfirmed_email
-  :work_histories:
-    - canonical_contact_email
-    - contact_email
-    - contact_name
-    - email
+{}