diff --git a/Dockerfile b/Dockerfile
index a734ed64a592de54957b4191932b67ace0549f6d..dcbbc6105e5e7425257f5012d63b8e0d9221d0e2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -19,7 +19,7 @@
 # IN THE SOFTWARE.
 
 
-FROM registry.conarx.tech/containers/nginx-php/3.20 as builder
+FROM registry.conarx.tech/containers/nginx-php/3.21 as builder
 
 
 # UPDATE timescaledb version in tests/docker-compose.yml.timescaledb.tmpl to the max supported version
@@ -314,13 +314,13 @@ RUN set -eux; \
 
 
 
-FROM registry.conarx.tech/containers/nginx-php/3.20
+FROM registry.conarx.tech/containers/nginx-php/3.21
 
 
 ARG VERSION_INFO=
-LABEL org.opencontainers.image.authors   "Nigel Kukard <nkukard@conarx.tech>"
-LABEL org.opencontainers.image.version   "3.20"
-LABEL org.opencontainers.image.base.name "registry.conarx.tech/containers/nginx-php/3.20"
+LABEL org.opencontainers.image.authors   = "Nigel Kukard <nkukard@conarx.tech>"
+LABEL org.opencontainers.image.version   = "3.21"
+LABEL org.opencontainers.image.base.name = "registry.conarx.tech/containers/nginx-php/3.21"
 
 
 # Copy in built binaries
diff --git a/contrib/docker-compose.yml b/contrib/docker-compose.yml
index d69bccd340766db4c7d4175627e7f8782b88b573..7226970de0a76eac5ec79256da0efa1341d0269f 100644
--- a/contrib/docker-compose.yml
+++ b/contrib/docker-compose.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/docker_release_version.sh b/docker_release_version.sh
index 7bbeed41b73c48a5be57c5dd0e6aa3894d67b3e0..464b1a7a6525883a157ca15812c1a62dd94cadb1 100644
--- a/docker_release_version.sh
+++ b/docker_release_version.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/etc/nginx/http.d/50_vhost_default.conf.template b/etc/nginx/http.d/50_vhost_default.conf.template
index d9725a7619a9ac9782d58b0feb5dd50c140898af..368e0921b519f94164384df1b44cbf7a5a6c5629 100644
--- a/etc/nginx/http.d/50_vhost_default.conf.template
+++ b/etc/nginx/http.d/50_vhost_default.conf.template
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/etc/nginx/http.d/55_vhost_default-ssl-certbot.conf.template b/etc/nginx/http.d/55_vhost_default-ssl-certbot.conf.template
index 7427f3aac72e6257234f6422a89e7ecc88dd3a08..292c556c7b108d75caee047c9afcfe12afbbde8e 100644
--- a/etc/nginx/http.d/55_vhost_default-ssl-certbot.conf.template
+++ b/etc/nginx/http.d/55_vhost_default-ssl-certbot.conf.template
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/tests/docker-compose.yml.mysql.tmpl b/tests/docker-compose.yml.mysql.tmpl
index e8c9694430d36fe93b218b1eeb1e1f9efc766dfd..0187fc606f4c993ebc47b2e43a866aa9d706fed1 100644
--- a/tests/docker-compose.yml.mysql.tmpl
+++ b/tests/docker-compose.yml.mysql.tmpl
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -19,8 +19,6 @@
 # IN THE SOFTWARE.
 
 
-version: '3.9'
-
 services:
 
 
diff --git a/tests/docker-compose.yml.postgresql.tmpl b/tests/docker-compose.yml.postgresql.tmpl
index b1d7d33cb1784fc0cba1fdec94d75a7efb9d23ed..e2a24e13b68886fa5c6c94795c075da5bb7f07a9 100644
--- a/tests/docker-compose.yml.postgresql.tmpl
+++ b/tests/docker-compose.yml.postgresql.tmpl
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/tests/docker-compose.yml.timescaledb.tmpl b/tests/docker-compose.yml.timescaledb.tmpl
index aca3ae869444ce67c389c2dc73182b97b458f6e5..7f91cfba20cd0cb1cd6b51e9789778aef06bf853 100644
--- a/tests/docker-compose.yml.timescaledb.tmpl
+++ b/tests/docker-compose.yml.timescaledb.tmpl
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/tests/run-cluster-test b/tests/run-cluster-test
index 47ce5f61bfed9a50975a7daaf2d44938b50b95f5..267c9a4456ca68df1e8c3209f43c5a8f3c66eae0 100755
--- a/tests/run-cluster-test
+++ b/tests/run-cluster-test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-agent.sh b/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-agent.sh
index 4e15950ceafc64aa86d4563603b8121d5c5727c8..114ab8a02a12c9d8c12422c606124362cf9e620a 100644
--- a/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-agent.sh
+++ b/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-agent.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-agent2.sh b/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-agent2.sh
index 213720990cf7dff51d4c2031bab52c3d8043a5ae..a2be4b69b87476d2ee327e4e402d44fb93f97417 100644
--- a/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-agent2.sh
+++ b/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-agent2.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-proxy.sh b/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-proxy.sh
index d5bfd87af7c8865afebb01ddb8d2e8ee4c47db2f..4239b7f9c576502f097f630e3849aab6dc1f4568 100644
--- a/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-proxy.sh
+++ b/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-proxy.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-server.sh b/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-server.sh
index 1e5dcb56bf60854f3566e807018d59660ce0b816..318730ab6e3f333387148bb630bcab023c312e3c 100644
--- a/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-server.sh
+++ b/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-server.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-webservice.sh b/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-webservice.sh
index b6763c769e4ee176859c378dd124d19cd413f2c0..30ea59f4ac09500c3555140fb9b64200b7100760 100644
--- a/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-webservice.sh
+++ b/usr/local/share/flexible-docker-containers/healthcheck.d/48-zabbix-webservice.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/usr/local/share/flexible-docker-containers/init.d/48-zabbix.sh b/usr/local/share/flexible-docker-containers/init.d/48-zabbix.sh
index 22821326b77ce5a8d911e66a3b607151c2f1f786..8550794184b54de4025ff282a94e1c30766a9193 100755
--- a/usr/local/share/flexible-docker-containers/init.d/48-zabbix.sh
+++ b/usr/local/share/flexible-docker-containers/init.d/48-zabbix.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -423,7 +423,7 @@ if [ "${#database_sql[@]}" -gt 0 ]; then
 
 		while true; do
 			fdc_notice "Zabbix waiting for MySQL server '$MYSQL_HOST'..."
