diff --git a/apache.yml b/apache.yml
index 883fb46..a12559f 100644
--- a/apache.yml
+++ b/apache.yml
@@ -1,14 +1,13 @@
 - hosts:
   - code.kde.org
   - library.kde.org
   - lxr.kde.org
   - mason.kde.org
   - mimi.kde.org
-  - olios.kde.org
   - orbi.kde.org
   - overwatch.kde.org
   - rosetta.kde.org
   - stumptown.kde.org
 
   roles:
   - apache
diff --git a/backups.yml b/backups.yml
index cffb486..ddf4458 100644
--- a/backups.yml
+++ b/backups.yml
@@ -1,34 +1,33 @@
 ---
 - hosts:
-  - olios.kde.org
   - mason.kde.org
   - cano.kde.org
   - overwatch.kde.org
   - bluemchen.kde.org
   - fiesta.kde.org
   - recluse.kde.org
   - code.kde.org
   - stumptown.kde.org
 
   - mimi.kde.org
 
   - orbi.kde.org
   - dalca.kde.org
   - ange.kde.org
   - library.kde.org
   - rosetta.kde.org
   - letterbox.kde.org
   - thera.kde.org
   - mygalo.kde.org
   - komaci.kde.org
   - edulis.kde.org
   - platna.kde.org
   - milonia.kde.org
   - eresida.kde.org
 
   vars_files:
     - vars/backups.yml
     - vars/backups-vault.yml
 
   roles:
     - kde-backup
diff --git a/letsencrypt.yml b/letsencrypt.yml
index 1329aa3..b104138 100644
--- a/letsencrypt.yml
+++ b/letsencrypt.yml
@@ -1,12 +1,11 @@
 - hosts:
-  - olios.kde.org
   - rosetta.kde.org
   - library.kde.org
   - stumptown.kde.org
   - mimi.kde.org
   - code.kde.org
   - lxr.kde.org
   - overwatch.kde.org
 
   roles:
   - letsencrypt
diff --git a/olios-tsdgeos.yml b/olios-tsdgeos.yml
deleted file mode 100644
index 8cf91d6..0000000
--- a/olios-tsdgeos.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-# This playbook gives tsdgeos a shell account on olios,
-# and access to the 'kdeorg' MySQL database,
-# mainly so he can do SQL queries about the fundraiser.
-
-- hosts:
-  - olios.kde.org
-
-  tasks:
-  - user:
-      name: tsdgeos
-      state: present
-    register: user_tsdgeos
-
-  - authorized_key:
-      user: tsdgeos
-      key: "{{ lookup('file', 'tsdgeos.pub') }}"
-
-  - template:
-      src: my.cnf.j2
-      dest: "{{user_tsdgeos.home}}/.my.cnf"
-      owner: tsdgeos
-      group: tsdgeos
-      mode: 0400
-    vars:
-      mysql_username: kdeorg
-      mysql_password: "{{mysql_passwords['kdeorg']}}"
diff --git a/production/host_vars/olios.kde.org/vars.yml b/production/host_vars/olios.kde.org/vars.yml
deleted file mode 100644
index c5d9754..0000000
--- a/production/host_vars/olios.kde.org/vars.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-mysql_passwords: "{{vault_mysql_passwords}}"
-
-allowed_ssh_users_extra: [kcoyle]
-
-# Security advisories are .txt files in kde.org/info/security so they need to be allowed.
-apache_allow_txt: true
-
-backup_directory: backup
-gohma_backup_user: oliosbackup
-gohma_backup_home: BACKUP.olios.kde.org
diff --git a/production/host_vars/olios.kde.org/vault.yml b/production/host_vars/olios.kde.org/vault.yml
deleted file mode 100644
index 8961404..0000000
--- a/production/host_vars/olios.kde.org/vault.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-61323533643661626261613035626131656466313138373737366165666538306366303263626330
-3335613837373465663938343933663166383431306337350a306438346234313738393639316133
-66343265303138313136323635313731373065346436383838613534613537613563373439663531
-6233643732653433650a353262333037616166323138356565656130363734616135323463386439
-35343237653338373530393335306265323666343438656439353831613535356137313764613938
-34363964646333636636306536303034326334636236363762316535393161383031356361323432
-303361653739663864323336346532636235
diff --git a/production/hosts b/production/hosts
index a99962b..d877c52 100644
--- a/production/hosts
+++ b/production/hosts
@@ -1,81 +1,79 @@
 #zivo.kde.org
 
 bluemchen.kde.org
 
 cano.kde.org
