diff --git a/data/mntner/MOONDUST-MNT b/data/mntner/MOONDUST-MNT
index 9fb3c113b..bb47f8376 100644
--- a/data/mntner/MOONDUST-MNT
+++ b/data/mntner/MOONDUST-MNT
@@ -2,5 +2,5 @@ mntner:             MOONDUST-MNT
 admin-c:            MOONDUST-DN42
 tech-c:             MOONDUST-DN42
 mnt-by:             MOONDUST-MNT
-auth:               ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDR+RUnAq4FbQZb0mHBXmZYuz57DFTKhafOjWyqZIMCG5SntWcSw2RIe6Ikvb+9nJXNNuGAACfPBAiDD/jdqyHEkPq1Rw4Y+M8pajpzOZqtxeAd7uWfjlgMoKiQsOwCXpWAktS86DtnDjGRubOxXS/W1KRbBRsBlJnhioLBeBCMvK6V7YH83V7PYbq2PXYBxmHe2dCUcORitrC87c/pRNrYB+f1YWIHyuudVTCq50ncqUJdSw1VzVQeksFhBdQ/WqOAk+P/RL4H6QIr+N+3CZUWW9quuiE8kBmwZAlc+JIZipkLA8Qwg0RhMh3ndUCzHZ6eSKxnkltFj1hLe7THX/nwnuPZiip96TGgIpkRjdpYh2Q9S5YfQc4/QYj410haOYpUPfNKvf4JuZfX/Mrpje3iMeTY3U92pX7S3ksfDFiFCqPl0lM6VKfeJfsD4V6g3T7+m3QPzoHIfqf+i5eZj3bJcYeEXAb7/+2T8hPZV4BCuFl84zPTOmzfbghU7YLB+bM= molly@moondust
+auth:               pgp-fingerprint 79A6B71B550D72092C222BA8B8F6B710772280E6
 source:             DN42
diff --git a/data/organisation/ORG-MOONDUST b/data/organisation/ORG-MOONDUST
index 90828ef89..fc766dc69 100644
--- a/data/organisation/ORG-MOONDUST
+++ b/data/organisation/ORG-MOONDUST
@@ -3,7 +3,6 @@ org-name:           Moondust
 admin-c:            MOONDUST-DN42
 tech-c:             MOONDUST-DN42
 mnt-by:             MOONDUST-MNT
-www:                https://moondust.dev/
-abuse-mailbox:      abuse@moondust.dev
-e-mail:             admin@moondust.dev
+abuse-mailbox:      mam@sdf.org
+e-mail:             mam@sdf.org
 source:             DN42
diff --git a/data/person/MOONDUST-DN42 b/data/person/MOONDUST-DN42
index 50e9cb619..1cac106e0 100644
--- a/data/person/MOONDUST-DN42
+++ b/data/person/MOONDUST-DN42
@@ -1,5 +1,5 @@
 person:             Molly A. McCollum
-e-mail:             molly@moondust.dev
+e-mail:             mam@sdf.org
 nic-hdl:            MOONDUST-DN42
 mnt-by:             MOONDUST-MNT
 source:             DN42