diff --git a/docker-compose.yml b/docker-compose.yml
index 21702fa..2060866 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -152,6 +152,7 @@ services:
     gitea:
         image: docker.gitea.com/gitea:1.25.4-rootless
         container_name: "${GITEA_HOST}"
+        entrypoint: ["/usr/bin/dumb-init", "--", "/etc/gitea/entrypoint.sh"]
         networks:
             - app-network
         environment:
@@ -169,6 +170,7 @@ services:
         volumes:
             - ./gitea/data:/var/lib/gitea
             - ./gitea/config:/etc/gitea
+            - ./gitea/entrypoint.sh:/etc/gitea/entrypoint.sh:ro
             - /etc/timezone:/etc/timezone:ro
             - /etc/localtime:/etc/localtime:ro
         ports:
diff --git a/gitea/entrypoint.sh b/gitea/entrypoint.sh
new file mode 100755
index 0000000..a6b23e9
--- /dev/null
+++ b/gitea/entrypoint.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+# Generate app.ini from template if it doesn't already exist
+if [ ! -f /etc/gitea/app.ini ]; then
+    cp /etc/gitea/app.ini.template /etc/gitea/app.ini
+    echo "Generated app.ini from template"
+fi
+
+exec /usr/local/bin/docker-entrypoint.sh "$@"