diff --git a/docker/docker-compose.development.yml b/docker/docker-compose.development.yml
index acfceba5a..67663e68a 100644
--- a/docker/docker-compose.development.yml
+++ b/docker/docker-compose.development.yml
@@ -7,10 +7,10 @@ services:
     ports:
       - '3306:3306'
     environment:
-      MYSQL_ROOT_PASSWORD: farmos
-      MYSQL_DATABASE: farmos
-      MYSQL_USER: farmos
-      MYSQL_PASSWORD: farmos
+      MYSQL_ROOT_PASSWORD: farm
+      MYSQL_DATABASE: farm
+      MYSQL_USER: farm
+      MYSQL_PASSWORD: farm
 
   www:
     depends_on:
diff --git a/docker/docker-compose.override.postgis.yml b/docker/docker-compose.override.postgis.yml
index 9261cce5f..eb77f65f6 100644
--- a/docker/docker-compose.override.postgis.yml
+++ b/docker/docker-compose.override.postgis.yml
@@ -7,5 +7,5 @@ services:
     ports:
       - '5432:5432'
     environment:
-      POSTGRES_USER: farmos
-      POSTGRES_PASSWORD: farmos
+      POSTGRES_USER: farm
+      POSTGRES_PASSWORD: farm