diff --git a/lxc1/management/gitea.yml b/lxc1/management/gitea.yml
index 17f8e4f..0c7c401 100644
--- a/lxc1/management/gitea.yml
+++ b/lxc1/management/gitea.yml
@@ -1,56 +1,51 @@
 services:
   gitea-postgres:
     image: docker.io/library/postgres:15
+    container_name: ${SERVICE_NAME}-postgres
     environment:
       - POSTGRES_USER=${GITEA_DB_USERNAME}
       - POSTGRES_PASSWORD=${GITEA_DB_PASSWORD}
-      - POSTGRES_DB=gitea
+      - POSTGRES_DB=${SERVICE_NAME}
     volumes:
       - /docker/management/gitea-postgres/postgres:/var/lib/postgresql/data
-    container_name: gitea-postgres
-    labels:
-      - "komodo.skip=true"
     restart: unless-stopped
-    ports:
-      - "5433:5432"
     networks:
-      - gitea_internal
+      - internal_net
 
   gitea:
     image: gitea/gitea:latest
-    container_name: gitea
-    ports:
-    #  - "3002:3000"
-      - "222:22"
-    networks:
-      - gitea_internal
-    volumes:
-      - /docker/management/gitea:/data
-      - /docker/management/gitea-postgres:/var/lib/gitea
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
-      - /docker:/docker
-    environment:
-      - TZ=America/Edmonton
-      - ROOT_URL=${GITEA_ROOT_URL}
-      - GITEA__database__DB_TYPE=postgres
-      - GITEA__database__HOST=gitea-postgres:5432
-      - GITEA__database__NAME=gitea
-      - GITEA__database__USER=${GITEA_DB_USERNAME}
-      - GITEA__database__PASSWD=${GITEA_DB_PASSWORD}
-      - GITEA__actions__ENABLED=true
+    container_name: ${SERVICE_NAME}
     restart: unless-stopped
     depends_on:
-      - gitea-postgres
+      - ${SERVICE_NAME}-postgres
+    networks:
+      - internal_net
+      - external_net
+    volumes:
+      - /docker/management/${SERVICE_NAME}:/data
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    environment:
+      - TZ=${TZ}
+      - GITEA__actions__ENABLED=true
+      - GITEA__database__DB_TYPE=postgres
+      - GITEA__database__HOST=${SERVICE_NAME}-postgres:5432
+      - GITEA__database__NAME=${SERVICE_NAME}
+      - GITEA__server__ROOT_URL=${GITEA_PROTOCOL}://${GITEA_FQDN}
+      - GITEA__database__USER=${GITEA_DB_USERNAME}
+      - GITEA__database__PASSWD=${GITEA_DB_PASSWORD}
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.gitea.rule=Host(`git.mapletree.email`)"
-      - "traefik.http.routers.gitea.entrypoints=websecure"
-      - "traefik.http.routers.gitea.tls=true"
-      - "traefik.http.routers.gitea.tls.certresolver=myresolver"
-      - "traefik.docker.network=gitea_internal"
-      - "traefik.http.services.gitea.loadbalancer.server.port=3000"
+      - "traefik.http.routers.${SERVICE_NAME}.rule=Host(`${GITEA_FQDN}`)"
+      - "traefik.http.routers.${SERVICE_NAME}.entrypoints=${TRAEFIK_ENTRYPOINT}"
+      - "traefik.http.routers.${SERVICE_NAME}.tls.certresolver=${TRAEFIK_RESOLVER}"
+      - "traefik.http.services.${SERVICE_NAME}.loadbalancer.server.port=${GITEA_INTERNAL_PORT}"
+      - "traefik.docker.network=gitea_external"
 
 networks:
-  gitea_internal:
+  internal_net:
+    name: ${INTERNAL_NETWORK_NAME}
+    driver: bridge
+  external_net:
+    name: ${EXTERNAL_NETWORK_NAME}
     driver: bridge
\ No newline at end of file