diff --git a/5/debian11/5.7/Dockerfile b/5/debian11/5.7/Dockerfile
index ae48e5c..ac6ff2a 100644
--- a/5/debian11/5.7/Dockerfile
+++ b/5/debian11/5.7/Dockerfile
@@ -49,7 +49,7 @@ RUN set -eux; \
 
 RUN set -eux; \
 # gpg: key 3A79BD29: public key "MySQL Release Engineering <mysql-build@oss.oracle.com>" imported
-	key='859BE8D7C586F538430B19C2467B942D3A79BD29'; \
+	key='B7B3B788A8D3785C'; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
 	mkdir -p /etc/apt/keyrings; \
diff --git a/8/debian11/8.0/Dockerfile b/8/debian11/8.0/Dockerfile
index d360162..d1aa0f0 100644
--- a/8/debian11/8.0/Dockerfile
+++ b/8/debian11/8.0/Dockerfile
@@ -49,7 +49,7 @@ RUN set -eux; \
 
 RUN set -eux; \
 # gpg: key 3A79BD29: public key "MySQL Release Engineering <mysql-build@oss.oracle.com>" imported
-	key='859BE8D7C586F538430B19C2467B942D3A79BD29'; \
+	key='B7B3B788A8D3785C'; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
 	mkdir -p /etc/apt/keyrings; \
@@ -58,8 +58,8 @@ RUN set -eux; \
 	rm -rf "$GNUPGHOME"
 
 ENV MYSQL_MAJOR 8.0
-ENV MYSQL_VERSION 8.0.34-1debian11
-ENV C2D_RELEASE 8.0.34
+ENV MYSQL_VERSION 8.0.36-1debian11
+ENV C2D_RELEASE 8.0.36
 
 RUN echo "deb [ signed-by=/etc/apt/keyrings/mysql.gpg ] http://repo.mysql.com/apt/debian/  bullseye  mysql-${MYSQL_MAJOR}" > /etc/apt/sources.list.d/mysql.list
 
diff --git a/templates/debian11/Dockerfile.template b/templates/debian11/Dockerfile.template
index bef57fd..850d976 100644
--- a/templates/debian11/Dockerfile.template
+++ b/templates/debian11/Dockerfile.template
@@ -9,7 +9,7 @@ FROM {{ .From }}
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN groupadd -r mysql && useradd -r -g mysql mysql
 
-RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/*
+RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/* && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B7B3B788A8D3785C
 
 # add gosu for easy step-down from root
 # https://github.com/tianon/gosu/releases
diff --git a/versions.yaml b/versions.yaml
index c9dec24..9690f51 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -29,13 +29,13 @@ versions:
     mysql:
       gpg: 859BE8D7C586F538430B19C2467B942D3A79BD29
       major: '8.0'
-      version: 8.0.34
+      version: 8.0.36
   repo: mysql8
   tags:
-  - 8.0.34-debian11
+  - 8.0.36-debian11
   - 8.0-debian11
   - 8-debian11
-  - 8.0.34
+  - 8.0.36
   - '8.0'
   - '8'
   - latest