diff --git a/inventory/backups b/inventory/backups
index 0d7b49d470..f00d329c53 100644
--- a/inventory/backups
+++ b/inventory/backups
@@ -10,7 +10,7 @@ db-datanommer02.iad2.fedoraproject.org
 db-fas01.iad2.fedoraproject.org
 batcave01.iad2.fedoraproject.org
 pagure02.fedoraproject.org
-people02.fedoraproject.org
+people01.fedoraproject.org
 pkgs01.iad2.fedoraproject.org
 log01.iad2.fedoraproject.org
 db-openqa01.iad2.fedoraproject.org
diff --git a/inventory/inventory b/inventory/inventory
index eabb21ce6f..36f1fde204 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -322,7 +322,6 @@ mm_crawler_stg
 
 [people]
 people01.fedoraproject.org
-people02.fedoraproject.org
 
 [qahardware]
 
@@ -843,7 +842,6 @@ buildvmhost
 
 [groupc]
 people01.fedoraproject.org
-people02.fedoraproject.org
 
 [virtservers:children]
 colo_virt
@@ -1028,7 +1026,6 @@ bodhi-backend01.iad2.fedoraproject.org
 bodhi-backend01.iad2.fedoraproject.org
 mailman01.iad2.fedoraproject.org
 people01.fedoraproject.org
-people02.fedoraproject.org
 pagure02.fedoraproject.org
 pkgs01.iad2.fedoraproject.org
 #wiki01.iad2.fedoraproject.org
diff --git a/playbooks/groups/people.yml b/playbooks/groups/people.yml
index d6142e173c..313078a37d 100644
--- a/playbooks/groups/people.yml
+++ b/playbooks/groups/people.yml
@@ -19,32 +19,6 @@
 
   - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
-  - name: mount project volume
-    mount: >
-        name=/project
-        src=/dev/mapper/GuestVolGroup00-project
-        fstype=xfs
-        opts="noatime,noexec,nosuid,nodev"
-        passno=0
-        dump=0
-        state=mounted
-    when: inventory_hostname.startswith('people02')
-    tags:
-    - mount
-
-  - name: mount srv volume
-    mount: >
-        name=/srv
-        src=/dev/mapper/GuestVolGroup00-srv
-        fstype=xfs
-        opts="usrquota,gqnoenforce,noatime,noexec,nosuid,nodev"
-        passno=0
-        dump=0
-        state=mounted
-    when: inventory_hostname.startswith('people02')
-    tags:
-    - mount
-
   - name: mount project volume
     mount: >
         name=/project
@@ -100,13 +74,7 @@
   - cgit/clean_lock_cron
   - cgit/make_pkgs_list
   - clamav
-  - { role: planet, when: inventory_hostname.startswith('people02') }
-  - { role: letsencrypt, site_name: 'fedoraplanet.org', when: inventory_hostname.startswith('people02')  }
   - git/server
-  - role: rabbit/user
-    username: "planet{{ env_suffix }}"
-    sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(planet|logger)\..*
-    when: inventory_hostname.startswith('people02')
 
   - role: apache
 
diff --git a/roles/nagios_server/files/nagios/services/ssl.cfg b/roles/nagios_server/files/nagios/services/ssl.cfg
index b3e097bae6..862d566004 100644
--- a/roles/nagios_server/files/nagios/services/ssl.cfg
+++ b/roles/nagios_server/files/nagios/services/ssl.cfg
@@ -110,7 +110,7 @@ define service {
 }
 
 define service {
-  host_name             people02.fedoraproject.org
+  host_name             people01.fedoraproject.org
   service_description   http-cert-people.fedoraproject.org
   check_command         check_ssl_cert!fedorapeople.org!25
   use                   defaulttemplate
diff --git a/roles/people/tasks/main.yml b/roles/people/tasks/main.yml
index 2e1e00e589..e897b0e785 100644
--- a/roles/people/tasks/main.yml
+++ b/roles/people/tasks/main.yml
@@ -336,12 +336,3 @@
   - config
   notify:
   - restart sssd
-
-- name: mount tmp on tmpfs
-  mount: name=/var/lib/sss/db/ src=tmpfs fstype=tmpfs state=mounted opts=defaults,size=2G,mode=0700,rootcontext=system_u:object_r:sssd_var_lib_t:s0
-  when: inventory_hostname.startswith('people02')
-  tags:
-  - ipa/client
-  - config
-  notify:
-  - restart sssd
diff --git a/roles/people/templates/sssd.conf b/roles/people/templates/sssd.conf
index 348294f6e4..8cfe3fbae0 100644
--- a/roles/people/templates/sssd.conf
+++ b/roles/people/templates/sssd.conf
@@ -6,7 +6,7 @@ ipa_domain = fedoraproject.org
 id_provider = ipa
 auth_provider = ipa
 access_provider = ipa
-ipa_hostname = people02.fedoraproject.org
+ipa_hostname = people01.fedoraproject.org
 chpass_provider = ipa
 ipa_server = _srv_, ipa01.iad2.fedoraproject.org, ipa02.iad2.fedoraproject.org, ipa03.iad2.fedoraproject.org
 ldap_tls_cacert = /etc/ipa/ca.crt
diff --git a/roles/web-data-analysis/templates/sync-http-logs.yaml.j2 b/roles/web-data-analysis/templates/sync-http-logs.yaml.j2
index 9823f39eb9..7aebb8bfa1 100644
--- a/roles/web-data-analysis/templates/sync-http-logs.yaml.j2
+++ b/roles/web-data-analysis/templates/sync-http-logs.yaml.j2
@@ -39,7 +39,7 @@ synced_hosts:
   # - blockerbugs02.iad2.fedoraproject.org
   # - blockerbugs01.stg.iad2.fedoraproject.org
   - value02.iad2.fedoraproject.org
-  - people02.vpn.fedoraproject.org
+  - people01.vpn.fedoraproject.org
   - noc01.iad2.fedoraproject.org
   - dl01.iad2.fedoraproject.org
   - dl02.iad2.fedoraproject.org