diff --git a/docker-compose.local.dev.yml b/docker-compose.local.dev.yml
index 5979cfd53..ec1a70393 100644
--- a/docker-compose.local.dev.yml
+++ b/docker-compose.local.dev.yml
@@ -12,7 +12,7 @@ services:
     environment:
       MYSQL_DATABASE: datacite
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
-    image: mysql:5.7
+    image: mysql:8.0
     ports:
       - "3309:3306"
     networks:
diff --git a/docker-compose.yml b/docker-compose.yml
index 5e49097f9..6c5a37f3e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     env_file: .env
     environment:
       - ELASTIC_PASSWORD=changeme
-    image: ghcr.io/datacite/lupo
+    image: ghcr.io/datacite/lupo:main
     ports:
       - "8065:80"
       - "2265:22"
@@ -29,7 +29,7 @@ services:
     environment:
       MYSQL_DATABASE: datacite
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
-    image: mysql:5.7
+    image: mysql:8
     ports:
       - "3309:3306"
     networks: