diff --git a/policy/tpa-rfc-33-monitoring/Makefile b/policy/tpa-rfc-33-monitoring/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..cb0168b71c976a44474397bd40e768957f80838f
--- /dev/null
+++ b/policy/tpa-rfc-33-monitoring/Makefile
@@ -0,0 +1,10 @@
+FILES=architecture-after.png architecture-before.png
+
+.PHONY: all
+all: $(FILES)
+
+%.svg: %.dot
+	dot -Tsvg $< > $@
+
+%.png: %.dot
+	dot -Tpng $< > $@
diff --git a/policy/tpa-rfc-33-monitoring/architecture-after.dot b/policy/tpa-rfc-33-monitoring/architecture-after.dot
index a31ccffa1da56b8fee31a50fa0bb810b85deddd8..79cf8c0da1764cce02d46291d3b19d8e60aabb86 100644
--- a/policy/tpa-rfc-33-monitoring/architecture-after.dot
+++ b/policy/tpa-rfc-33-monitoring/architecture-after.dot
@@ -1,5 +1,5 @@
 digraph before {
-        label="TPA monitoring infrastructure, planned 2024-2025\nGrafana, Prometheus, Alertmanager configurations pulled from GitLab, not shown\nOther configuration pulled from Puppet and LDAP, not shown"
+        label="TPA monitoring infrastructure, planned 2024-2025\nGrafana, Prometheus, Alertmanager configurations pulled from GitLab and Puppet, not shown\nOther configuration pulled from Puppet and LDAP, not shown"
         labelloc=bottom
         graph [ fontname=Liberation fontsize=14 ];
         node [ fontname=Liberaion ];
diff --git a/policy/tpa-rfc-33-monitoring/architecture-after.png b/policy/tpa-rfc-33-monitoring/architecture-after.png
index aeec38e7567a7307b05f6e46bf450458d99d639f..3ed436f955458fceb9b7d0191aaf079fb7994278 100644
Binary files a/policy/tpa-rfc-33-monitoring/architecture-after.png and b/policy/tpa-rfc-33-monitoring/architecture-after.png differ
diff --git a/policy/tpa-rfc-33-monitoring/architecture-before.dot b/policy/tpa-rfc-33-monitoring/architecture-before.dot
index 40f509a29b2a3c34b6838a423e0ff91cc0318d41..c83deefeddde7f050c6fb8904b5b5ceb904fdcaa 100644
--- a/policy/tpa-rfc-33-monitoring/architecture-before.dot
+++ b/policy/tpa-rfc-33-monitoring/architecture-before.dot
@@ -1,5 +1,5 @@
 digraph before {
-        label="TPA monitoring infrastructure, May 2024"
+        label="TPA monitoring infrastructure, May 2024\nGrafana, Prometheus, Alertmanager configurations pulled from GitLab and Puppet, not shown\nNRPE configuration pulled from Puppet, not shown"
         labelloc=bottom
         graph [ fontname=Liberation fontsize=14 ];
         node [ fontname=Liberaion ];
@@ -26,14 +26,11 @@ digraph before {
         email
         IRC
         Puppet
-        GitLab
         "node exporters"
-        GitLab -> { Alertmanager, Prometheus2, Grafana1 } [arrowtail=inv, dir=back]
         "node exporters" -> Prometheus1 -> Grafana1 [arrowtail=inv, dir=back]
         { "other exporters", blackbox } -> Prometheus2 -> Grafana2 [arrowtail=inv, dir=back]
         Prometheus2 -> Alertmanager
 
-        Puppet -> { blackbox, Alertmanager, Grafana1, Prometheus1, Grafana2, Prometheus2, "node exporters", NRPE } [arrowtail=inv, dir=back]
         Nagios -> Puppet
 
         Nagios -> { email, IRC }
diff --git a/policy/tpa-rfc-33-monitoring/architecture-before.png b/policy/tpa-rfc-33-monitoring/architecture-before.png
index 39cfb850bcc66793554e31b7176beabb0c583720..131a79290986fa1f920a7291398f846b064a4439 100644
Binary files a/policy/tpa-rfc-33-monitoring/architecture-before.png and b/policy/tpa-rfc-33-monitoring/architecture-before.png differ