diff --git a/development/docker-compose.yaml b/development/docker-compose.yaml
index 48576a1..6fb8689 100644
--- a/development/docker-compose.yaml
+++ b/development/docker-compose.yaml
@@ -1,8 +1,6 @@
 version: "3.9"
 
 volumes:
-  gitea:
-    name: gitea
   kimai:
     name: kimai
   kimai-var:
@@ -15,46 +13,6 @@ networks:
     external: true
 
 services:
-  gitea:
-    image: gitea/gitea
-    container_name: gitea
-    environment:
-      - USER_UID=1000
-      - USER_GID=1000
-      - GITEA__database__DB_TYPE=postgres
-      - GITEA__database__HOST=psql14:5432
-      - GITEA__database__NAME=gitea
-      - GITEA__database__USER=gitea
-      - GITEA__database__PASSWD=sadlkf0234lsdf
-      - GITEA__server__START_SSH_SERVER=true
-      - GITEA__server__SSH_PORT=22
-      - GITEA__server__SSH_LISTEN_PORT=222
-    restart: unless-stopped
-    volumes:
-      - gitea:/data
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
-    networks:
-      - internal
-      - proxy
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.git.entrypoints=web"
-      - "traefik.http.routers.git.rule=Host(`cs-git.ddnss.de`)"
-      - "traefik.http.routers.git.middlewares=git"
-      - "traefik.http.middlewares.git.redirectscheme.scheme=https"
-      - "traefik.http.routers.git-secure.entrypoints=websecure"
-      - "traefik.http.routers.git-secure.rule=Host(`cs-git.ddnss.de`)"
-      - "traefik.http.routers.git-secure.service=git-secure"
-      - "traefik.http.routers.git-secure.tls=true"
-      - "traefik.http.routers.git-secure.tls.certresolver=myresolver"
-      - "traefik.http.routers.git-secure.tls.domains[0].main=cs-git.ddnss.de"
-      - "traefik.http.services.git-secure.loadbalancer.server.port=3000"
-      - "traefik.tcp.routers.git-ssh.entrypoints=ssh"
-      - "traefik.tcp.routers.git-ssh.rule=HostSNI(`*`)"
-      - "traefik.tcp.routers.git-ssh.service=git-ssh"
-      - "traefik.tcp.services.git-ssh.loadbalancer.server.port=222"
-
   nginx-kimai:
     image: nginx:alpine
     container_name: nginx-kimai
diff --git a/gitea/.env b/gitea/.env
new file mode 100644
index 0000000..5130d24
--- /dev/null
+++ b/gitea/.env
@@ -0,0 +1,4 @@
+DB_USER=gitea
+DB_NAME=gitea
+DB_PASS=QseAwSwyq8^AeH#cMby9C7i4
+
diff --git a/gitea/docker-compose.yaml b/gitea/docker-compose.yaml
new file mode 100644
index 0000000..ab4edeb
--- /dev/null
+++ b/gitea/docker-compose.yaml
@@ -0,0 +1,77 @@
+version: "3.9"
+
+volumes:
+  gitea:
+    name: gitea
+  gitea-db:
+    name: gitea-db
+
+networks:
+  proxy:
+    external: true
+  gitea:
+    name: gitea
+    external: false
+
+services:
+  gitea:
+    image: gitea/gitea
+    container_name: gitea
+    hostname: gitea
+    environment:
+      USER_UID: 1000
+      USER_GID: 1000
+      GITEA__database__DB_TYPE: postgres
+      GITEA__database__HOST: gitea-db:5432
+      GITEA__database__NAME: ${DB_NAME}
+      GITEA__database__USER: ${DB_USER}
+      GITEA__database__PASSWD: ${DB_PASS}
+      GITEA__server__START_SSH_SERVER: true
+      GITEA__server__SSH_PORT: 22
+      GITEA__server__SSH_LISTEN_PORT: 222
+    restart: unless-stopped
+    depends_on:
+      - gitea-db
+    volumes:
+      - gitea:/data
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    networks:
+      - proxy
+      - gitea
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.git.entrypoints=web"
+      - "traefik.http.routers.git.rule=Host(`cs-git.ddnss.de`)"
+      - "traefik.http.routers.git.middlewares=git"
+      - "traefik.http.middlewares.git.redirectscheme.scheme=https"
+      - "traefik.http.routers.git-secure.entrypoints=websecure"
+      - "traefik.http.routers.git-secure.rule=Host(`cs-git.ddnss.de`)"
+      - "traefik.http.routers.git-secure.service=git-secure"
+      - "traefik.http.routers.git-secure.tls=true"
+      - "traefik.http.routers.git-secure.tls.certresolver=myresolver"
+      - "traefik.http.routers.git-secure.tls.domains[0].main=cs-git.ddnss.de"
+      - "traefik.http.services.git-secure.loadbalancer.server.port=3000"
+      - "traefik.tcp.routers.git-ssh.entrypoints=ssh"
+      - "traefik.tcp.routers.git-ssh.rule=HostSNI(`*`)"
+      - "traefik.tcp.routers.git-ssh.service=git-ssh"
+      - "traefik.tcp.services.git-ssh.loadbalancer.server.port=222"
+
+  gitea-db:
+    image: postgres:14-alpine
+    container_name: gitea-db
+    hostname: gitea-db
+    restart: unless-stopped
+    volumes:
+      - gitea-db:/var/lib/postgresql/data
+    networks:
+      - gitea
+    environment:
+      POSTGRES_PASSWORD: ${DB_PASS}
+      POSTGRES_USER: ${DB_USER}
+      POSTGRES_DB: ${DB_NAME}
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $DB_USER"]
+
+
+
diff --git a/postgres_databases.sql b/postgres_databases.sql
index 33414fa..882d3f8 100644
--- a/postgres_databases.sql
+++ b/postgres_databases.sql
@@ -1,11 +1,6 @@
 -- create the databases;
-CREATE DATABASE gitea;
-
 CREATE DATABASE mattermost;
 
 -- create users and privileges
-CREATE USER gitea WITH PASSWORD 'sadlkf0234lsdf';
-GRANT ALL PRIVILEGES ON DATABASE gitea TO gitea;
-
 CREATE USER mattermost WITH PASSWORD 'skdr02439spfgojsl';
 GRANT ALL PRIVILEGES ON DATABASE mattermost TO mattermost;