diff --git a/TODO.md b/TODO.md
index 24c989c2..e7eb4af0 100644
--- a/TODO.md
+++ b/TODO.md
@@ -6,7 +6,6 @@ A list of things to do, in no particular order.
   - https://sourcegraph.com/github.com/kradalby/dotfiles/-/blob/flake.nix?L180%3A7=
   - https://sourcegraph.com/search?q=context%3Aglobal+lang%3ANix+file%3Aflake.nix+colmena&patternType=standard&sm=1&groupBy=repo
 - [ ] De-duplicate code throughout the tree(ongoing)
-- [ ] Move metadata and any other things of that nature into data/ folder for easier management.
 - [ ] Secrets should be in a global folder
   - Easier to maintain a single folder for secrets
   - Also means secrets can be shared between machines if needed
@@ -21,26 +20,21 @@ A list of things to do, in no particular order.
 - [ ] Move all Docker containers to using native versions of databases, redis, etc.
   - Ensures higher performance and reduces the number of running containers.
   - https://github.com/felschr/nixos-config/blob/main/services/immich.nix for an example of how to do it
-- Look at removing other unused services
-- [ ] Add Prosody XMPP Server
-  - [ ] XEP-0215 - Need Coturn TURN+STUN server
-- [x] Add Forgejo Actions runner
-  - Gives me a way to run actions
-    - [x] Tailscale ACL GitOps
-    - Automatic updates of machines on push?
+- [ ] Add Archivebox service(needs custom module)
+- [ ] Add Immich service
 
 ## Zaphod
 
-- Nothing currently!
+- Nothing currently
 
 ## Prefect
 
-- [ ] Make DN42 configuration better
+- Nothing currently
 
 ## Other
 
 - Move DNS Records to a Git repo
-  - Auto-update by pushing a BIND file via the ClouDNS API
+  - Auto-update by pushing a BIND file via a provider's API
   - Should be easy to move to a provider like DNS.Kitchen(from Neatnik)
   - Simple Python script that runs from a forgejo action