diff --git a/public/v4/apps/pgadmin4.yml b/public/v4/apps/pgadmin4.yml
index eac67b7..fd63860 100644
--- a/public/v4/apps/pgadmin4.yml
+++ b/public/v4/apps/pgadmin4.yml
@@ -1,25 +1,37 @@
 captainVersion: 4
 services:
     $$cap_appname:
-        image: thajeztah/pgadmin4:$$cap_pgadmin4_version
+        image: dpage/pgadmin4:$$cap_pgadmin4_version
         restart: always
+        environment:
+            PGADMIN_DEFAULT_EMAIL: $$cap_email
+            PGADMIN_DEFAULT_PASSWORD: $$cap_password
         volumes:
-            - $$cap_appname-data:/pgadmin
-        caproverExtra:
-            containerHttpPort: '5050'
+            - $$cap_appname-data:/var/lib/pgadmin
 caproverOneClickApp:
     variables:
         - id: $$cap_pgadmin4_version
           label: Version Tag
-          description: Check out their Docker page for the valid tags https://hub.docker.com/r/thajeztah/pgadmin4/tags/
-          defaultValue: '3.6'
+          description: Check out their Docker page for the valid tags https://hub.docker.com/r/dpage/pgadmin4/tags/
+          defaultValue: '4.27'
+          validRegex: /^([^\s^\/])+$/
+        - id: $$cap_email
+          label: Email
+          description: Email address used when setting up the initial administrator account to login to pgAdmin
+          defaultValue: ''
+          validRegex: /^([^\s^\/])+$/
+        - id: $$cap_password
+          label: Password
+          description: Password used when setting up the initial administrator account to login to pgAdmin
+          defaultValue: $$cap_gen_random_hex(10)
           validRegex: /^([^\s^\/])+$/
     instructions:
         start: >-
             pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.
 
               Enter your Configuration parameters and click on next. It will take about a minute for the process to finish.
-        end: pgAdmin is deployed and available as $$cap_appname
+        end: You pgAdmin is deployed and being started. Please wait one minute before accessing you pgAdmin!
     displayName: ''
+    isOfficial: true
     description: pgAdmin 4 is a complete rewrite of pgAdmin, built using Python and Javascript/jQuery
-    documentation: 'Taken from https://hub.docker.com/r/thajeztah/pgadmin4 '
+    documentation: 'Taken from https://www.pgadmin.org/docs/pgadmin4/latest/container_deployment.html '