-			if mysqladmin ping --host "$MYSQL_HOST" --user "$MYSQL_USER" --silent --connect-timeout=2; then
+			if mariadb-admin ping --silent --skip-ssl --host "$MYSQL_HOST" --user "$MYSQL_USER" --connect-timeout=2; then
 				fdc_notice "MySQL server is UP, continuing"
 				break
 			fi
diff --git a/usr/local/share/flexible-docker-containers/pre-exec-tests.d/48-zabbix.sh b/usr/local/share/flexible-docker-containers/pre-exec-tests.d/48-zabbix.sh
index cffe781fcc46fb34b8b4a0adce960831c0d2b7f0..55eb4d969a4507ca850c7f9ac71170227f9ecd9e 100644
--- a/usr/local/share/flexible-docker-containers/pre-exec-tests.d/48-zabbix.sh
+++ b/usr/local/share/flexible-docker-containers/pre-exec-tests.d/48-zabbix.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/usr/local/share/flexible-docker-containers/pre-init-tests.d/48-zabbix.sh b/usr/local/share/flexible-docker-containers/pre-init-tests.d/48-zabbix.sh
index 5ce6f922de9a6d86c963adc56d3c9e5d94d81038..4175607a9f83a33460cfc39fb92866a8c0bafd17 100644
--- a/usr/local/share/flexible-docker-containers/pre-init-tests.d/48-zabbix.sh
+++ b/usr/local/share/flexible-docker-containers/pre-init-tests.d/48-zabbix.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/usr/local/share/flexible-docker-containers/pre-init.d/48-zabbix.sh b/usr/local/share/flexible-docker-containers/pre-init.d/48-zabbix.sh
index 95b96dabea819175d4b1ffa6a0fce8471e956f1a..b2c7c1a9fdc864c101a44333ad9121af1c81f855 100755
--- a/usr/local/share/flexible-docker-containers/pre-init.d/48-zabbix.sh
+++ b/usr/local/share/flexible-docker-containers/pre-init.d/48-zabbix.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-agent.sh b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-agent.sh
index 7939aff57e0992070015112dc9308d68e1d40647..f62da7f06ca54d8d0a76da72c428ea498d7e313e 100644
--- a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-agent.sh
+++ b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-agent.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-agent2.sh b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-agent2.sh
index 0aae3ac07067799d5a4f44facaabb55ecd50ac51..b06acfe79df571c2db6bbef6e4c3b80eaccce4c6 100644
--- a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-agent2.sh
+++ b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-agent2.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-frontend.sh b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-frontend.sh
index d4d3e4c1397a11baec29159e95142f9d6a211011..8f8f357299f9451d68278fc0d69a7fe2ab8b64ad 100644
--- a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-frontend.sh
+++ b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-frontend.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-proxy.sh b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-proxy.sh
index 38a1695917b426c7f3fcefde6c3f93f2eca74dd2..00dd822a1872d757e8a15351919fc6c2451717c9 100644
--- a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-proxy.sh
+++ b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-proxy.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-server.sh b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-server.sh
index 6a80a646fe584752c4aebe7e55fb1711971149b8..0690ea60f9cb8ab575f9a03a8a1a70c2f0afee02 100644
--- a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-server.sh
+++ b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-server.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-webservice.sh b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-webservice.sh
index c8fed98a20f576e4b2c7e62ff4ff0be372571259..8f74f51e20326c78beab47c249cd452a40f64f2d 100644
--- a/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-webservice.sh
+++ b/usr/local/share/flexible-docker-containers/tests.d/48-zabbix-webservice.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/usr/local/share/flexible-docker-containers/tests.d/99-zabbix.sh b/usr/local/share/flexible-docker-containers/tests.d/99-zabbix.sh
index 696c6fb8011942babb8254cde87c77aaf63db348..79ca44791d293f3914dcc5706fae63b91b08c976 100644
--- a/usr/local/share/flexible-docker-containers/tests.d/99-zabbix.sh
+++ b/usr/local/share/flexible-docker-containers/tests.d/99-zabbix.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to