diff --git a/compose/traefik/traefik.yml b/compose/traefik/traefik.yml
index c4483e4..7d75897 100644
--- a/compose/traefik/traefik.yml
+++ b/compose/traefik/traefik.yml
@@ -557,7 +557,7 @@ http:
     streamlit_fin_app:
       loadBalancer:
         servers:
-          - url: http://streamlit_fin_app:8501
+          - url: http://streamlit-fin:8501
     emqx-mqtt-socket:
       loadBalancer:
         servers:
diff --git a/docker-compose.yml b/docker-compose.yml
index e470c34..d6cdeca 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -50,27 +50,26 @@ services:
       - net
       - default
 
-  adminer:
-    image: adminer
-    container_name: adminer
-    environment:
-      PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL}
-      PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD}
-      PGID: 1000
-      PUID: 1000
-      PATH: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-      PYTHONPATH: "/pgadmin4"
-      TZ: Asia/Singapore
-    user: "1000:1000"
-    volumes:
-      - pgadmin:/var/lib/pgadmin
-    restart: unless-stopped
+  api_server:
+    image: furyhawk/listen:latest
+    container_name: api_server
+    restart: always
     depends_on:
       - postgres
-    expose:
-      - 80
+    environment:
+      DATABASE__HOSTNAME: ${DATABASE__HOSTNAME}
+      DATABASE__USERNAME: ${POSTGRES_USER}
+      DATABASE__PASSWORD: ${POSTGRES_PASSWORD}
+      DATABASE__PORT: ${DATABASE__PORT}
+      DATABASE__DB: ${DATABASE__DB}
+      SECURITY__JWT_SECRET_KEY: ${SECURITY__JWT_SECRET_KEY}
+      SECURITY__BACKEND_CORS_ORIGINS: ${SECURITY__BACKEND_CORS_ORIGINS}
+      SECURITY__ALLOWED_HOSTS: ${SECURITY__ALLOWED_HOSTS}
+    ports:
+      - "8000:8000"
     networks:
       - net
+      - default
 
   osrm-backend:
     environment:
@@ -147,23 +146,20 @@ services:
       - net
       - default
 
-  api_server:
-    image: furyhawk/listen:latest
-    container_name: api_server
-    restart: always
-    depends_on:
-      - postgres
+  syncthing:
+    image: syncthing/syncthing
+    container_name: syncthing
     environment:
-      DATABASE__HOSTNAME: ${DATABASE__HOSTNAME}
-      DATABASE__USERNAME: ${POSTGRES_USER}
-      DATABASE__PASSWORD: ${POSTGRES_PASSWORD}
-      DATABASE__PORT: ${DATABASE__PORT}
-      DATABASE__DB: ${DATABASE__DB}
-      SECURITY__JWT_SECRET_KEY: ${SECURITY__JWT_SECRET_KEY}
-      SECURITY__BACKEND_CORS_ORIGINS: ${SECURITY__BACKEND_CORS_ORIGINS}
-      SECURITY__ALLOWED_HOSTS: ${SECURITY__ALLOWED_HOSTS}
+      - PUID=1000
+      - PGID=1000
+    restart: unless-stopped
+    volumes:
+      - ~/st-sync:/var/syncthing
     ports:
-      - "8000:8000"
+      - "8384:8384" # Web UI
+      - "22000:22000/tcp" # TCP file transfers
+      - "22000:22000/udp" # QUIC file transfers
+      - "21027:21027/udp" # Receive local discovery broadcasts
     networks:
       - net
       - default
@@ -213,15 +209,51 @@ services:
   #   networks:
   #     - net
 
+  adminer:
+    image: adminer
+    environment:
+      PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL}
+      PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD}
+      PGID: 1000
+      PUID: 1000
+      PATH: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+      PYTHONPATH: "/pgadmin4"
+      TZ: Asia/Singapore
+    user: "1000:1000"
+    volumes:
+      - pgadmin:/var/lib/pgadmin
+    restart: unless-stopped
+    depends_on:
+      - postgres
+    expose:
+      - 80
+    networks:
+      - net
+
   cheatsheets-app:
     image: furyhawk/cheatsheets:${CHEATSHEETSTAG:-latest}
