diff --git a/inventory/inventory b/inventory/inventory
index ef746b4e64..3d4f0b809b 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -331,6 +331,7 @@ lockbox01.phx2.fedoraproject.org
 log01.phx2.fedoraproject.org
 noc01.phx2.fedoraproject.org
 noc02.fedoraproject.org
+data-analysis01.phx2.fedoraproject.org
 
 [ipsilon]
 ipsilon01.phx2.fedoraproject.org
@@ -506,7 +507,6 @@ smtp-mm-coloamer01.fedoraproject.org
 smtp-mm-tummy01.fedoraproject.org
 
 [spare]
-junk01.phx2.fedoraproject.org
 #
 # All staging hosts should be in this group too.
 #
diff --git a/master.yml b/master.yml
index 9c4e552771..c8ca7f20ad 100644
--- a/master.yml
+++ b/master.yml
@@ -115,7 +115,7 @@
 - include: /srv/web/infra/ansible/playbooks/hosts/darkserver-dev.fedorainfracloud.org.yml
 - include: /srv/web/infra/ansible/playbooks/hosts/dopr-dev.cloud.fedoraproject.org.yml
 #- include: /srv/web/infra/ansible/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
-- include: /srv/web/infra/ansible/playbooks/hosts/junk01.phx2.fedoraproject.org.yml
+- include: /srv/web/infra/ansible/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml
 - include: /srv/web/infra/ansible/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
 - include: /srv/web/infra/ansible/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml
 - include: /srv/web/infra/ansible/playbooks/hosts/taiga.cloud.fedoraproject.org.yml
diff --git a/playbooks/hosts/junk01.phx2.fedoraproject.org.yml b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml
similarity index 92%
rename from playbooks/hosts/junk01.phx2.fedoraproject.org.yml
rename to playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml
index 612ac498ba..5963158f21 100644
--- a/playbooks/hosts/junk01.phx2.fedoraproject.org.yml
+++ b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml
@@ -1,7 +1,7 @@
 # This is a basic playbook
 
 - name: make basic box
-  hosts: junk01.phx2.fedoraproject.org
+  hosts: data-analysis01.phx2.fedoraproject.org
   user: root
   gather_facts: True
 
diff --git a/roles/dhcp_server/files/dhcpd.conf.noc03.phx2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc03.phx2.fedoraproject.org
index 46558ffd65..4773bfde25 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc03.phx2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc03.phx2.fedoraproject.org
@@ -132,32 +132,6 @@ subnet 10.5.126.0 netmask 255.255.255.0 {
         option host-name "download05";
     }
 
-    host junk01 {
-    	 hardware ethernet e4:1f:13:2f:d4:94;
-	 fixed-address 10.5.126.7;
-	 next-server 10.5.126.41;
-	 option host-name "junk01";
-    }
-
-    host junk02 {
-    	 hardware ethernet e4:1f:13:64:1a:70;
-	 fixed-address 10.5.126.8;
-	 next-server 10.5.126.41;
-	 option host-name "junk02";
-    }
-
-    host junk01-mgmt {
-        hardware ethernet e4:1f:13:29:24:95;
-        fixed-address 10.5.126.235;
-        option host-name "junk01-mgmt";
-    }
-
-    host junk02-mgmt {
-        hardware ethernet e4:1f:13:29:24:95;
-        fixed-address 10.5.126.236;
-        option host-name "junk02-mgmt";
-    }
-
     host qa01-mgmt {
         hardware ethernet 00:21:5e:cb:4f:f1;
 	fixed-address 10.5.126.185;