diff --git a/doc/source/afs.rst b/doc/source/afs.rst
index 6724d80605..79f926a0d5 100644
--- a/doc/source/afs.rst
+++ b/doc/source/afs.rst
@@ -27,11 +27,8 @@ At a Glance
   * afs02.dfw.openstack.org (a second fileserver in DFW)
   * afs01.ord.openstack.org (a fileserver in ORD)
   * mirror-update.opendev.org (host running mirror update jobs)
-:Puppet:
-  * https://opendev.org/opendev/puppet-openafs
-  * :git_file:`modules/openstack_project/manifests/afsdb.pp`
-  * :git_file:`modules/openstack_project/manifests/afsfs.pp`
 :Ansible:
+  * :git_file:`playbooks/service-afs.yaml`
   * :git_file:`playbooks/service-mirror.yaml`
   * :git_file:`playbooks/service-mirror-update.yaml`
 :Projects:
diff --git a/manifests/site.pp b/manifests/site.pp
index a8ae34488b..fed35c6a76 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -482,33 +482,6 @@ node /^kdc04\.open.*\.org$/ {
   }
 }
 
-# Node-OS: xenial
-node /^afsdb01\.open.*\.org$/ {
-  $group = "afsdb"
-
-  class { 'openstack_project::server': }
-
-  include openstack_project::afsdb
-}
-
-# Node-OS: xenial
-node /^afsdb.*\.open.*\.org$/ {
-  $group = "afsdb"
-
-  class { 'openstack_project::server': }
-
-  include openstack_project::afsdb
-}
-
-# Node-OS: xenial
-node /^afs.*\..*\.open.*\.org$/ {
-  $group = "afs"
-
-  class { 'openstack_project::server': }
-
-  include openstack_project::afsfs
-}
-
 # Node-OS: xenial
 node /^ask\d*\.open.*\.org$/ {
 
diff --git a/modules/openstack_project/manifests/afsdb.pp b/modules/openstack_project/manifests/afsdb.pp
deleted file mode 100644
index 414bc95668..0000000000
--- a/modules/openstack_project/manifests/afsdb.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-# AFS DB Server
-class openstack_project::afsdb (
-) {
-
-  class { '::openstack_project::afsfs': }
-
-  class { '::openafs::dbserver':
-    require => Class['Openstack_project::Afsfs'],
-  }
-
-}
diff --git a/modules/openstack_project/manifests/afsfs.pp b/modules/openstack_project/manifests/afsfs.pp
deleted file mode 100644
index c5ef88a922..0000000000
--- a/modules/openstack_project/manifests/afsfs.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-# AFS Fileserver/BOS
-class openstack_project::afsfs (
-  $cell = 'openstack.org',
-) {
-
-  class { '::openafs::fileserver':
-    cell         => $cell,
-    dbservers    => [
-      {
-        name     => 'afsdb01.openstack.org',
-        ip       => '104.130.136.20',
-      },
-      {
-        name     => 'afsdb02.openstack.org',
-        ip       => '23.253.200.228',
-      },
-    ],
-  }
-}
diff --git a/modules/openstack_project/templates/mirror-update/afsmon.cfg.erb b/modules/openstack_project/templates/mirror-update/afsmon.cfg.erb
deleted file mode 100644
index 524986f6df..0000000000
--- a/modules/openstack_project/templates/mirror-update/afsmon.cfg.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-[main]
-# Enable debugging output
-debug = True
-
-# If specified, all fileservers in this cell will be queried
-cell = openstack.org
-
-# You can specify a specific list of fileservers.  This is appended to
-# the cell fileservers if present, otherwise is the canonical list
-#fileservers = afs01.dfw.openstack.org
-#         fileserver02.afs.company.com
-#         fileserver03.afs.company.com
-
-# Options for remote statsd host if required
-[statsd]
-host = graphite.opendev.org
-port = 8125