-    container_name: cheatsheets_app
     restart: unless-stopped
     expose:
       - 80
     networks:
       - net
 
+  ghost-db:
+    image: mysql:8
+    container_name: ghost-db
+    security_opt:
+    - seccomp:unconfined
+    restart: always
+    command: --mysql-native-password=ON
+    environment:
+      MYSQL_ROOT_PASSWORD: ${POSTGRES_PASSWORD}
+    volumes:
+      - ghost_mysql:/var/lib/mysql
+    expose:
+      - 3306
+    networks:
+      - net
+
   ghost-server:
     image: ghost
     container_name: ghost_server
@@ -246,25 +278,8 @@ services:
     networks:
       - net
 
-  ghost-db:
-    image: mysql:8
-    container_name: ghost-db
-    security_opt:
-    - seccomp:unconfined
-    restart: always
-    command: --mysql-native-password=ON
-    environment:
-      MYSQL_ROOT_PASSWORD: ${POSTGRES_PASSWORD}
-    volumes:
-      - ghost_mysql:/var/lib/mysql
-    expose:
-      - 3306
-    networks:
-      - net
-
   heynote-app:
     image: furyhawk/heynote:${HEYNOTETAG:-latest}
-    container_name: heynote_app
     restart: unless-stopped
     environment:
       NODE_ENV: production
@@ -275,7 +290,6 @@ services:
 
   jellyfin:
     image: jellyfin/jellyfin
-    container_name: jellyfin
     user: 1000:1000
     volumes:
       - jellyfin_config:/config
@@ -338,11 +352,11 @@ services:
 
   thelounge:
     image: ghcr.io/thelounge/thelounge:latest
-    expose:
-      - 9000
     restart: unless-stopped
     volumes:
       - thelounge_data:/var/opt/thelounge # bind lounge config from the host's file system
+    expose:
+      - 9000
     networks:
       - net
 
@@ -354,12 +368,6 @@ services:
     command: streamlit run --server.port=$STREAMLIT_BAI_SERVER_PORT --server.address=0.0.0.0 --server.baseUrlPath=$BAI_LOCATION src/app.py
     volumes:
       - bai_cache:/app/cache
-      # - type: bind
-      #   source: ${PWD}/cache/bar_cache.sqlite
-      #   target: /app/bar_cache.sqlite
-      # - type: bind
-      #   source: ${PWD}/cache/short_cache.sqlite
-      #   target: /app/short_cache.sqlite
     expose:
       - ${STREAMLIT_BAI_SERVER_PORT}
     networks:
@@ -369,34 +377,14 @@ services:
     environment:
       <<: *default-environment
     image: furyhawk/llama3toolsfin:main
-    container_name: streamlit_fin_app
     restart: unless-stopped
     expose:
       - ${STREAMLIT_FIN_SERVER_PORT}
     networks:
       - net
 
-  syncthing:
-    image: syncthing/syncthing
-    container_name: syncthing
-    environment:
-      - PUID=1000
-      - PGID=1000
-    restart: unless-stopped
-    volumes:
-      - ~/st-sync:/var/syncthing
-    ports:
-      - "8384:8384" # Web UI
-      - "22000:22000/tcp" # TCP file transfers
-      - "22000:22000/udp" # QUIC file transfers
-      - "21027:21027/udp" # Receive local discovery broadcasts
-    networks:
-      - net
-      - default
-
   site_server:
     image: nginx:alpine
-    container_name: site_server
     restart: unless-stopped
     volumes:
       - ./site:/usr/share/nginx/html:ro
diff --git a/local.yml b/local.yml
index 34bdc94..471b7c5 100644
--- a/local.yml
+++ b/local.yml
@@ -6,7 +6,6 @@ services:
       context: .
       dockerfile: ./compose/streamlit-fin/Dockerfile
     image: streamlit_fin_local
-    container_name: streamlit_fin_app
     restart: always
     ports:
       - 8501:8501