diff --git a/Dockerfile b/Dockerfile
index 3b514165..b869b191 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM maven:3.8.3-eclipse-temurin-17 as builder
+FROM maven:3.8.6-eclipse-temurin-17 as builder
 
 WORKDIR /usr/src/app
 COPY . .
diff --git a/docker-compose.yml b/docker-compose.yml
index 71b90006..57a43948 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,10 +14,11 @@ services:
    - smithereen-media:/uploads
   restart: always
  mysql:
-  image: mysql:5
+  image: mysql:8
   environment:
    MYSQL_ROOT_PASSWORD: smithereen
    MYSQL_DATABASE: smithereen
+   MYSQL_INITDB_SKIP_TZINFO: 1
   networks:
    - internal_network
   healthcheck: