diff --git a/bundles/gitea/files/app.ini b/bundles/gitea/files/app.ini
index 96c0681..3517aa1 100644
--- a/bundles/gitea/files/app.ini
+++ b/bundles/gitea/files/app.ini
@@ -30,10 +30,10 @@ LANDING_PAGE = explore
 
 [database]
 DB_TYPE = postgres
-HOST = ${database.get('host', 'localhost')}:5432
-NAME = ${database['database']}
-USER = ${database['username']}
-PASSWD = ${database['password']}
+HOST = ${database.get('host')}:${database.get('port')}
+NAME = ${database.get('database')}
+USER = ${database.get('username')}
+PASSWD = ${database.get('password')}
 SSL_MODE = disable
 LOG_SQL = false
 
diff --git a/bundles/gitea/metadata.py b/bundles/gitea/metadata.py
index 4d504d2..3aa21e9 100644
--- a/bundles/gitea/metadata.py
+++ b/bundles/gitea/metadata.py
@@ -1,6 +1,8 @@
 defaults = {
     'gitea': {
         'database': {
+            'host': 'localhost',
+            'port': '5432',
             'username': 'gitea',
             'password': repo.vault.password_for('{} postgresql gitea'.format(node.name)),
             'database': 'gitea',