-olios.kde.org
 
 fiesta.kde.org
 
 recluse.kde.org
 code.kde.org
 
 ange.kde.org
-joy.kde.org
 
 stumptown.kde.org
 
 dalca.kde.org
 dalca2.kde.org ansible_host=10.150.44.2 ansible_ssh_common_args='-o ProxyCommand="ssh -W %h:%p -q root@dalca.kde.org"'
 
 overwatch.kde.org
 #overwatch-test.kde.org
 
 library.kde.org
 rosetta.kde.org
 
 mimi.kde.org
 
 orbi.kde.org
 
 letterbox.kde.org
 
 mason.kde.org
 thera.kde.org
 mygalo.kde.org
 
 darwini.kde.org
 
 aranea.kde.org
 artonis.kde.org
 
 anepsion.kde.org
 charlotte.kde.org
 eresida.kde.org
 halono.kde.org
 
 nephilia.kde.org
 komaci.kde.org
 edulis.kde.org
 
 micrea.kde.org
 milonia.kde.org
 platna.kde.org
 capona.kde.org
 
 [anongit]
 mason.kde.org anongit_style=legacy
 
 
 [monitored]
 # Servers that are being monitored with Telegraf
 overwatch.kde.org
 #overwatch-test.kde.org
 bluemchen.kde.org
 rosetta.kde.org
 mimi.kde.org
 orbi.kde.org
 recluse.kde.org
 code.kde.org
 darwini.kde.org
 mason.kde.org
 ange.kde.org
 thera.kde.org
 mygalo.kde.org
 anepsion.kde.org
 micrea.kde.org
 fiesta.kde.org
 
 [monitoring-server]
 overwatch.kde.org
 #overwatch-test.kde.org
diff --git a/tsdgeos.pub b/tsdgeos.pub
deleted file mode 100644
index 51c8d2c..0000000
--- a/tsdgeos.pub
+++ /dev/null
@@ -1,35 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-65343536376135326232333033383432613364656165323766633638373464326265616566373031
-3934376436386131323761666232383432333830333139630a613634646436646137353862393337
-34343063396466323434373432343231653563323136393837663037653335646166363266623833
-3138313939633831650a376138303064623362663334636663643932633961376366613133613164
-32383730633463613137643239316238393436346534343966306164373237303835663330616530
-64313537323338343964666639653964366463346135396662306664613633656232633931656135
-33643538346330636633666461333163613231666636363563633566336661613437356635626337
-61356230626534316334363633386639363338343466343938393061326438303232623038623664
-31623939383263643862663232656133383262346338666633393032383266663337653162623366
-63313932653735653935386235393265646561313762393636666132353237393363303665386264
-37616234333038353962666563353132343439363164663965306530633730336534303165653264
-65626461613530363665633839363639313831353433626237326233346539373334633764313730
-61616662383138343435663134666639343034646136313835633137313039303265643366616339
-61383835643439616361663332646263316365363230616464306437633138393964313562313664
-39663365383765653937313538303133633336316530613733383663396634323761663965343039
-36313435313635643862663839636232383236363739666131373136663062666537666332643361
-32343039356435373337303432336137346237643531333731383265326464333965343737393239
-34343831303662396334333931613062643063626265363636356239363032626638623465313762
-38663661653831333637666236623765356661383564306233623063366566343336656530333362
-64323064613638313963656365633839316239353062663661646632626538336334323036346538
-35353230323634656639366137363432393330613433303035306162326661323961363435316634
-31393762373635353935616438613937346136613932333134376139643533373637363031633366
-64636363393933626666363739613339623131646432643261313437343037353561343637666231
-62633538333436376163663465356534616361363838633936663139303630306166303330393739
-32383436386333363461643934313035366535333963376161616339326339326163633831306164
-36313337383765623337346538333966333264653432343830333635376664333463306436653039
-36343665663465663133663463623266663836323330633861313333323039393435313763353035
-36333531623938656263396239626631366662636338613832346661353838633535663662646261
-63643036383634303434653065356338326630633164656632336162306436636336396634613664
-61343965376336656136383666366136623566306332653537363065333663366538303665333433
-34653166653139646537613731346137363261663930353733386235653432343834396566613062
-37666434363031363739343732333232653865616466396339633938656664393038623938366130
-64393633633362373562313231383934383362396439303466333930303362386232663632653265
-6365316231613365633161333065396462663235663931366263