diff --git a/hiera/common.yaml b/hiera/common.yaml
index 8cc6ec0673..9836774c6d 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -13,7 +13,6 @@ cacti_hosts:
 - backup02.ca-ymq-1.vexxhost.opendev.org
 - bridge01.opendev.org
 - cacti.openstack.org
-- codesearch01.opendev.org
 - codesearch02.opendev.org
 - eavesdrop01.opendev.org
 - etherpad02.opendev.org
diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml
index afb255839a..627ee02f8d 100644
--- a/inventory/base/hosts.yaml
+++ b/inventory/base/hosts.yaml
@@ -121,17 +121,6 @@ all:
         - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCshV5cRGpTp11A8E/T+vRGhRB5DMt4kod6FzV+uctyQNB44p1zTlRYdQN9t/GVR19to2k2n4U+dzrrCT/6BOm7Xw5Z1EPsM7yWzchgl+fIXmCcfWBSSAyi+TeT6nVcTkox/jb4TrvZNbHBZyLQusUS4xLsVEjlali/pFRZPzcRV0sxA1O+xqoMbo8YfK6Qj99S9CC1bGd6zFzwBMA+8/uyNnZZcTt6A7wrW0ZFOPnpntT8y4FjGOyEXvHAjB3mdZGdKWQWM7sKDM6MfGWyQc793kEVIR2yt7NSw6Cp8Tb1HvmB1UX4sXfue8MgukeNFpsHKmUfhbcXns9IQVLP1lPR'
         - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBABIVK5wDiBXkS10g2kfrVdsdnyHA9+6GS6+hgWKlcqWs1Wh1ovShiOke31TsoGN3c+5DYoFxD5MHTYZBF44G+g='
         - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINGYnnD8ZHbBxSHVzs8kzq6KwdT/3ptx2I5qHuIlWpl9'
-    codesearch01.opendev.org:
-      ansible_host: 104.130.158.239
-      location:
-        cloud: openstackci-rax
-        region_name: DFW
-      public_v4: 104.130.158.239
-      public_v6: 2001:4800:7818:104:be76:4eff:fe04:3bb2
-      host_keys:
-        - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDbItLkYVUXyIBjF0/uTmwjN30vAa93ehprhSfurnoDs5J4LhCb2a6c91xlK8LYjsEvS1Dsz35JSonb2T11zGHuRMvgWt8kgUew6PhiLdsTPqGarosyNCp0DHAzZyjItpOsq9Hd8EHzjO5sm7h+W8HdTnBC1V2JbDe1/6ZxrA80l5P3lg57d27Pq40FN52jAsrNkEmyGp9k+udg4wgKQ84iF8s/ltZRYS4g1sYIb2j4UiWnrPYyiZjFmeNAk5UmK3CYj1Nw9C1GQV8tw8vtzLdsA7U7e77+SlkeJ8Pq3aAKU+axk3tEEbwEBqVnsRJcV61V6EavWaFOAF6M+6mDp0ZlmEzflr2P26XpJkfZFqlHsoR/KOjR3zsWN/eeAeWYdEJm9sup5D6JASt4uMsota6MKnjyV5olvd3S0hOVyYX/+7zYWnO3MDgJt8FBuIbkzuOYrb1wu/nGfBgffQXMayc71s5Z6TYsTpNn7fVBzRoAoY87KHgX1CtZbU0zzFWREkE='
-        - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIV5oT7xuCzL4PldH7OvJZlaWHrfB2vefpUXC2UG/pm4h3zND/4h+wjy6keS5Q1VI6UlrpXKtn3Ny5bcDW/oVyM='
-        - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJwBbpXnrVmhDA+yVaIEMD6j1xnHZa5hJz5AVJvAwX3u'
     codesearch02.opendev.org:
       ansible_host: 104.130.158.27
       location:
diff --git a/inventory/service/host_vars/codesearch01.opendev.org.yaml b/inventory/service/host_vars/codesearch01.opendev.org.yaml
deleted file mode 100644
index 3492f653cd..0000000000
--- a/inventory/service/host_vars/codesearch01.opendev.org.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-letsencrypt_certs:
-  codesearch01-opendev-org-main:
-    - codesearch01.opendev.org
-    - codesearch.opendev.org
-    - codesearch.openstack.org
diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
index babdc6c912..6182c7ac0c 100644
--- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
+++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
@@ -155,9 +155,6 @@
 
 # Codesearch (hound)
 
-- name: letsencrypt updated codesearch01-opendev-org-main
-  include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
-
 - name: letsencrypt updated codesearch02-opendev-org-main
   include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
 
diff --git a/zuul.d/infra-prod.yaml b/zuul.d/infra-prod.yaml
index 36d3b9ce20..f488f6b946 100644
--- a/zuul.d/infra-prod.yaml
+++ b/zuul.d/infra-prod.yaml
@@ -539,7 +539,6 @@
       - docker/hound/
       - inventory/base
       - playbooks/service-codesearch.yaml
-      - inventory/service/host_vars/codesearch01.opendev.yaml
       - inventory/service/host_vars/codesearch02.opendev.yaml
       - inventory/service/group_vars/codesearch
       - playbooks/roles/install-docker/