diff --git a/gitea/defaults.yaml b/gitea/defaults.yaml
index fa10f0d..94addaf 100644
--- a/gitea/defaults.yaml
+++ b/gitea/defaults.yaml
@@ -8,6 +8,21 @@ gitea:
   config_owner: 'gitea'
   config_group: 'gitea'
   config_mode: 0644
-  config: {}
   service_name: 'gitea'
   service_enabled: True
+
+  # App configuration defaults
+  config:
+    app_name: 'Gitea: Git with a cup of tea'
+    run_user: 'git'
+    run_mode: 'prod'
+    server:
+      domain: 'localhost'
+      http_address: '127.0.0.1'
+      http_port: '3000'
+      app_url: 'http://localhost:3000/'
+      disable_ssh: False
+      ssh_domain: "%(DOMAIN)s"
+      ssh_port: 22
+      offline_mode: False
+      app_data_path: '/var/db/gitea/data'
diff --git a/gitea/files/app.ini.jinja b/gitea/files/app.ini.jinja
index 720d07f..a71d563 100644
--- a/gitea/files/app.ini.jinja
+++ b/gitea/files/app.ini.jinja
@@ -22,9 +22,9 @@
 # If you'd rather use the web-based installer, remove this conf/app.ini file
 # and make /usr/local/etc/gitea/conf writeable to the git user.
 
-APP_NAME = Gitea: Git with a cup of tea
-RUN_USER = git
-RUN_MODE = prod
+APP_NAME = {{ gitea.app_name }}
+RUN_USER = {{ gitea.run_user }}
+RUN_MODE = {{ gitea.run_mode }}
 
 [database]
 DB_TYPE  = sqlite3
@@ -73,15 +73,15 @@ PROVIDER = file
 PROVIDER_CONFIG = /var/db/gitea/data/sessions
 
 [server]
-DOMAIN       = localhost
-HTTP_ADDR    = 127.0.0.1
-HTTP_PORT    = 3000
-ROOT_URL     = http://localhost:3000/
-DISABLE_SSH  = false
-SSH_DOMAIN   = %(DOMAIN)s
-SSH_PORT     = 22
-OFFLINE_MODE = false
-APP_DATA_PATH = /var/db/gitea/data
+DOMAIN       = {{ gitea.server.domain }}
+HTTP_ADDR    = {{ gitea.server.http_address }}
+HTTP_PORT    = {{ gitea.server.http_port }}
+ROOT_URL     = {{ gitea.server.app_url }}
+DISABLE_SSH  = {{ gitea.server.disable_ssh }}
+SSH_DOMAIN   = {{ gitea.server.ssh_domain }}
+SSH_PORT     = {{ gitea.server.ssh_port }}
+OFFLINE_MODE = {{ gitea.server.offline_mode }}
+APP_DATA_PATH = {{ gitea.server.app_data_path }}
 
 [service]
 REGISTER_EMAIL_CONFIRM = false