diff --git a/dev/proxy.yml b/dev/proxy.yml
index 8df84cb..bd011b8 100644
--- a/dev/proxy.yml
+++ b/dev/proxy.yml
@@ -5,7 +5,8 @@
     - host_vars/proxy.yml
   roles:
     - base
+    - postgresql
     - proxy
     - docker
-    - bitwarden
     - gitea
+    - bitwarden
diff --git a/roles/gitea/defaults/main.yml b/roles/gitea/defaults/main.yml
index 083f2e9..d9808e1 100644
--- a/roles/gitea/defaults/main.yml
+++ b/roles/gitea/defaults/main.yml
@@ -3,6 +3,8 @@ gitea_name: gitea
 gitea_sshport: "222"
 gitea_webport: "3000"
 gitea_volume: "{{ gitea_name }}"
+gitea_rooturl: "http://{{ gitea_domain }}"
+gitea_signup: true
 
 # database settings
 gitea_dbtype: postgres
diff --git a/roles/gitea/tasks/main.yml b/roles/gitea/tasks/main.yml
index 7dffc56..fbb807e 100644
--- a/roles/gitea/tasks/main.yml
+++ b/roles/gitea/tasks/main.yml
@@ -3,6 +3,16 @@
     path: "{{ gitea_root }}"
     state: directory
 
+- name: Create gitea database
+  postgresql_db:
+    name: "{{ gitea_dbname }}"
+
+- name: Create gitea database user
+  postgresql_user:
+    db: "{{ gitea_dbname }}"
+    name: "{{ gitea_dbuser }}"
+    password: "{{ gitea_dbpass }}"
+
 - name: Install Gitea's docker-compose file
   template:
     src: docker-compose.yml.j2
diff --git a/roles/gitea/templates/compose-env.j2 b/roles/gitea/templates/compose-env.j2
index f326b14..bfa1ca5 100644
--- a/roles/gitea/templates/compose-env.j2
+++ b/roles/gitea/templates/compose-env.j2
@@ -1,6 +1,8 @@
 # {{ ansible_managed }}
 gitea_version={{ gitea_version }}
 gitea_name={{ gitea_name }}
+gitea_domain={{ gitea_domain }}
+gitea_rooturl={{ gitea_rooturl }}
 gitea_webport={{ gitea_webport }}
 gitea_sshport={{ gitea_sshport }}
 gitea_dbtype={{ gitea_dbtype }}
@@ -8,3 +10,8 @@ gitea_dbhost={{ gitea_dbhost }}
 gitea_dbname={{ gitea_dbname }}
 gitea_dbuser={{ gitea_dbuser }}
 gitea_dbpass={{ gitea_dbpass }}
+{% if not gitea_signup %}
+gitea_disable_registration=true
+{% else %}
+gitea_disable_registration=false
+{% endif %}
diff --git a/roles/gitea/templates/docker-compose.yml.j2 b/roles/gitea/templates/docker-compose.yml.j2
index 6bd900c..0fb1f29 100644
--- a/roles/gitea/templates/docker-compose.yml.j2
+++ b/roles/gitea/templates/docker-compose.yml.j2
@@ -5,17 +5,22 @@ services:
     image: "gitea/gitea:${gitea_version}"
     container_name: "${gitea_name}"
     ports:
-      - "${gitea_webport}:3000"
       - "${gitea_sshport}:22"
-      - "127.0.0.1:5432:5432"
+      - "127.0.0.1:${gitea_webport}:3000"
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     environment:
       - USER_UID=1000
       - USER_GID=1000
+      - GITEA__server__ROOT_URL=${gitea_rooturl}
+      - GITEA__server__DOMAIN=${gitea_domain}
+      - GITEA__server__SSH_DOMAIN=${gitea_domain}
       - GITEA__database__DB_TYPE=${gitea_dbtype}
       - GITEA__database__HOST=${gitea_dbhost}
       - GITEA__database__NAME=${gitea_dbname}
       - GITEA__database__USER=${gitea_dbuser}
       - GITEA__database__PASSWD=${gitea_dbpass}
+      - GITEA__service__DISABLE_REGISTRATION=${gitea_disable_registration}
     volumes:
       - {{ gitea_volume }}:/data
       - /etc/timezone:/etc/timezone:ro