diff --git a/modules/ROOT/pages/sle_services.adoc b/modules/ROOT/pages/sle_services.adoc
index 17e2d74..89b6fb1 100644
--- a/modules/ROOT/pages/sle_services.adoc
+++ b/modules/ROOT/pages/sle_services.adoc
@@ -5,147 +5,122 @@
 Here is the list of our services per SLE level. For memory these levels are
 presented in our xref:sle.adoc[SLE Documentation].
 
-[WARNING]
-====
-This document is still a **work in progress**. The services listed
-there are at their appropriate level for Fedora but not all of them are under
-the responsabilities of the CPE team which is currently not represented here.
-====
-
 == Critical
 
-* DNS
-* Bastion ssh
-* Authentication/authorization (FAS) https://admin.fedoraproject.org/accounts/
 * Authentication/authorization (Ipsilon) https://id.fedoraproject.org
-* Configuration Management (ansible)
-* Source control (git)
 * Backups
+* Bastion
+* Configuration Management (ansible)
 * DHCP/PXE
-* IPA
+* DNS
+* HAProxy https://admin.fedoraproject.org/haproxy/proxy01
+* IPA http://id.fedoraproject.org/ipa
+* Source control (git)
 
 
 == Important
 
-* Koji https://koji.fedoraproject.org
-* Bodhi https://bodhi.fedoraproject.org
-* Downloads https://dl.fedoraproject.org/
-* Fedora Souce code https://src.fedoraproject.org/
-* MirrorManager https://admin.fedoraproject.org/mirrormanager
-* Nagios https://nagios.fedoraproject.org
-* HAProxy https://admin.fedoraproject.org/haproxy/proxy01
-* Postgres databases
-* Mysql databases
-* Product Definition Center https://pdc.fedoraproject.org/
-* Greenwave
-* Fedmsg
-* DataGrepper https://apps.fedoraproject.org/datagrepper/
-* Email gateway bastion.fedoraproject.org
+* Authentication/Authorization (FAS) https://accounts.fedoraproject.org
 * Autosign
-* Composer
+* Bodhi https://bodhi.fedoraproject.org
 * Buildhosts
-* Docker registry
-* Memcached
+* Composer
+* Container registry https://registry.fedoraproject.org/
+* Downloads https://dl.fedoraproject.org/
+* Email gateway `bastion.fedoraproject.org`
+* FASJSON http://fasjson.fedoraproject.org/
+* FedImg
+* Fedora Messaging
+* Fedora Souce code https://src.fedoraproject.org/
+* Greenwave
+* Koji https://koji.fedoraproject.org/
 * Logging
-* Basset
-* PDC
-* resultsdb
-* certgetter
-* mbs
-* odcs
+* MDApi https://apps.fedoraproject.org/mdapi/
+* Monitor gating
+* Messaging bridges
+* MirrorManager https://admin.fedoraproject.org/mirrormanager
+* MySQL databases
+* Nagios https://nagios.fedoraproject.org
+* ODCS
+* OpenShift
+* OpenVPN
+* Postgres databases
+* Product Definition Center https://pdc.fedoraproject.org/
+* ResultsDB
+* ResultsDB CI listener
+* Toddlers
 
 
 == Normal
 
-* Pagure https://pagure.io
-* CI https://ci.centos.org
-* The Mailing Lists https://lists.fedoraproject.org
-* Wiki https://fedoraproject.org/wiki/Fedora_Project_Wiki
-* Documentation
-* Notifications https://apps.fedoraproject.org/notifications
+* CertGetter
+* Datagrepper https://apps.fedoraproject.org/datagrepper/
+* Docsbuilding
+* Docstranslation
+* Documentation https://docs.fedoraproject.org/
+* FAS2Discourse
+* Fedmsg
+* GeoIP https://geoip.fedoraproject.org/
+* Ipsilon website
 * Kerneltest https://apps.fedoraproject.org/kerneltest
-* Fedora InfraCloud https://fedorainfracloud.org
-* FMN
-* FAF
-* Beaker
-* Freshmaker
-* Data Analysis
+* Koschei
+* Mailing Lists https://lists.fedoraproject.org
+* MBS https://mbs.fedoraproject.org/
+* MemCached
+* Notifications https://notifications.fedoraproject.org/
+* OSBS https://osbs.fedoraproject.org/
+* Pagure https://pagure.io
+* rpmautospec
+* WaiverDB http://waiverdb.fedoraproject.org/
+* Wiki https://fedoraproject.org/wiki/Fedora_Project_Wiki
 
 
 == Low
 
