diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3aa4cc56b5d0fc3a3c55d8ee255ad136976f3303..f548dbb1598a8ef41fc98ef9481d7d29e392f0c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -131,6 +131,7 @@ test_api:
     DATABASE_URL: "postgresql://postgres@postgres/postgres"
     FUNKWHALE_URL: "https://funkwhale.ci"
     DJANGO_SETTINGS_MODULE: config.settings.local
+    POSTGRES_HOST_AUTH_METHOD: trust
   only:
     - branches
   before_script:
diff --git a/changes/notes.rst b/changes/notes.rst
index 754d60f30f0a1f6d1efd7fe9255aa0985ee6dc63..63bb1e10c83112f0d07af0724ec66ad5b6c36f87 100644
--- a/changes/notes.rst
+++ b/changes/notes.rst
@@ -56,3 +56,12 @@ from the server CLI. Typical use cases include:
 All user-related commands are available under the ``python manage.py fw users`` namespace.
 Please refer to the `Admin documentation <https://docs.funkwhale.audio/admin/commands.html#user-management>`_ for
 more information and instructions.
+
+Postgres docker changed environment variable [manual action required, docker only]
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If you're running with docker and our multi-container setup, there was a breaking change starting in the 11.7 postgres image (https://github.com/docker-library/postgres/pull/658)
+
+You need to add this to your .env file: ``POSTGRES_HOST_AUTH_METHOD=trust``
+
+Newer deployments aren't affected.
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index b98555ef20b030b7c2a4792c0dd2c9b3512faf16..b895f4ff6ad5141d0f66b148c0ac15036326dade 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     networks:
       - default
     env_file: .env
+    environment:
+      - "POSTGRES_HOST_AUTH_METHOD=trust"
     image: postgres:11
     volumes:
       - ./data/postgres:/var/lib/postgresql/data
diff --git a/dev.yml b/dev.yml
index a01b2ee0c497e2551a4b74e88a4ba1f56ff2994f..7ae73a51a1e3a5e8d07f07284074563d1a194c4a 100644
--- a/dev.yml
+++ b/dev.yml
@@ -23,6 +23,8 @@ services:
       - .env.dev
       - .env
     image: postgres:${POSTGRES_VERSION-11}
+    environment:
+      - "POSTGRES_HOST_AUTH_METHOD=trust"
     command: postgres ${POSTGRES_ARGS-}
     volumes:
       - "./data/${COMPOSE_PROJECT_NAME-node1}/postgres:/var/lib/postgresql/data"