diff --git a/{{cookiecutter.project_slug}}/docker-compose.shared.admin.yml b/{{cookiecutter.project_slug}}/docker-compose.shared.admin.yml
index 74bcedd5a6..57d6d8e65f 100644
--- a/{{cookiecutter.project_slug}}/docker-compose.shared.admin.yml
+++ b/{{cookiecutter.project_slug}}/docker-compose.shared.admin.yml
@@ -11,6 +11,11 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
   flower:
-    image: totem/celery-flower-docker
+    image: mher/flower
     env_file:
       - env-flower.env
+    command:
+      - "--broker=amqp://guest@queue:5672//"
+      # For the "Broker" tab to work in the flower UI, uncomment the following command argument,
+      # and change the queue service's image as described in docker-compose.shared.base-images.yml
+      # - "--broker_api=http://guest:guest@queue:15672/api//"
diff --git a/{{cookiecutter.project_slug}}/docker-compose.shared.base-images.yml b/{{cookiecutter.project_slug}}/docker-compose.shared.base-images.yml
index 7123eaa8b4..27caf8c401 100644
--- a/{{cookiecutter.project_slug}}/docker-compose.shared.base-images.yml
+++ b/{{cookiecutter.project_slug}}/docker-compose.shared.base-images.yml
@@ -4,3 +4,7 @@ services:
     image: postgres:11
   queue:
     image: rabbitmq:3
+    # Using the below image instead is required to enable the "Broker" tab in the flower UI:
+    # image: rabbitmq:3-management
+    #
+    # You also have to change the flower command as documented in docker-compose.shared.admin.yml
diff --git a/{{cookiecutter.project_slug}}/env-flower.env b/{{cookiecutter.project_slug}}/env-flower.env
index f1bb0b8910..438f924eaa 100644
--- a/{{cookiecutter.project_slug}}/env-flower.env
+++ b/{{cookiecutter.project_slug}}/env-flower.env
@@ -1,3 +1 @@
 FLOWER_BASIC_AUTH={{cookiecutter.flower_auth}}
-AMQP_ADMIN_HOST=queue
-AMQP_HOST=queue