diff --git a/.gitignore b/.gitignore
index 73fcb95..fe934fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,9 @@ traefik/certs/*
 .env.anna
 .env.forust
 traefik/letsencrypt/acme.json
+dockmon/data/*
 portainer_data/*
-adguardhome/*
+adguardhome/data/*
 .python-version
 gitea/gitea-data/
 traefik/logs/*
diff --git a/adguard-docker-compose.yaml b/adguardhome/compose.yaml
similarity index 81%
rename from adguard-docker-compose.yaml
rename to adguardhome/compose.yaml
index 367c367..0b38acd 100644
--- a/adguard-docker-compose.yaml
+++ b/adguardhome/compose.yaml
@@ -12,8 +12,8 @@ services:
       # - "68:68/tcp" # DHCP
       - "3000:3000/tcp"
     volumes:
-      - ./adguardhome/work:/opt/adguardhome/work
-      - ./adguardhome/conf:/opt/adguardhome/conf
+      - ./data/work:/opt/adguardhome/work
+      - ./data/conf:/opt/adguardhome/conf
     networks:
       - traefik-proxy
     labels:
@@ -21,7 +21,7 @@ services:
       - "traefik.docker.network=traefik-proxy"
       - glance.name=adguard
       # - glance.icon=si:adguard
-      - glance.url=https://adguard.${HOST}/
+      - glance.url=https://adguard.forust.xyz/
       - glance.description=AdGuard Home is a network-wide software for blocking ads.
 networks:
   traefik-proxy:
diff --git a/dockmon-docker-compose.yaml b/dockmon/compose.yaml
similarity index 90%
rename from dockmon-docker-compose.yaml
rename to dockmon/compose.yaml
index 43f132d..6caae8d 100644
--- a/dockmon-docker-compose.yaml
+++ b/dockmon/compose.yaml
@@ -8,7 +8,7 @@ services:
       environment:
          - TZ=Europe/Bratislava
       volumes:
-         - ./volumes/dockmon:/app/data
+         - ./data:/app/data
          - /var/run/docker.sock:/var/run/docker.sock
       healthcheck:
          test: ["CMD", "curl", "-k", "-f", "https://localhost:443/health"]
@@ -22,7 +22,7 @@ services:
       - "traefik.docker.network=traefik-proxy"
       - glance.name=dockmon
       # - glance.icon=sh:dockmon
-      - glance.url=https://dockmon.${HOST}/
+      - glance.url=https://dockmon.forust.xyz/
       - glance.description=Dockmon is a lightweight Docker container monitoring and management tool with a user-friendly web interface.
 
 networks:
diff --git a/gitea/gitea-docker-compose.yaml b/gitea/compose.yaml
similarity index 100%
rename from gitea/gitea-docker-compose.yaml
rename to gitea/compose.yaml