diff --git a/base/Dockerfile b/base/Dockerfile
index 7a390b9b..c75124cf 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -17,14 +17,14 @@ WORKDIR /var/www
 ADD requirements.txt /var/www/requirements.txt
 RUN apk add --no-cache \
     python3=3.8.2-r0 \
-    libstdc++=9.2.0-r3 \
+    libstdc++=9.2.0-r4 \
     mpc1-dev=1.1.0-r1 \
     yajl=2.1.0-r0 \
     libpq=12.2-r0 && \
     ln -s /usr/bin/python3 /usr/bin/python && \
     ln -s /usr/bin/pip3 /usr/bin/pip && \
     apk add --no-cache --virtual .build-deps \
-    g++=9.2.0-r3 \
+    g++=9.2.0-r4 \
     python3-dev=3.8.2-r0 \
     yajl-dev=2.1.0-r0 \
     postgresql-dev=12.2-r0 \
@@ -32,7 +32,7 @@ RUN apk add --no-cache \
     gmp-dev=6.1.2-r1 \
     mpfr-dev=4.0.2-r1 \
     wait4ports=0.2.3-r0 && \
-    pip install pip==20.0.2 setuptools==45.2.0 wheel==0.34.2 && \
+    pip install pip==20.0.2 setuptools==46.1.1 wheel==0.34.2 && \
     pip install --upgrade -r requirements.txt && \
     apk del --no-cache .build-deps && \
     rm -fr /tmp/* /var/cache/apk/* /root/.cache/pip
diff --git a/base/requirements.txt b/base/requirements.txt
index bf939fa7..3dda4fe4 100644
--- a/base/requirements.txt
+++ b/base/requirements.txt
@@ -6,6 +6,7 @@ colorama==0.4.3 # required for structlog
 connexion==2.6.0
 Flask-Opentracing==1.1.0
 Flask==1.1.1
+flower==0.9.3
 gunicorn==20.0.4
 ijson==2.6.1
 iso8601==0.1.12
diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml
index dd43f6ec..72b995ff 100644
--- a/tools/docker-compose.yml
+++ b/tools/docker-compose.yml
@@ -9,6 +9,11 @@ services:
       - psql:/var/lib/postgresql/data
     #ports:
     #- 5432:5432
+    healthcheck:
+      test: pg_isready -q -h db -p 5432 -U postgres
+      interval: 5s
+      timeout: 30s
+      retries: 5
 
   minio:
     image: minio/minio:RELEASE.2017-02-16T01-47-30Z
@@ -42,7 +47,6 @@ services:
       - redis
       - minio
 
-
   # The application server can also setup the database
   db_init:
     image: data61/anonlink-app:${TAG:-latest}
@@ -54,18 +58,6 @@ services:
     depends_on:
       - db
 
-  # The dm admin
-  db_admin:
-    image: dpage/pgadmin4
-    environment:
-      - PGADMIN_DEFAULT_PASSWORD=rX%QpV7Xgyrz
-      - PGADMIN_DEFAULT_EMAIL=brian@thorne.link
-    depends_on:
-      - db
-    ports:
-    - 5050:80
-
-
   # A celery worker
   worker:
     image: data61/anonlink-app:${TAG:-latest}
@@ -98,13 +90,13 @@ services:
       PUBLIC_PORT: 8851
 
 
-  # A celery monitor. Useful for debugging but okay to remain
-  # commented out for deployment. Access via the nginx container with url `/monitor`
+  # A celery monitor. Useful for debugging.
 #  celery_monitor:
-#    image: quay.io/n1analytics/entity-app
+#    image: data61/anonlink-app:${TAG:-latest}
 #    depends_on:
 #      - redis
-#    entrypoint: celery flower -A  entityservice.async_worker --basic_auth=n1:paillier --url_prefix=/ --port=8888 -Q celery,compute
+#      - worker
+#    command: celery flower -A entityservice.async_worker
 #    ports:
 #      - 8888:8888