diff --git a/foundry/gitea.values.yaml b/foundry/gitea.values.yaml
index 2390041..e536205 100644
--- a/foundry/gitea.values.yaml
+++ b/foundry/gitea.values.yaml
@@ -99,6 +99,13 @@ gitea:
     server:
       DOMAIN: https://foundry.local/gitea/
       ROOT_URL: https://foundry.local/gitea/
+    database:
+      DB_TYPE: postgres
+      HOST: postgresql:5432
+      NAME: gitea
+      USER: postgres
+      PASSWD: foundry
+      SCHEMA: public
     security:
       PASSWORD_COMPLEXITY: "off"
     repository:
@@ -142,7 +149,7 @@ memcached:
     port: 11211
 
 postgresql:
-  enabled: true
+  enabled: false
   global:
     postgresql:
       postgresqlDatabase: gitea
diff --git a/foundry/setup-foundry b/foundry/setup-foundry
index b1cd556..18991da 100755
--- a/foundry/setup-foundry
+++ b/foundry/setup-foundry
@@ -26,7 +26,7 @@ kubectl create secret tls appliance-cert --key certs/host-key.pem --cert <( cat
 # Install PostgreSQL and pgAdmin4
 helm repo add bitnami https://charts.bitnami.com/bitnami
 helm repo add runix https://helm.runix.net/
-helm install -f postgresql.values.yaml postgresql bitnami/postgresql
+helm install --wait -f postgresql.values.yaml postgresql bitnami/postgresql
 #helm install -f pgadmin4.values.yaml pgadmin4 runix/pgadmin4
 
 # Install code-server (browser-based VS Code)
@@ -46,6 +46,7 @@ cp certs/root-ca.pem ../mkdocs/docs/root-ca.crt
 # Install Gitea
 git config --global init.defaultBranch main
 helm repo add gitea https://dl.gitea.io/charts/
+kubectl exec postgresql-0 -- psql 'postgresql://postgres:foundry@localhost' -c 'CREATE DATABASE gitea;'
 helm install -f gitea.values.yaml gitea gitea/gitea
 timeout 5m bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' https://foundry.local/gitea)" != "200" ]]; do sleep 5; done' || false
 ./setup-gitea