diff --git a/documentation/operator-guide/images/architecture.png b/documentation/operator-guide/images/architecture.png
index d728b3e54441d72194c4b84bb78c91c0c6c4cb16..5c4ac8b16a10be403674baa0201dff3c6e96481a 100644
Binary files a/documentation/operator-guide/images/architecture.png and b/documentation/operator-guide/images/architecture.png differ
diff --git a/documentation/operator-guide/intro.rst b/documentation/operator-guide/intro.rst
index 3c4624bff163f3f8c8d4293489239e3c25936dc4..0c0b2c9395ce4e2df8ad659e48f43cbe28640d54 100644
--- a/documentation/operator-guide/intro.rst
+++ b/documentation/operator-guide/intro.rst
@@ -18,18 +18,19 @@ Components
 The View Server consists of the following service components (with their
 respective Docker image in parenthesis):
 
-.. - Ingestor (ingestor) TODO: re-add this
 
- - Reverse Proxy (traefik)
- - Preprocessor (preprocessor)
- - Registrar (core)
- - Renderer (core)
- - Cache (cache)
- - Seeder (cache)
- - Client (client)
- - Database (postgis)
- - Queue Manager (redis)
- - Reverse Proxy (traefik)
+- Reverse Proxy (traefik)
+- Preprocessor (preprocessor)
+- Registrar (core)
+- Renderer (core)
+- Cache (cache)
+- Seeder (cache)
+- Client (client)
+- Database (postgis)
+- Queue Manager (redis)
+- Reverse Proxy (traefik)
+
+.. - Ingestor (ingestor) TODO: re-add this
 
 These services are bundled and managed together in a Docker Swarm via
 Docker Compose configuration files.
diff --git a/documentation/operator-guide/setup.rst b/documentation/operator-guide/setup.rst
index dd18691e901e421fbbd94d487cc0ae7cac94e210..ea94042ff6fb5dd1d0a31b7fcc93e917c8a78908 100644
--- a/documentation/operator-guide/setup.rst
+++ b/documentation/operator-guide/setup.rst
@@ -36,7 +36,7 @@ architecture. On a Debian based system this may look like this:
     sudo apt-get update
     sudo apt-get install docker-ce docker-ce-cli containerd.io
 
-## TODO: RHEL?
+.. ## TODO: RHEL?
 
 Docker Swarm
 ------------