diff --git a/.gitignore b/.gitignore
index 9f682e7..4d110d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,11 +23,6 @@ apps/web/*.njsproj
 apps/web/*.sln
 apps/web/*.sw?
 
-apps/web/pnpm-lock.yaml
-apps/web/yarn.lock
-apps/web/package-lock.json
-apps/web/bun.lockb
-
 #SERVER
 apps/server/node_modules
 apps/server/.env
diff --git a/apps/web/package.json b/apps/web/package.json
index 01bc71d..71c2103 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -20,6 +20,7 @@
     "@heroui/code": "2.2.7",
     "@heroui/divider": "^2.2.6",
     "@heroui/dropdown": "2.3.10",
+    "@heroui/form": "^2.1.14",
     "@heroui/image": "^2.2.6",
     "@heroui/input": "2.4.10",
     "@heroui/kbd": "2.2.7",
@@ -27,13 +28,16 @@
     "@heroui/modal": "^2.2.8",
     "@heroui/navbar": "2.2.9",
     "@heroui/progress": "^2.2.7",
-    "@heroui/select": "^2.4.10",
+    "@heroui/select": "2.4.9",
     "@heroui/snippet": "2.2.11",
+    "@heroui/spinner": "^2.2.12",
     "@heroui/switch": "2.2.9",
-    "@heroui/system": "2.4.7",
+    "@heroui/system": "2.4.6",
     "@heroui/table": "^2.2.9",
     "@heroui/theme": "2.4.6",
     "@hookform/resolvers": "^4.0.0",
+    "@react-aria/selection": "3.21.0",
+    "@react-aria/utils": "3.27.0",
     "@react-aria/visually-hidden": "3.8.19",
     "@react-types/shared": "3.27.0",
     "axios": "^1.7.9",
diff --git a/apps/web/src/pages/settings/components/settings-input.tsx b/apps/web/src/pages/settings/components/settings-input.tsx
index 9c0021f..a5d9ebe 100644
--- a/apps/web/src/pages/settings/components/settings-input.tsx
+++ b/apps/web/src/pages/settings/components/settings-input.tsx
@@ -56,10 +56,10 @@ export function SettingsInput({ config, register, watch, error, smtpEnabled }: C
           labelPlacement="outside"
           size="md"
         >
-          <SelectItem key="true" value="true">
+          <SelectItem key="true">
             {t("common.yes")}
           </SelectItem>
-          <SelectItem key="false" value="false">
+          <SelectItem key="false">
             {t("common.no")}
           </SelectItem>
         </Select>
diff --git a/apps/web/src/pages/users-management/components/user-form-modal.tsx b/apps/web/src/pages/users-management/components/user-form-modal.tsx
index ca3acea..e4c48c3 100644
--- a/apps/web/src/pages/users-management/components/user-form-modal.tsx
+++ b/apps/web/src/pages/users-management/components/user-form-modal.tsx
@@ -63,10 +63,10 @@ export function UserFormModal({ isOpen, onClose, modalMode, selectedUser, formMe
                   isInvalid={!!errors.isAdmin}
                   label={t("users.form.role")}
                 >
-                  <SelectItem key="false" value="false">
+                  <SelectItem key="false" >
                     {t("users.form.roleUser")}
                   </SelectItem>
-                  <SelectItem key="true" value="true">
+                  <SelectItem key="true" >
                     {t("users.form.roleAdmin")}
                   </SelectItem>
                 </Select>
diff --git a/docker-compose-dev.yaml b/docker-compose-dev.yaml
index 49935b8..c72afa7 100644
--- a/docker-compose-dev.yaml
+++ b/docker-compose-dev.yaml
@@ -1,19 +1,16 @@
-version: "3.8"
-
 services:
-  
   api:
-    build: ./server
+    build: ./apps/server
     container_name: palmr-api
     depends_on:
       postgres:
         condition: "service_healthy"
       minio:
-        condition: "service_started"
+        condition: "service_healthy"
     environment:
       - PORT=3333
-      - DATABASE_URL=postgresql://palmr:palmr123@localhost:5432/palmr?schema=public
-      - MINIO_ENDPOINT=localhost
+      - DATABASE_URL=postgresql://palmr:palmr123@postgres:5432/palmr?schema=public
+      - MINIO_ENDPOINT=127.0.0.1
       - MINIO_PORT=9000
       - MINIO_USE_SSL=false
       - MINIO_ROOT_USER=palmr
@@ -30,15 +27,11 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
-      start_period: 10s
-    network_mode: "host"
-    extra_hosts:
-      - "postgres:127.0.0.1"
-      - "minio:127.0.0.1"
+      start_period: 30s
 
   web:
     build: 
-      context: ./web
+      context: ./apps/web
       args:
         - VITE_API_URL=http://localhost:3333
     container_name: palmr-web
@@ -65,15 +58,15 @@ services:
     command: server /data --console-address ":9001"
     volumes:
       - minio_data:/data
+    ports:
+      - "9000:9000"
+      - "9001:9001"
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/ready"]
       interval: 10s
       timeout: 5s
       retries: 5
-    ports:
-      - "9000:9000"
-      - "9001:9001"
 
   minio-init:
     image: minio/mc:latest
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 4852834..78cebfe 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,7 +1,4 @@
-version: "3.8"
-
 services:
-  
   api:
     image: kyantech/palmr-api:v1-beta
     container_name: palmr-api