diff --git a/gitea/.env b/gitea/.env
index d905ad9..1731dd1 100644
--- a/gitea/.env
+++ b/gitea/.env
@@ -1,9 +1,7 @@
 BASE_URL=git.
 EMAIL=
 POSTGRES_PASSWORD=
-
-PUID=1000
-PGID=1000
+SSH_PORT=22     # change this if you already use port 22 for server ssh
 
 POSTGRES_DB=gitea
 POSTGRES_USER=gitea
diff --git a/gitea/compose.yaml b/gitea/compose.yaml
index 0b0e7b3..4bf52a8 100644
--- a/gitea/compose.yaml
+++ b/gitea/compose.yaml
@@ -23,10 +23,13 @@ services:
       - POSTGRES_PASSWORD=$POSTGRES_PASSWORD
 
   gitea:
-    image: docker.io/gitea/gitea:1.21
+    image: docker.io/gitea/gitea:1.21-rootless
     restart: unless-stopped
+    ports:
+      - "$SSH_PORT:2222"
     volumes:
-      - data:/data/
+      - data:/var/lib/gitea/
+      - config:/etc/gitea/
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     environment:
diff --git a/gitea/first_start.sh b/gitea/first_start.sh
new file mode 100755
index 0000000..b2a97d8
--- /dev/null
+++ b/gitea/first_start.sh
@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+[ "$EUID" != 0 ] && {echo "This script need to run as root" >&2; exit 1;}
+
+docker-compose up --no-start --build
+chown -R 1000:1000 /var/lib/docker/volumes/gitea_*
+docker-compose up -d --build