diff --git a/bitnami/pgpool/docker-compose.yml b/bitnami/pgpool/docker-compose.yml
index 1d990df849e5d..0e5aca623e72f 100644
--- a/bitnami/pgpool/docker-compose.yml
+++ b/bitnami/pgpool/docker-compose.yml
@@ -39,7 +39,7 @@ services:
       - REPMGR_USERNAME=repmgr
       - REPMGR_PASSWORD=repmgrpassword
   pgpool:
-    image: docker.io/bitnami/pgpool:4
+    image: david-pgpool
     ports:
       - 5432:5432
     environment:
diff --git a/bitnami/suitecrm/8/debian-12/rootfs/opt/bitnami/scripts/libsuitecrm.sh b/bitnami/suitecrm/8/debian-12/rootfs/opt/bitnami/scripts/libsuitecrm.sh
index 10424a2963bd6..328c34bc33c84 100644
--- a/bitnami/suitecrm/8/debian-12/rootfs/opt/bitnami/scripts/libsuitecrm.sh
+++ b/bitnami/suitecrm/8/debian-12/rootfs/opt/bitnami/scripts/libsuitecrm.sh
@@ -144,14 +144,14 @@ suitecrm_initialize() {
                 # Delete configuration file for silent install as it's not needed anymore
                 rm "$SUITECRM_SILENT_INSTALL_CONF_FILE"
             else
+                web_server_start
                 suitecrm_pass_wizard
                 # Configure SMTP via application wizard
                 if ! is_empty_value "$SUITECRM_SMTP_HOST"; then
-                    web_server_start
                     info "Configuring SMTP"
                     suitecrm_pass_smtp_wizard
-                    web_server_stop
                 fi
+                web_server_stop
             fi
 
         else
@@ -358,11 +358,12 @@ suitecrm_pass_smtp_wizard() {
 suitecrm_pass_wizard() {
     local -a install_args
     local url_protocol=http
+    local -r url_port="${APACHE_HTTP_PORT_NUMBER:-"$APACHE_DEFAULT_HTTP_PORT_NUMBER"}"
     info "Running setup wizard"
-    is_boolean_yes "$SUITECRM_ENABLE_HTTPS" && url_protocol=https
+    is_boolean_yes "$SUITECRM_ENABLE_HTTPS" && url_protocol=https url_port="${APACHE_HTTPS_PORT_NUMBER:-"$APACHE_DEFAULT_HTTPS_PORT_NUMBER"}"
 
     install_args=(
-        "--site_host=${url_protocol}://${SUITECRM_HOST}"
+        "--site_host=${url_protocol}://${SUITECRM_HOST}:${url_port}"
         "--site_username=${SUITECRM_USERNAME}"
         "--site_password=${SUITECRM_PASSWORD}"
         "--db_username=${SUITECRM_DATABASE_USER}"
diff --git a/bitnami/suitecrm/docker-compose.yml b/bitnami/suitecrm/docker-compose.yml
index af15e266b9cf2..dd35226f3b979 100644
--- a/bitnami/suitecrm/docker-compose.yml
+++ b/bitnami/suitecrm/docker-compose.yml
@@ -13,11 +13,12 @@ services:
     volumes:
       - 'mariadb_data:/bitnami/mariadb'
   suitecrm:
-    image: docker.io/bitnami/suitecrm:8
+    image: david-suitecrm
     ports:
       - '80:8080'
       - '443:8443'
     environment:
+      - SUITECRM_ENABLE_HTTPS=true
       - SUITECRM_DATABASE_HOST=mariadb
       - SUITECRM_DATABASE_PORT_NUMBER=3306
       - SUITECRM_DATABASE_USER=bn_suitecrm