diff --git a/docs/06-CHANGELOG.md b/docs/06-CHANGELOG.md
index 1fd3a65..4115411 100644
--- a/docs/06-CHANGELOG.md
+++ b/docs/06-CHANGELOG.md
@@ -1,3 +1,22 @@
+## 2026-01-22 - NetBox Migration to Shared PostgreSQL
+
+### Database Consolidation
+- [NETBOX] Migrated NetBox database to shared postgresql17
+- [NETBOX] Created netbox_user and netbox database on postgresql17
+- [NETBOX] Backed up and imported all NetBox data
+- [NETBOX] Removed dedicated netbox-postgres container
+
+### Network Consolidation
+- [NETBOX] Moved all NetBox containers to dockerproxy network
+- [NETBOX] Assigned static IPs: netbox (172.18.0.61), worker (172.18.0.62), redis (172.18.0.63/64)
+- [NETBOX] Removed unused netbox network (172.24.0.0/16)
+
+### Resource Savings
+- Removed netbox-postgres container (~200-400MB RAM saved)
+- Consolidated network infrastructure
+
+---
+
 ## 2026-01-22 - Slurp'it Network Discovery Setup
 
 ### SNMP Configuration
diff --git a/docs/13-CONTAINER-IP-ASSIGNMENTS.md b/docs/13-CONTAINER-IP-ASSIGNMENTS.md
index fc0839c..2d18dca 100644
--- a/docs/13-CONTAINER-IP-ASSIGNMENTS.md
+++ b/docs/13-CONTAINER-IP-ASSIGNMENTS.md
@@ -1,6 +1,6 @@
 # Container Static IP Assignments
 
-**Last Updated:** 2026-01-21
+**Last Updated:** 2026-01-22
 
 This document lists all static IP assignments for Docker containers on Unraid.
 Static IPs are configured in docker-compose files and Unraid templates for persistence.
@@ -25,8 +25,8 @@ Static IP range: 172.18.0.2 - 172.18.0.99
 |-----------|-----------|---------|--------|
 | authentik | 172.18.0.11 | Identity provider | Template |
 | authentik-worker | 172.18.0.12 | Authentik worker | Template |
-| postgresql17 | 172.18.0.13 | PostgreSQL database | Template |
-| Redis | 172.18.0.14 | Redis cache | Template |
+| postgresql17 | 172.18.0.13 | PostgreSQL database (shared) | Template |
+| Redis | 172.18.0.14 | Redis cache (Authentik) | Template |
 | vaultwarden | 172.18.0.15 | Password manager | Template |
 
 ### Productivity (172.18.0.16 - 172.18.0.30)
@@ -66,21 +66,16 @@ Static IP range: 172.18.0.2 - 172.18.0.99
 |-----------|-----------|---------|--------|
 | pangolin | 172.18.0.51 | Pangolin tunnel | Compose |
 
----
-
-## netbox Network (172.24.0.0/16)
-
-Static IP range: 172.24.0.2 - 172.24.0.20
+### NetBox (172.18.0.61 - 172.18.0.70)
 
 | Container | Static IP | Purpose | Config |
 |-----------|-----------|---------|--------|
-| netbox-redis | 172.24.0.2 | NetBox Redis | Compose |
-| netbox-redis-cache | 172.24.0.3 | NetBox Redis cache | Compose |
-| netbox-postgres | 172.24.0.4 | NetBox PostgreSQL | Compose |
-| netbox | 172.24.0.5 | NetBox web UI | Compose |
-| netbox-worker | 172.24.0.6 | NetBox worker | Compose |
+| netbox | 172.18.0.61 | NetBox web UI (DCIM/IPAM) | Compose |
+| netbox-worker | 172.18.0.62 | NetBox background worker | Compose |
+| netbox-redis | 172.18.0.63 | NetBox Redis (tasks) | Compose |
+| netbox-redis-cache | 172.18.0.64 | NetBox Redis (cache) | Compose |
 
-**Note:** NetBox container is also on dockerproxy network for Traefik access.
+**Note:** NetBox uses shared postgresql17 (172.18.0.13) for database.
 
 ---
 
@@ -141,6 +136,17 @@ These containers share the host network stack.
 
 ---
 
+## Shared PostgreSQL Database (postgresql17)
+
+| Database | User | Used By |
+|----------|------|---------|
+| authentik_db | authentik_user | Authentik |
+| netbox | netbox_user | NetBox |
+| gitea | gitea_user | Gitea |
+| netdisco_user | netdisco_user | NetDisco |
+
+---
+
 ## Docker Compose Files
 
 | Stack | Location |
@@ -154,13 +160,6 @@ These containers share the host network stack.
 
 ---
 
-## Unraid Docker Templates
-
-Templates are stored in `/boot/config/plugins/dockerMan/templates-user/`.
-Each template includes `<MyIP>` and `<ExtraParams>--ip=X.X.X.X</ExtraParams>` for static IP assignment.
-
----
-
 ## Maintenance
 
 ### Recreate Compose Containers
@@ -176,7 +175,7 @@ Use Unraid Docker UI to update/recreate - static IP is preserved in template.
 ### Verify IPs
 ```bash
 # Check all IPs on a network
-docker network inspect <network> --format '{{range .Containers}}{{.Name}}: {{.IPv4Address}}{{"\n"}}{{end}}'
+docker network inspect <network> --format '{{range .Containers}}{{.Name}}: {{.IPv4Address}}{{"\\n"}}{{end}}'
 
 # Check specific container
 docker inspect <container> | jq '.[0].NetworkSettings.Networks'