diff --git a/docker-compose.yml b/docker-compose.yml
index fc4d8a8..da5f212 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -61,6 +61,57 @@ services:
     #  retries: 5
     #  start_period: 100s
 
+  web:
+    image: xbgmsharp/vuestic-postgsail:dev
+    build:
+      context: https://github.com/xbgmsharp/vuestic-postgsail.git#live
+      dockerfile: Dockerfile_dev
+    container_name: web_dev
+    restart: unless-stopped
+    volumes:
+      - ./frontend:/app
+    networks:
+      iot:
+        ipv4_address: 172.30.0.4
+    ports:
+      - 8080:8080
+    environment:
+      - VITE_PGSAIL_URL=${PGSAIL_API_URL}
+      - VITE_APP_INCLUDE_DEMOS=false
+      - VITE_APP_BUILD_VERSION=true
+      - VITE_APP_TITLE=${VITE_APP_TITLE}
+    depends_on:
+      - db
+      - api
+    logging:
+      options:
+        max-size: 10m
+
+  pgadmin:
+    image: dpage/pgadmin4:latest
+    container_name: pgadmin
+    restart: unless-stopped
+    volumes:
+      - data:/var/lib/pgadmin
+      - ./pgadmin_servers.json:/servers.json:ro
+    ports:
+      - 5050:5050
+    environment:
+      - PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL}
+      - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD}
+      - PGADMIN_LISTEN_ADDRESS=0.0.0.0
+      - PGADMIN_LISTEN_PORT=5050
+      - PGADMIN_SERVER_JSON_FILE=/servers.json
+      - PGADMIN_DISABLE_POSTFIX=true
+    networks:
+      iot:
+        ipv4_address: 172.30.0.5
+    depends_on:
+      - db
+    logging:
+      options:
+        max-size: 10m
+
   app:
     image: grafana/grafana:latest
     container_name: app
@@ -109,57 +160,6 @@ services:
       options:
         max-size: 10m
 
-  web:
-    image: xbgmsharp/vuestic-postgsail:dev
-    build:
-      context: https://github.com/xbgmsharp/vuestic-postgsail.git#live
-      dockerfile: Dockerfile_dev
-    container_name: web_dev
-    restart: unless-stopped
-    volumes:
-      - $PWD/frontend:/app
-    networks:
-      iot:
-        ipv4_address: 172.30.0.4
-    ports:
-      - 8080:8080
-    environment:
-      - VITE_PGSAIL_URL=${PGSAIL_API_URL}
-      - VITE_APP_INCLUDE_DEMOS=false
-      - VITE_APP_BUILD_VERSION=true
-      - VITE_APP_TITLE=${VITE_APP_TITLE}
-    depends_on:
-      - db
-      - api
-    logging:
-      options:
-        max-size: 10m
-
-  pgadmin:
-    image: dpage/pgadmin4:latest
-    container_name: pgadmin
-    restart: unless-stopped
-    volumes:
-      - data:/var/lib/pgadmin
-      - ./pgadmin_servers.json:/servers.json:ro
-    ports:
-      - 5050:5050
-    environment:
-      - PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL}
-      - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD}
-      - PGADMIN_LISTEN_ADDRESS=0.0.0.0
-      - PGADMIN_LISTEN_PORT=5050
-      - PGADMIN_SERVER_JSON_FILE=/servers.json
-      - PGADMIN_DISABLE_POSTFIX=true
-    networks:
-      iot:
-        ipv4_address: 172.30.0.5
-    depends_on:
-      - db
-    logging:
-      options:
-        max-size: 10m
-
   swagger:
     image: swaggerapi/swagger-ui
     container_name: swagger