diff --git a/defaults/main.yml b/defaults/main.yml
index deeaad9..d4ea227 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -14,7 +14,8 @@ droneci_agent_restart_policy: always
 
 droneci_postgres_enabled: False
 droneci_postgres_ssl_mode: disable
-droneci_postgres_server: postgres.example.com:5432
+droneci_postgres_server: postgres.example.com
+droneci_postgres_port: 5432
 droneci_postgres_superuser: postgres
 droneci_postgres_password: secure
 
@@ -28,7 +29,7 @@ droneci_postgres_db:
   login_user: "{{ droneci_postgres_superuser }}"
   login_password: "{{ droneci_postgres_password }}"
   # login_unix_socket: # defaults to not set
-  port: "{{ droneci_postgres_server | urlsplit('port') }}"
+  port: "{{ droneci_postgres_server }}"
   # owner: # defaults to not set
   state: present
 
@@ -43,7 +44,7 @@ droneci_postgres_user:
   login_user: "{{ droneci_postgres_superuser }}"
   login_password: "{{ droneci_postgres_password }}"
   # login_unix_socket: # defaults to not set
-  port: "{{ droneci_postgres_server | urlsplit('port') }}"
+  port: "{{ droneci_postgres_server }}"
   state: present
 
 droneci_gitea_enabled: False
diff --git a/tasks/prepare.yml b/tasks/prepare.yml
index 141e0e1..2c80b47 100644
--- a/tasks/prepare.yml
+++ b/tasks/prepare.yml
@@ -47,5 +47,5 @@
         state: "{{ droneci_postgres_user.state | default('present') }}"
       no_log: True
       when: droneci_postgres_user is defined
-  delegate_to: "{{ droneci_postgres_server | urlsplit('hostname') }}"
+  delegate_to: "{{ droneci_postgres_server }}"
   when: droneci_postgres_enabled