diff --git a/group_vars/pgadmin4/plain.yml b/group_vars/pgadmin4/plain.yml
new file mode 100644
index 0000000..457596b
--- /dev/null
+++ b/group_vars/pgadmin4/plain.yml
@@ -0,0 +1,4 @@
+---
+
+hetzner_server_type: cx11
+hetzner_server_labels: "stage={{ stage }} service=pgadmin4"
diff --git a/group_vars/stage_dev/plain.yml b/group_vars/stage_dev/plain.yml
index 32805bb..adc87b5 100644
--- a/group_vars/stage_dev/plain.yml
+++ b/group_vars/stage_dev/plain.yml
@@ -16,6 +16,7 @@ shared_service_iam_ip: "10.0.0.13"
 shared_service_keycloak_ip: "10.0.0.6"
 shared_service_mail_ip: "10.0.0.8"
 shared_service_maria_ip: "10.0.0.11"
+shared_service_pgadmin_ip: "10.0.0.19"
 shared_service_pg_master_ip: "10.0.0.17"
 shared_service_pg_slave_ip: "10.0.0.18"
 shared_service_webdav_ip: "10.0.0.16"
@@ -26,6 +27,7 @@ shared_service_iam_hostname: "dev-iam-01.smardigo.digital"
 shared_service_keycloak_hostname: "dev-keycloak-01.smardigo.digital"
 shared_service_mail_hostname: "dev-mail-01.smardigo.digital"
 shared_service_maria_hostname: "dev-maria-01.smardigo.digital"
+shared_service_pgadmin_hostname: "dev-pgadmin4-01.smardigo.digital"
 shared_service_pg_master_hostname: "dev-postgres-01.smardigo.digital"
 shared_service_pg_slave_hostname: "dev-postgres-02.smardigo.digital"
 shared_service_webdav_hostname: "dev-webdav-01.smardigo.digital"
@@ -61,6 +63,10 @@ shared_service_hosts: [
     ip: "{{ shared_service_maria_ip }}",
     name: "{{ shared_service_maria_hostname }}"
   },
+  {
+    ip: "{{ shared_service_pgadmin_ip }}",
+    name: "{{ shared_service_pgadmin_hostname }}"
+  },
   {
     ip: "{{ shared_service_pg_master_ip }}",
     name: "{{ shared_service_pg_master_hostname }}"
@@ -199,16 +205,6 @@ webdav_extra_hosts: [
     ip: "{{ shared_service_pg_master_ip }}",
   },
 ]
-pgadmin_extra_hosts: [
-  {
-    hostname: "{{ shared_service_pg_master_hostname }}",
-    ip: "{{ shared_service_pg_master_ip }}",
-  },
-  {
-    hostname: "{{ shared_service_pg_slave_hostname }}",
-    ip: "{{ shared_service_pg_slave_ip }}",
-  }
-]
 
 smardigo_management_url: "{{ http_s }}://{{ management_service_connect_hostname }}/api/v1/scopes/{{ scope_id }}/processes/{{ process_instance_id }}/messages"
 smardigo_management_token: "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiZGlyIn0..rCRO1cVFgkyZ45D5cJNK5g.fc6JVOo5ja5sqe-0PQTfJGOivJ6tyiD-rwgY6rXJ3-U.tOgqgJ2zTjB3_M9BGtvVjQ"
diff --git a/roles/pgadmin4/vars/main.yml b/roles/pgadmin4/vars/main.yml
index 5f50337..b4ad884 100644
--- a/roles/pgadmin4/vars/main.yml
+++ b/roles/pgadmin4/vars/main.yml
@@ -24,10 +24,10 @@ pgadmin4_docker: {
       image_name: "{{ pgadmin4_image_name }}",
       image_version: "{{ pgadmin4_image_version }}",
       labels: [
-        '"traefik.enable=true"',
+        '"traefik.enable=true"',   
         '"traefik.http.routers.{{ pgadmin_id }}.service={{ pgadmin_id }}"',
         '"traefik.http.routers.{{ pgadmin_id }}.rule=Host(`{{ stage_server_domain }}`)"',
-        '"traefik.http.routers.{{ pgadmin_id }}.entrypoints=admin-postgres"',
+        '"traefik.http.routers.{{ pgadmin_id }}.entrypoints=websecure"',
         '"traefik.http.routers.{{ pgadmin_id }}.tls=true"',
         '"traefik.http.routers.{{ pgadmin_id }}.tls.certresolver=letsencrypt"',
         '"traefik.http.services.{{ pgadmin_id }}.loadbalancer.server.port={{ http_port }}"',
diff --git a/smardigo.yml b/smardigo.yml
index 04f3973..9cca384 100644
--- a/smardigo.yml
+++ b/smardigo.yml
@@ -28,6 +28,8 @@
       when: "'harbor' in group_names"
     - role: elastic
       when: "'elastic' in group_names"
+    - role: pgadmin4
+      when: "'pgadmin4' in group_names"
     - role: postgres
       when: "'postgres' in group_names"
     - role: prometheus
diff --git a/stage-dev b/stage-dev
index 51aea64..f774ef6 100644
--- a/stage-dev
+++ b/stage-dev
@@ -24,6 +24,9 @@ dev-maria-01
 [postfix]
 dev-mail-01
 
+[pgadmin4]
+dev-pgadmin4-01
+
 [postgres]
 dev-postgres-01
 dev-postgres-02
@@ -42,6 +45,7 @@ harbor
 iam
 keycloak
 maria
+pgadmin4
 postfix
 postgres
 prometheus
diff --git a/templates/traefik/traefik.toml.j2 b/templates/traefik/traefik.toml.j2
index 1805b3f..dc7070f 100644
--- a/templates/traefik/traefik.toml.j2
+++ b/templates/traefik/traefik.toml.j2
@@ -45,13 +45,6 @@
       to = "service-portainer"
       scheme = "https"
 
-  ### postgres admin service for the host ###
-  [entryPoints.admin-postgres]
-    address = ":{{ service_port_pgadmin }}"
-    [entryPoints.admin-postgres.http.redirections.entryPoint]
-      to = "admin-postgres"
-      scheme = "https"
-
   ### mysql admin service for the host ###
   [entryPoints.admin-mysql]
     address = ":{{ service_port_phpmyadmin }}"