diff --git a/galaxy.yml b/galaxy.yml
index 762f0bf..f0c0778 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -8,6 +8,6 @@ readme: README.md
 repository: https://git.uumas.fi/uumas/ansible-docker
 license_file: LICENSE
 dependencies:
-  uumas.general: '>=0.5.5'
+  uumas.general: '>=0.5.8'
 authors:
   - uumas
diff --git a/roles/container/defaults/main.yml b/roles/container/defaults/main.yml
index 19edc13..cf6a33d 100644
--- a/roles/container/defaults/main.yml
+++ b/roles/container/defaults/main.yml
@@ -4,4 +4,7 @@ docker_host_user: false
 docker_volume_type: named
 docker_mariadb_config: {}
 
+docker_phpmyadmin_basicauth: true
+docker_phpmyadmin_basicauth_users: {}
+
 timezone: Etc/UTC
diff --git a/roles/container/meta/argument_specs.yml b/roles/container/meta/argument_specs.yml
index 696d638..ab6c6b5 100644
--- a/roles/container/meta/argument_specs.yml
+++ b/roles/container/meta/argument_specs.yml
@@ -58,6 +58,16 @@ argument_specs:
         choices:
           - memcached
         default: []
+      docker_phpmyadmin_basicauth:
+        description: Whether to enable basicauth for phpmyadmin
+        type: bool
+        required: false
+        default: true
+      docker_phpmyadmin_basicauth_users:
+        description: Dict of users and their password hashes for phpmyadmin basic auth. Required if docker_phpmyadmin_basicauth is true and phpmyadmin is used.
+        type: dict
+        required: false
+        default: {}
 
       docker_volume_type:
         description: "Defines whether to use named volumes or bind mounts for mounts with name"
diff --git a/roles/container/tasks/proxy.yml b/roles/container/tasks/proxy.yml
index c2de1b5..12c2862 100644
--- a/roles/container/tasks/proxy.yml
+++ b/roles/container/tasks/proxy.yml
@@ -30,4 +30,6 @@
     vhost_id: "{{ docker_service_name }}_phpmyadmin"
     vhost_domains: "{{ docker_vhost_domains[docker_service_name + '_phpmyadmin'] }}"
     proxy_target_port: "{{ ports[docker_service_name]['phpmyadmin'] }}"
+    vhost_basicauth: "{{ docker_phpmyadmin_basicauth }}"
+    vhost_basicauth_users: "{{ docker_phpmyadmin_basicauth_users }}"
   when: docker_database == 'mariadb' and ports[docker_service_name]['phpmyadmin'] is defined