diff --git a/data/aut-num/AS4242422550 b/data/aut-num/AS4242422550
index 6efbd6317..5b871be29 100644
--- a/data/aut-num/AS4242422550
+++ b/data/aut-num/AS4242422550
@@ -1,7 +1,8 @@
 aut-num:            AS4242422550
 as-name:            AERIONCLOUD
 org:                ORG-AERIONCLOUD
-admin-c:            MILO-DN42
-tech-c:             MILO-DN42
+admin-c:            ORG-AERIONCLOUD-DN42
+tech-c:             ORG-AERIONCLOUD-DN42
 mnt-by:             MILO-MNT
+remarks:            Peer with me, my email is milo.santos@aerioncloud.com
 source:             DN42
diff --git a/data/dns/aerioncloud.dn42 b/data/dns/aerioncloud.dn42
new file mode 100644
index 000000000..c2c7c1e54
--- /dev/null
+++ b/data/dns/aerioncloud.dn42
@@ -0,0 +1,8 @@
+domain:             aerioncloud.dn42
+admin-c:            ORG-AERIONCLOUD-DN42
+tech-c:             ORG-AERIONCLOUD-DN42
+mnt-by:             MILO-MNT
+nserver:            ns.milo.dn42
+nserver:            ns.milo.dn42
+org:                ORG-AERIONCLOUD
+source:             DN42
diff --git a/data/dns/milo.dn42 b/data/dns/milo.dn42
new file mode 100644
index 000000000..a150a8ded
--- /dev/null
+++ b/data/dns/milo.dn42
@@ -0,0 +1,7 @@
+domain:             milo.dn42
+admin-c:            MILO-DN42
+tech-c:             MILO-DN42
+mnt-by:             MILO-MNT
+nserver:            ns.milo.dn42 172.23.111.3
+nserver:            ns.milo.dn42 fd96:c033:6deb:1::3
+source:             DN42
diff --git a/data/inet6num/fd96:c033:6deb::_48 b/data/inet6num/fd96:c033:6deb::_48
index dfaa88a6a..b47de0c15 100644
--- a/data/inet6num/fd96:c033:6deb::_48
+++ b/data/inet6num/fd96:c033:6deb::_48
@@ -7,5 +7,6 @@ country:            ES
 admin-c:            MILO-DN42
 tech-c:             MILO-DN42
 mnt-by:             MILO-MNT
+nserver:            ns.milo.dn42
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inetnum/172.23.111.0_26 b/data/inetnum/172.23.111.0_26
index e45a752ee..1da3195f1 100644
--- a/data/inetnum/172.23.111.0_26
+++ b/data/inetnum/172.23.111.0_26
@@ -7,5 +7,6 @@ admin-c:            MILO-DN42
 tech-c:             MILO-DN42
 mnt-by:             MILO-MNT
 org:                ORG-AERIONCLOUD
+nserver:            ns.milo.dn42
 status:             ASSIGNED
 source:             DN42
diff --git a/data/mntner/MILO-MNT b/data/mntner/MILO-MNT
index ff74a3260..c2c6dd002 100644
--- a/data/mntner/MILO-MNT
+++ b/data/mntner/MILO-MNT
@@ -3,4 +3,5 @@ admin-c:            MILO-DN42
 tech-c:             MILO-DN42
 mnt-by:             MILO-MNT
 auth:               ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJd6Bg+wAttHl0BMyK8/dXJGnGFDRENduW77LbR6D4fy
+auth:               pgp-fingerprint 6BC34A40DB43F45DB2A11B657E9E26AAA834E267
 source:             DN42
diff --git a/data/role/ORG-AERIONCLOUD-DN42 b/data/role/ORG-AERIONCLOUD-DN42
new file mode 100644
index 000000000..76a20d03a
--- /dev/null
+++ b/data/role/ORG-AERIONCLOUD-DN42
@@ -0,0 +1,9 @@
+role:               AerionCloud
+nic-hdl:            ORG-AERIONCLOUD-DN42
+abuse-mailbox:      admin@aerioncloud.com
+org:                ORG-AERIONCLOUD
+admin-c:            MILO-DN42
+tech-c:             MILO-DN42
+mnt-by:             MILO-MNT
+remarks:            inquiries: milo.santos@aerioncloud.com
+source:             DN42