diff --git a/5.7/Dockerfile.oracle b/5.7/Dockerfile.oracle
index 3d2329e2b..882bdb369 100644
--- a/5.7/Dockerfile.oracle
+++ b/5.7/Dockerfile.oracle
@@ -89,6 +89,9 @@ RUN set -eux; \
 	! grep -F '!includedir' /etc/my.cnf; \
 	{ echo; echo '!includedir /etc/mysql/conf.d/'; } >> /etc/my.cnf; \
 	mkdir -p /etc/mysql/conf.d; \
+# 5.7 Debian-based images also included "/etc/mysql/mysql.conf.d" so let's include it too
+	{ echo '!includedir /etc/mysql/mysql.conf.d/'; } >> /etc/my.cnf; \
+	mkdir -p /etc/mysql/mysql.conf.d; \
 	\
 	mysqld --version; \
 	mysql --version
diff --git a/template/Dockerfile.oracle b/template/Dockerfile.oracle
index 4d9865e7e..2f2e0b957 100644
--- a/template/Dockerfile.oracle
+++ b/template/Dockerfile.oracle
@@ -104,6 +104,11 @@ RUN set -eux; \
 	! grep -F '!includedir' /etc/my.cnf; \
 	{ echo; echo '!includedir /etc/mysql/conf.d/'; } >> /etc/my.cnf; \
 	mkdir -p /etc/mysql/conf.d; \
+{{ if env.version == "5.7" then ( -}}
+# 5.7 Debian-based images also included "/etc/mysql/mysql.conf.d" so let's include it too
+	{ echo '!includedir /etc/mysql/mysql.conf.d/'; } >> /etc/my.cnf; \
+	mkdir -p /etc/mysql/mysql.conf.d; \
+{{ ) else "" end -}}
 	\
 	mysqld --version; \
 	mysql --version