diff --git a/.github/actions/run-golang-system-tests/Dockerfile b/.github/actions/run-golang-system-tests/Dockerfile
index 54e1d6996..1da7168b9 100644
--- a/.github/actions/run-golang-system-tests/Dockerfile
+++ b/.github/actions/run-golang-system-tests/Dockerfile
@@ -15,8 +15,9 @@ ENV MYSQL_USERNAME= \
     MYSQL_CLIENT_KEY_PATH=
 
 VOLUME /goproject
-VOLUME /mysql-certs
+
 RUN mkdir -p /mysql-certs && chmod -R 777 /mysql-certs
+VOLUME /mysql-certs
 
 RUN go install github.com/onsi/ginkgo/ginkgo@latest
 
diff --git a/.github/actions/run-golang-system-tests/mysql/Dockerfile b/.github/actions/run-golang-system-tests/mysql/Dockerfile
index 613330868..96a7b3046 100644
--- a/.github/actions/run-golang-system-tests/mysql/Dockerfile
+++ b/.github/actions/run-golang-system-tests/mysql/Dockerfile
@@ -1,8 +1,8 @@
 ARG MYSQL_VERSION
 FROM mysql:$MYSQL_VERSION
 
-VOLUME /mysql-certs
 RUN mkdir -p /mysql-certs && chmod -R 777 /mysql-certs
+VOLUME /mysql-certs
 
 RUN mkdir -p /etc/mysql/mysql.conf.d/ && chown mysql: /etc/mysql/mysql.conf.d/
 ADD enable_mysql_tls.sh /docker-entrypoint-initdb.d/
diff --git a/.github/workflows/database-tests.yml b/.github/workflows/database-tests.yml
index 02bf30d1d..2488bd936 100644
--- a/.github/workflows/database-tests.yml
+++ b/.github/workflows/database-tests.yml
@@ -19,5 +19,5 @@ jobs:
         run: |
              MYSQL_VERSION="${{ matrix.mysql-version }}" \
              MYSQL_PASSWORD="$(head /dev/urandom | md5sum | cut -f1 -d" ")" \
-             docker-compose -f repo/docker-compose.yml run system-mysql || (docker-compose -f repo/docker-compose.yml logs system-mysql-backing-db && exit 1)
+             docker-compose -f repo/docker-compose.yml run system-mysql