diff --git a/bitnami/codeigniter/4/debian-10/Dockerfile b/bitnami/codeigniter/4/debian-10/Dockerfile
index 340e7ef6b236..085c747ba3f5 100644
--- a/bitnami/codeigniter/4/debian-10/Dockerfile
+++ b/bitnami/codeigniter/4/debian-10/Dockerfile
@@ -22,7 +22,6 @@ RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
 RUN /opt/bitnami/scripts/php/postunpack.sh
 ENV APP_VERSION="4.1.9" \
     BITNAMI_APP_NAME="codeigniter" \
-    BITNAMI_IMAGE_VERSION="4.1.9-debian-10-r36" \
     PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/codeigniter/bin:$PATH" \
     PHP_ENABLE_OPCACHE="0"
 
diff --git a/bitnami/codeigniter/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/codeigniter/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index fee929c4ee1a..bd3d43db6e43 100644
--- a/bitnami/codeigniter/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/codeigniter/4/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh
@@ -132,10 +132,14 @@ mysql_client_initialize() {
 #   None
 #########################
 mysql_client_wrap_binary_for_ssl() {
-    local -r wrapper_file="${DB_BIN_DIR}/mysql"
+    local wrapper_file="${DB_BIN_DIR}/mysql"
+    # In MySQL Client 10.6, mysql is a link to the mariadb binary
+    if [[ -f "${DB_BIN_DIR}/mariadb" ]]; then
+        wrapper_file="${DB_BIN_DIR}/mariadb"
+    fi
     local -r wrapped_binary_file="${DB_BASE_DIR}/.bin/mysql"
     local -a ssl_opts=()
-    read -r -a ssl_opts <<< "$(mysql_client_extra_opts)"
+    read -r -a ssl_opts <<<"$(mysql_client_extra_opts)"
 
     mv "$wrapper_file" "$wrapped_binary_file"
     cat >"$wrapper_file" <<EOF
diff --git a/bitnami/codeigniter/README.md b/bitnami/codeigniter/README.md
index e3fadac156ba..9c5017db69d0 100644
--- a/bitnami/codeigniter/README.md
+++ b/bitnami/codeigniter/README.md
@@ -45,7 +45,7 @@ The Bitnami CodeIgniter Development Container has been carefully engineered to p
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`4`, `4-debian-10`, `4.1.9`, `4.1.9-debian-10-r36`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-codeigniter/blob/4.1.9-debian-10-r36/4/debian-10/Dockerfile)
+* [`4`, `4-debian-10`, `4.1.9`, `4.1.9-debian-10-r37`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-codeigniter/blob/4.1.9-debian-10-r37/4/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/codeigniter GitHub repo](https://github.com/bitnami/bitnami-docker-codeigniter).