diff --git a/run.sh b/run.sh
index a670a3b..40ffc6f 100644
--- a/run.sh
+++ b/run.sh
@@ -54,8 +54,16 @@ echo ""
 echo "[STEP] Starting containers..."
 docker compose up -d
 
+echo "[STEP] Waiting for Gitea to become ready..."
+docker exec -u git gitea-server mkdir -p /data/git/repositories
+until docker exec -u git gitea-server gitea doctor check >/dev/null 2>&1
+do
+    echo "Waiting for Gitea..."
+    sleep 5
+done
+
 echo "[STEP] Creating admin user..."
-docker exec -u git -it gitea-server gitea admin user create \
+docker exec -u git gitea-server gitea admin user create \
   --username "$GITEA_ROOT_USER" \
   --password "$GITEA_ROOT_PASSWORD" \
   --email "$GITEA_ROOT_EMAIL" \