diff --git a/data/services.toml b/data/services.toml
index 859ba650..722b3be4 100644
--- a/data/services.toml
+++ b/data/services.toml
@@ -2,11 +2,12 @@
 # port: what port the service uses internally, int
 # host: What host the service runs on
 # extUrl: (optional) the externally accessible domain name of the service
-# anubis: What port the anubis service for this domain will use, int
+# anubis: (optional) What port the anubis service for this domain will use, int
 # tsHost: (optional) What Tailscale host this service will run on, for services only available via Tailscale.
+# oidcId: (optional) OIDC Client ID for this service if it uses OIDC
 # # Should only be set if this is available externally, if at all, since TS-only services aren't able to be scraped.
 # Current lowest unassigned service/anubis port: 6938/8410
-# Misc available ports: 6908-11, 6913, 6916-21, 6923-4, 6927-8, 6933
+# Misc available ports: 6907, 6909-11, 6913, 6916-21, 6923-4, 6927-8, 6933
 # Misc Anubis available: 8401, 8407
 
 [bichon]
@@ -14,11 +15,6 @@ port = 6908
 host = "marvin"
 tsHost = "mail-vault"
 
-[booklore]
-port = 6905
-host = "marvin"
-extUrl = "lib.pyrox.dev"
-
 [buildbot-server]
 port = 6915
 host = "marvin"
@@ -29,27 +25,31 @@ port = 6900
 host = "marvin"
 tsHost = "cache"
 
-[deemix]
-port = 6907
-host = "marvin"
-tsHost = "deemix"
-
 [git]
 port = 6904
 host = "marvin"
 extUrl = "git.pyrox.dev"
 anubis = 8402
+oidcId = "dishNetGit"
 
 [grafana]
 port = 6914
 host = "marvin"
 extUrl = "stats.pyrox.dev"
 anubis = 8403
+oidcId = "dishNetStats"
+
+[grimmory]
+port = 6905
+host = "marvin"
+extUrl = "lib.pyrox.dev"
+oidcId = "dishNetLibrary"
 
 [immich]
 port = 6936
 host = "marvin"
 extUrl = "img.pyrox.dev"
+oidcId = "dishNetPhotos"
 pubProxy = 6937
 
 [jellyfin]
@@ -57,6 +57,7 @@ port = 8096
 host = "marvin"
 extUrl = "media.pyrox.dev"
 anubis = 8404
+oidcId = "dishNetMedia"
 exporter = 30103
 
 [matrix-server]
@@ -68,6 +69,7 @@ extUrl = "matrix.pyrox.dev"
 port = 6903
 host = "marvin"
 extUrl = "rss.pyrox.dev"
+oidcId = "dishNetRss"
 anubis = 8405
 
 [nextcloud]
@@ -80,6 +82,7 @@ anubis = 8406
 port = 6902
 host = "marvin"
 extUrl = "paper.pyrox.dev"
+oidcId = "dishNetDocs"
 
 [pinchflat]
 port = 6930
@@ -92,12 +95,6 @@ host = "marvin"
 extUrl = "plan.cs2a.club"
 anubis = 8408
 
-[pocket-id]
-port = 6932
-host = "marvin"
-extUrl = "auth.pyrox.dev"
-anubis = 8401
-
 [redlib]
 port = 6901
 host = "marvin"
@@ -112,6 +109,7 @@ tsHost = "scrutiny"
 port = 6906
 host = "marvin"
 tsHost = "shelfmark"
+oidcId = "dishNetShelfmark"
 
 [tangled-knot]
 port = 6934