diff --git a/.gitignore b/.gitignore
index fa57283..ba7f40a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
-data/*
+docker-data/*
 .env
 .gitea.env
 backups/
-postgres-data/
diff --git a/docker-compose.yaml b/docker-compose.yaml
index b6c3a39..1f20792 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -5,7 +5,6 @@ services:
   # ============================================================
   backup:
     image: ghcr.io/gromov-io/docker-s3-backup:latest
-    container_name: gitea-backup
     restart: unless-stopped
     depends_on:
       postgres:
@@ -32,14 +31,13 @@ services:
   # ============================================================
   postgres:
     image: postgres:16-alpine
-    container_name: gitea-postgres
     restart: unless-stopped
     environment:
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
       - POSTGRES_DB=${POSTGRES_DB}
     volumes:
-      - ./postgres-data:/var/lib/postgresql/data
+      - ./docker-data/postgres:/var/lib/postgresql/data
     networks:
       - gitea_network
     healthcheck:
@@ -53,7 +51,6 @@ services:
   # ============================================================
   gitea:
     image: gitea/gitea:latest
-    container_name: gitea
     restart: unless-stopped
     depends_on:
       postgres:
@@ -185,9 +182,7 @@ services:
         # Cache Configuration
       - GITEA__cache__ENABLED=true
     volumes:
-      - ./data:/data
-      - ./custom-templates/base:/data/gitea/custom/templates/base:ro
-      - ./custom-templates/public:/data/gitea/custom/public:ro
+      - ./docker-data/gitea:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     networks:
@@ -198,4 +193,4 @@ services:
 
 networks:
   gitea_network:
-    name: gitea_network
+
diff --git a/docker-data/gitea/.gitkeep b/docker-data/gitea/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/custom-templates/public/assets/css/custom.css b/docker-data/gitea/gitea/custom/public/assets/css/custom.css
similarity index 100%
rename from custom-templates/public/assets/css/custom.css
rename to docker-data/gitea/gitea/custom/public/assets/css/custom.css
diff --git a/custom-templates/public/assets/img/logo.webp b/docker-data/gitea/gitea/custom/public/assets/img/logo.webp
similarity index 100%
rename from custom-templates/public/assets/img/logo.webp
rename to docker-data/gitea/gitea/custom/public/assets/img/logo.webp
diff --git a/custom-templates/public/assets/img/rick.svg b/docker-data/gitea/gitea/custom/public/assets/img/rick.svg
similarity index 100%
rename from custom-templates/public/assets/img/rick.svg
rename to docker-data/gitea/gitea/custom/public/assets/img/rick.svg
diff --git a/custom-templates/base/footer_content.tmpl b/docker-data/gitea/gitea/custom/templates/base/footer_content.tmpl
similarity index 100%
rename from custom-templates/base/footer_content.tmpl
rename to docker-data/gitea/gitea/custom/templates/base/footer_content.tmpl
diff --git a/custom-templates/base/head.tmpl b/docker-data/gitea/gitea/custom/templates/base/head.tmpl
similarity index 100%
rename from custom-templates/base/head.tmpl
rename to docker-data/gitea/gitea/custom/templates/base/head.tmpl
diff --git a/custom-templates/base/head_navbar.tmpl b/docker-data/gitea/gitea/custom/templates/base/head_navbar.tmpl
similarity index 100%
rename from custom-templates/base/head_navbar.tmpl
rename to docker-data/gitea/gitea/custom/templates/base/head_navbar.tmpl