diff --git a/3.10/php7.4/apache/makedb.php b/3.10/php7.4/apache/makedb.php
index a6fb4e2..1ece7ab 100644
--- a/3.10/php7.4/apache/makedb.php
+++ b/3.10/php7.4/apache/makedb.php
@@ -15,6 +15,8 @@ else
 
 $maxTries = 10;
 
+// set original default behaviour for PHP 8.1 and higher
+// see https://www.php.net/manual/en/mysqli-driver.report-mode.php
 mysqli_report(MYSQLI_REPORT_OFF);
 do
 {
diff --git a/3.10/php7.4/fpm-alpine/makedb.php b/3.10/php7.4/fpm-alpine/makedb.php
index a6fb4e2..1ece7ab 100644
--- a/3.10/php7.4/fpm-alpine/makedb.php
+++ b/3.10/php7.4/fpm-alpine/makedb.php
@@ -15,6 +15,8 @@ else
 
 $maxTries = 10;
 
+// set original default behaviour for PHP 8.1 and higher
+// see https://www.php.net/manual/en/mysqli-driver.report-mode.php
 mysqli_report(MYSQLI_REPORT_OFF);
 do
 {
diff --git a/3.10/php7.4/fpm/makedb.php b/3.10/php7.4/fpm/makedb.php
index a6fb4e2..1ece7ab 100644
--- a/3.10/php7.4/fpm/makedb.php
+++ b/3.10/php7.4/fpm/makedb.php
@@ -15,6 +15,8 @@ else
 
 $maxTries = 10;
 
+// set original default behaviour for PHP 8.1 and higher
+// see https://www.php.net/manual/en/mysqli-driver.report-mode.php
 mysqli_report(MYSQLI_REPORT_OFF);
 do
 {
diff --git a/4.2/php7.4/apache/makedb.php b/4.2/php7.4/apache/makedb.php
index a6fb4e2..1ece7ab 100644
--- a/4.2/php7.4/apache/makedb.php
+++ b/4.2/php7.4/apache/makedb.php
@@ -15,6 +15,8 @@ else
 
 $maxTries = 10;
 
+// set original default behaviour for PHP 8.1 and higher
+// see https://www.php.net/manual/en/mysqli-driver.report-mode.php
 mysqli_report(MYSQLI_REPORT_OFF);
 do
 {
diff --git a/4.2/php7.4/fpm-alpine/makedb.php b/4.2/php7.4/fpm-alpine/makedb.php
index a6fb4e2..1ece7ab 100644
--- a/4.2/php7.4/fpm-alpine/makedb.php
+++ b/4.2/php7.4/fpm-alpine/makedb.php
@@ -15,6 +15,8 @@ else
 
 $maxTries = 10;
 
+// set original default behaviour for PHP 8.1 and higher
+// see https://www.php.net/manual/en/mysqli-driver.report-mode.php
 mysqli_report(MYSQLI_REPORT_OFF);
 do
 {
diff --git a/4.2/php7.4/fpm/makedb.php b/4.2/php7.4/fpm/makedb.php
index a6fb4e2..1ece7ab 100644
--- a/4.2/php7.4/fpm/makedb.php
+++ b/4.2/php7.4/fpm/makedb.php
@@ -15,6 +15,8 @@ else
 
 $maxTries = 10;
 
+// set original default behaviour for PHP 8.1 and higher
+// see https://www.php.net/manual/en/mysqli-driver.report-mode.php
 mysqli_report(MYSQLI_REPORT_OFF);
 do
 {
diff --git a/4.2/php8.0/apache/makedb.php b/4.2/php8.0/apache/makedb.php
index a6fb4e2..1ece7ab 100644
--- a/4.2/php8.0/apache/makedb.php
+++ b/4.2/php8.0/apache/makedb.php
@@ -15,6 +15,8 @@ else
 
 $maxTries = 10;
 
+// set original default behaviour for PHP 8.1 and higher
+// see https://www.php.net/manual/en/mysqli-driver.report-mode.php
 mysqli_report(MYSQLI_REPORT_OFF);
 do
 {
diff --git a/4.2/php8.0/fpm-alpine/makedb.php b/4.2/php8.0/fpm-alpine/makedb.php
index a6fb4e2..1ece7ab 100644
--- a/4.2/php8.0/fpm-alpine/makedb.php
+++ b/4.2/php8.0/fpm-alpine/makedb.php
@@ -15,6 +15,8 @@ else
 
 $maxTries = 10;
 
+// set original default behaviour for PHP 8.1 and higher
+// see https://www.php.net/manual/en/mysqli-driver.report-mode.php
 mysqli_report(MYSQLI_REPORT_OFF);
 do
 {
diff --git a/4.2/php8.0/fpm/makedb.php b/4.2/php8.0/fpm/makedb.php
index a6fb4e2..1ece7ab 100644
--- a/4.2/php8.0/fpm/makedb.php
+++ b/4.2/php8.0/fpm/makedb.php
@@ -15,6 +15,8 @@ else
 
 $maxTries = 10;
 
+// set original default behaviour for PHP 8.1 and higher
+// see https://www.php.net/manual/en/mysqli-driver.report-mode.php
 mysqli_report(MYSQLI_REPORT_OFF);
 do
 {
diff --git a/4.2/php8.1/apache/makedb.php b/4.2/php8.1/apache/makedb.php
index a6fb4e2..1ece7ab 100644
--- a/4.2/php8.1/apache/makedb.php
+++ b/4.2/php8.1/apache/makedb.php
@@ -15,6 +15,8 @@ else
 
 $maxTries = 10;
 
+// set original default behaviour for PHP 8.1 and higher
+// see https://www.php.net/manual/en/mysqli-driver.report-mode.php
 mysqli_report(MYSQLI_REPORT_OFF);
 do
 {
diff --git a/4.2/php8.1/fpm-alpine/makedb.php b/4.2/php8.1/fpm-alpine/makedb.php
index a6fb4e2..1ece7ab 100644
--- a/4.2/php8.1/fpm-alpine/makedb.php
+++ b/4.2/php8.1/fpm-alpine/makedb.php
@@ -15,6 +15,8 @@ else
 
 $maxTries = 10;
 
+// set original default behaviour for PHP 8.1 and higher
+// see https://www.php.net/manual/en/mysqli-driver.report-mode.php
 mysqli_report(MYSQLI_REPORT_OFF);
 do
 {
diff --git a/4.2/php8.1/fpm/makedb.php b/4.2/php8.1/fpm/makedb.php
index a6fb4e2..1ece7ab 100644
--- a/4.2/php8.1/fpm/makedb.php
+++ b/4.2/php8.1/fpm/makedb.php
@@ -15,6 +15,8 @@ else
 
 $maxTries = 10;
 
+// set original default behaviour for PHP 8.1 and higher
+// see https://www.php.net/manual/en/mysqli-driver.report-mode.php
 mysqli_report(MYSQLI_REPORT_OFF);
 do
 {
diff --git a/Dockerfile.template b/Dockerfile.template
index 339df72..ca23639 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -37,7 +37,7 @@ RUN set -ex; \
 		autoconf \
 		bzip2-dev \
 		gmp-dev \
-{{ if env.version == "4.2" then ( -}}
+{{ if env.version != "3.10" then ( -}}
 		icu-dev \
 {{ ) else "" end -}}
 		freetype-dev \
@@ -61,7 +61,7 @@ RUN set -ex; \
 	apt-get install -y --no-install-recommends \
 		libbz2-dev \
 		libgmp-dev \
-{{ if env.version == "4.2" then ( -}}
+{{ if env.version != "3.10" then ( -}}
 		libicu-dev \
 {{ ) else "" end -}}
 		libfreetype6-dev \
@@ -96,7 +96,7 @@ RUN set -ex; \
 		exif \
 		gd \
 		gmp \
-{{ if env.version == "4.2" then ( -}}
+{{ if env.version != "3.10" then ( -}}
 		intl \
 {{ ) else "" end -}}
 		ldap \
diff --git a/makedb.php b/makedb.php
index a6fb4e2..1ece7ab 100644
--- a/makedb.php
+++ b/makedb.php
@@ -15,6 +15,8 @@ else
 
 $maxTries = 10;
 
+// set original default behaviour for PHP 8.1 and higher
+// see https://www.php.net/manual/en/mysqli-driver.report-mode.php
 mysqli_report(MYSQLI_REPORT_OFF);
 do
 {