-* Ambassadors https://fedoraproject.org/membership-map/ambassadors.html
 * Asknot http://whatcanidoforfedora.org/
 * Badges https://badges.fedoraproject.org/
 * Blocker Bugs https://qa.fedoraproject.org/blockerbugs/
-* Easyfix https://fedoraproject.org/easyfix/
+* bugzilla2fedmsg
+* Datanommer
+* Discourse2fedmsg
 * Elections https://apps.fedoraproject.org/#Elections
 * FedoCal https://apps.fedoraproject.org/#FedoCal
-* Fedora Magazine https://fedoramagazine.org/
 * Fedora People https://fedorapeople.org/
-* GeoIP https://geoip.fedoraproject.org/
 * github2fedmsg https://apps.fedoraproject.org/github2fedmsg
-* Mdapi https://apps.fedoraproject.org/mdapi/
 * Meetbot https://apps.fedoraproject.org/#Meetbot
-* Nuancier https://apps.fedoraproject.org/#Nuancier
-* Paste https://paste.fedoraproject.org
-* Release Monitoring (anitya) https://release-monitoring.org/
+* Packager dashboard https://packager-dashboard.fedoraproject.org/
+* Packages https://packages.fedoraproject.org/
+* Release monitoring (Anitya) https://release-monitoring.org/
+* Release monitoring (the-new-hotness)
 * Review Status https://fedoraproject.org/PackageReviewStatus/
 * The Planet https://fedoraplanet.org/
-* Unbound
-* Autocloud
-* Bugyou
-* Gobby
-* Keys
-* Koschei
-* Loopabull
-* Hotness
-* OpenShift
-* statscache
-* Packages https://admin.fedoraproject.org/pkgdb/packages/
-* bugzilla2fedmsg
-* fed-image
-* zanata2fedmsg
-* secondary
-* freemedia
-* pager_server
-* bz_review
-* websites
+* Torrents https://torrent.fedoraproject.org/
+* Websites building
 
 
-== Websites
-
-* fedora-web
-* fedora-budget
-* fedora-docs
-* developer
-* whatcanidoforfedora
-* membership-map
-* zanata
-* review-stats
-* fedora_owner_change
-
 == Third Party
 
 Outside of Fedora Infrastructure to fix.
 
-* Network connectivity to PHX2/RDU2
-* FreeNode IRC https://freenode.net
-* Ask Fedora https://ask.fedoraproject.org/
-* COPR https://copr.fedorainfracloud.org/
-* Retrace https://retrace.fedoraproject.org
 * Bugzilla https://bugzilla.redhat.com/
+* COPR https://copr.fedorainfracloud.org/
+* CoreOS CI
+* CoreOS Cincinnati
+* CoreOS Koji tagger
+* CoreOS OSTree importer
+* Discussions https://discussion.fedoraproject.org/
+* Fedora CoreOS pipeline
+* Fedora Magazine https://fedoramagazine.org/
+* Fedora OSTree Pruner
+* Flatpak Indexer
+* Libera.chat IRC https://libera.chat/
+* Matrix https://chat.fedoraproject.org/
+* Message tagging service
+* Network connectivity to IAD2/RDU2
+* OpenQA
+* Paste https://paste.fedoraproject.org/
+* Retrace https://retrace.fedoraproject.org
 * Status https://status.fedoraproject.org
-* Taskotron https://taskotron.fedoraproject.org/
-* Openqa
-* Taiga https://teams.fedoraproject.org/
-
-== Deprecated
-
-* Torrents https://torrent.fedoraproject.org
-* Darkserver https://darkserver.fedoraproject.org/
-* PkgDB https://admin.fedoraproject.org/pkgdb/
-* Jenkins https://jenkins.fedorainfracloud.org/
-* summershum
-* Tagger https://apps.fedoraproject.org/tagger/
-* Taiga https://taiga.fedorainfracloud.org/
+* TestDays https://testdays.fedoraproject.org/
+* TranStats https://transtats.fedoraproject.org/
+* Zezere