diff --git a/abc-base/8.5-frankenphp/Dockerfile b/abc-base/8.5-frankenphp/Dockerfile
index 2f0bdf8..d24268e 100644
--- a/abc-base/8.5-frankenphp/Dockerfile
+++ b/abc-base/8.5-frankenphp/Dockerfile
@@ -44,7 +44,7 @@ COPY --from=ghcr.io/stephank/pocketcron@sha256:bd5b058816eb0f20236ae429fb26fb7c3
 
 # Copy configuration files and scripts.
 COPY usrlocal/ /usr/local/
-COPY caddy/ /etc/caddy/
+COPY etc/ /etc/
 
 # Image configuration.
 ENTRYPOINT ["/usr/bin/tini", "--"]
diff --git a/abc-base/8.5-frankenphp/caddy/Caddyfile b/abc-base/8.5-frankenphp/etc/caddy/Caddyfile
similarity index 100%
rename from abc-base/8.5-frankenphp/caddy/Caddyfile
rename to abc-base/8.5-frankenphp/etc/caddy/Caddyfile
diff --git a/abc-base/8.5-frankenphp/caddy/Caddyfile.d/project.caddyfile b/abc-base/8.5-frankenphp/etc/caddy/Caddyfile.d/project.caddyfile
similarity index 100%
rename from abc-base/8.5-frankenphp/caddy/Caddyfile.d/project.caddyfile
rename to abc-base/8.5-frankenphp/etc/caddy/Caddyfile.d/project.caddyfile
diff --git a/abc-base/8.5-frankenphp/etc/mysql/conf.d/90-nossl.cnf b/abc-base/8.5-frankenphp/etc/mysql/conf.d/90-nossl.cnf
new file mode 100644
index 0000000..0f63b02
--- /dev/null
+++ b/abc-base/8.5-frankenphp/etc/mysql/conf.d/90-nossl.cnf
@@ -0,0 +1,2 @@
+[client-mariadb]
+disable-ssl-verify-server-cert
diff --git a/abc-base/8.5/Dockerfile b/abc-base/8.5/Dockerfile
index 42e03f0..b24fdc6 100644
--- a/abc-base/8.5/Dockerfile
+++ b/abc-base/8.5/Dockerfile
@@ -94,7 +94,7 @@ COPY --from=ghcr.io/stephank/pocketcron@sha256:bd5b058816eb0f20236ae429fb26fb7c3
 
 # Copy configuration files and scripts.
 COPY usrlocal/ /usr/local/
-COPY nginx/ /etc/nginx/
+COPY etc/ /etc/
 
 # Image configuration.
 ENTRYPOINT ["/usr/bin/tini", "--"]
diff --git a/abc-base/8.5/etc/mysql/conf.d/90-nossl.cnf b/abc-base/8.5/etc/mysql/conf.d/90-nossl.cnf
new file mode 100644
index 0000000..0f63b02
--- /dev/null
+++ b/abc-base/8.5/etc/mysql/conf.d/90-nossl.cnf
@@ -0,0 +1,2 @@
+[client-mariadb]
+disable-ssl-verify-server-cert
diff --git a/abc-base/8.5/nginx/abc_vhost b/abc-base/8.5/etc/nginx/abc_vhost
similarity index 100%
rename from abc-base/8.5/nginx/abc_vhost
rename to abc-base/8.5/etc/nginx/abc_vhost
diff --git a/abc-base/8.5/nginx/nginx.conf b/abc-base/8.5/etc/nginx/nginx.conf
similarity index 100%
rename from abc-base/8.5/nginx/nginx.conf
rename to abc-base/8.5/etc/nginx/nginx.conf