diff --git a/apps/pocketbase/.env b/apps/pocketbase/.env
index 962517a1..b01434aa 100644
--- a/apps/pocketbase/.env
+++ b/apps/pocketbase/.env
@@ -1,18 +1,25 @@
-W9_REPO=spectado/pocketbase
-W9_DIST=community
-W9_VERSION=latest
+W9_REPO=elestio/pocketbase
+W9_DIST='community'
+W9_VERSION='latest'
+W9_POWER_PASSWORD='Ts3bAF2#oQ8TqK1X'
+W9_HTTP_PORT_SET='9001'
 
-W9_POWER_PASSWORD=1PrMxExC45LsCT
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_ID='pocketbase'
+W9_HTTP_PORT=8090
+W9_URL='internet_ip:$W9_HTTP_PORT'
+W9_NETWORK=websoft9
+# Admin user must is email
+W9_LOGIN_USER=admin@yourdomain.com
+W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
+W9_ADMIN_PATH="/_/"
 
-W9_HTTP_PORT_SET=9001
 
-#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+#### ----------------------------------------------------------------------------------------- ####
 
-W9_ID=pocketbase
-W9_HTTP_PORT=80
-W9_ADMIN_PATH="_/"
+# More environments of pocketbase: https://dockerhub.websoft9.com/r/elestio/pocketbase
+
+EMAIL=$W9_LOGIN_USER
+ADMIN_PASSWORD=your-password
 
-W9_URL=internet_ip:$W9_HTTP_PORT
-W9_NETWORK=websoft9
 
-#### ----------------------------------------------------------------------------------------- ####
diff --git a/apps/pocketbase/Notes.md b/apps/pocketbase/Notes.md
index 1fdbbb29..74562e91 100644
--- a/apps/pocketbase/Notes.md
+++ b/apps/pocketbase/Notes.md
@@ -1,2 +1,5 @@
-# Appname
+# Pocketbase
+
+- Credentials can not used, need to research
+
 ## FAQ
diff --git a/apps/pocketbase/docker-compose.yml b/apps/pocketbase/docker-compose.yml
index bf8378b5..017d0ccb 100644
--- a/apps/pocketbase/docker-compose.yml
+++ b/apps/pocketbase/docker-compose.yml
@@ -1,16 +1,15 @@
-# image: https://hub.docker.com/r/spectado/pocketbase
-
-version: '3.8'
+# image: https://hub.docker.com/r/elestio/pocketbase
 
 services:
-
   pocketbase:
     image: $W9_REPO:$W9_VERSION
     container_name: $W9_ID
+    user: 0:0
     restart: unless-stopped
     ports:
-      - $W9_HTTP_PORT_SET:80
-    env_file: .env
+      - $W9_HTTP_PORT_SET:8090
+    env_file: 
+      - .env
     volumes:
       - pocketbase:/pb_data