diff --git a/doc/docker/development/docker-compose.yml b/doc/docker/development/docker-compose.yml
index eeaa23f0ef..77f7fab2ab 100644
--- a/doc/docker/development/docker-compose.yml
+++ b/doc/docker/development/docker-compose.yml
@@ -271,6 +271,21 @@ services:
     depends_on:
       - mongo
 
+  # phpMyAdmin
+  phpmyadmin:
+    restart: unless-stopped
+    image: phpmyadmin
+    container_name: phpmyadmin
+    hostname: phpmyadmin
+    # pre 20.1 installs run MariaDB on the host and need to pass the socket (to use egroupware user and it's password only valid on localhost)
+    #volumes:
+    #  - /var/run/mysqld/mysqld.sock:/tmp/mysql.sock
+    environment:
+      # PMA_HOST: use localhost, if you use a socket (pre 20.1 install) or db for 20.1+ installations
+      - PMA_HOST=db
+      # phpMyAdmin needs the full URL incl. protocol, domain, path and a trailing slash!
+      - PMA_ABSOLUTE_URI=http://localhost/phpmyadmin/
+
   # Portainer: Docker GUI (needs to be enabled in nginx.conf too!)
 #   portainer:
 #    image: portainer/portainer
diff --git a/doc/docker/development/nginx.conf b/doc/docker/development/nginx.conf
index 41567f1949..3fb22aa76f 100644
--- a/doc/docker/development/nginx.conf
+++ b/doc/docker/development/nginx.conf
@@ -170,6 +170,16 @@ server {
 		proxy_set_header Host $http_host;
 	}
 
+	# phpMyAdmin
+	location /phpmyadmin/ {
+		proxy_pass http://phpmyadmin/;
+		#include proxy_params;
+		proxy_read_timeout    60m;
+		proxy_http_version 1.1;
+		proxy_set_header Upgrade $http_upgrade;
+		proxy_set_header Connection "Upgrade";
+	}
+
     # Portainer: Docker GUI (needs to be enabled in docker-compose.yml too!)
     #location /portainer/ {
     #    proxy_pass http://portainer:9000/;