diff --git a/5.7/Dockerfile b/5.7/Dockerfile
index 4e2275c..becd7a8 100644
--- a/5.7/Dockerfile
+++ b/5.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM mysql:5.7.37@sha256:66480693e01295d85954bb5dbe2f41f29ebceb57d3d8098ea0c9d201473f2d8b
+FROM mysql:5.7.37@sha256:1520c2db1591b37fc7f2c0bc72b4e0a002afed6fcc2397f7bcd2bbdff490c930
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/8.0/Dockerfile b/8.0/Dockerfile
index 853fe17..fb80093 100644
--- a/8.0/Dockerfile
+++ b/8.0/Dockerfile
@@ -1,12 +1,24 @@
-FROM mysql:8.0.28@sha256:92d27b8222bbcf53bc42c70ca7cd1010d6c0527efc61f14980ce77c50932bef4
+FROM mysql:8.0.40-bookworm@sha256:49b84fc5916192e766f6879127d4d871e7101e73bd15ca63df4c1d5ba6d08946
 
 ENV DEBIAN_FRONTEND noninteractive
 
 ENV TZ=Europe/Berlin
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-RUN apt-get update \
- && apt-get install --no-install-recommends -y \
+ARG MYSQL_APT_CONFIG_DEB_URL='https://dev.mysql.com/get/mysql-apt-config_0.8.33-1_all.deb'
+ARG MYSQL_APT_CONFIG_DEB_SHA256='sha256:455ec3690765cff58a4123ba498921fb58fb76c46465e9659180848e997452b6'
+
+ADD --checksum=$MYSQL_APT_CONFIG_DEB_SHA256 $MYSQL_APT_CONFIG_DEB_URL /root/mysql-apt-config.deb
+
+RUN # mysql-apt-config fails if this directory does not already exist: \
+    mkdir -p /etc/apt/sources.list.d \
+    && dpkg -i /root/mysql-apt-config.deb \
+    && rm /root/mysql-apt-config.deb \
+    && apt '--option=APT::Acquire::Retries="3"' update \
+    && apt '--option=APT::Acquire::Retries="3"' install --no-install-recommends -y locales \
+   && rm -rf /var/lib/apt/lists/*
+RUN apt update \
+ && apt install --no-install-recommends -y \
   locales \
  && rm -rf /var/lib/apt/lists/*
 
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 22acc06..9d94256 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -1,6 +1,9 @@
 steps:
   - name: 'gcr.io/cloud-builders/docker'
-    args: ['build', '-t', 'eu.gcr.io/shopware-179114/mysql:5.7', '.']
+    args: ['build', '-t', 'europe-west3-docker.pkg.dev/shopware-179114/sw6-demo-shops/mysql:5.7', '.']
     dir: '5.7'
+  - name: 'gcr.io/cloud-builders/docker'
+    args: ['build', '-t', 'europe-west3-docker.pkg.dev/shopware-179114/sw6-demo-shops/mysql:8.0', '.']
+    dir: '8.0'
 images:
   - 'eu.gcr.io/shopware-179114/mysql:5.7'