diff --git a/bitnami/mastodon/4/debian-12/Dockerfile b/bitnami/mastodon/4/debian-12/Dockerfile
index 6df48356462e..cf4648eaac4d 100644
--- a/bitnami/mastodon/4/debian-12/Dockerfile
+++ b/bitnami/mastodon/4/debian-12/Dockerfile
@@ -8,10 +8,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2025-04-02T15:07:52Z" \
+      org.opencontainers.image.created="2025-04-03T14:47:20Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/mastodon/README.md" \
-      org.opencontainers.image.ref.name="4.3.7-debian-12-r0" \
+      org.opencontainers.image.ref.name="4.3.7-debian-12-r1" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mastodon" \
       org.opencontainers.image.title="mastodon" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
diff --git a/bitnami/mastodon/4/debian-12/rootfs/opt/bitnami/scripts/mastodon-env.sh b/bitnami/mastodon/4/debian-12/rootfs/opt/bitnami/scripts/mastodon-env.sh
index f739641dd2ff..998a55cffa9a 100644
--- a/bitnami/mastodon/4/debian-12/rootfs/opt/bitnami/scripts/mastodon-env.sh
+++ b/bitnami/mastodon/4/debian-12/rootfs/opt/bitnami/scripts/mastodon-env.sh
@@ -42,6 +42,8 @@ mastodon_env_vars=(
     MASTODON_AUTHORIZED_FETCH
     MASTODON_LIMITED_FEDERATION_MODE
     MASTODON_STREAMING_API_BASE_URL
+    MASTODON_SMTP_LOGIN
+    MASTODON_SMTP_PASSWORD
     RAILS_SERVE_STATIC_FILES
     MASTODON_BIND_ADDRESS
     MASTODON_DATA_TO_PERSIST
@@ -78,6 +80,8 @@ mastodon_env_vars=(
     AUTHORIZED_FETCH
     LIMITED_FEDERATION_MODE
     STREAMING_API_BASE_URL
+    SMTP_LOGIN
+    SMTP_PASSWORD
     BIND
     DB_HOST
     DB_PORT
@@ -160,6 +164,14 @@ MASTODON_STREAMING_API_BASE_URL="${MASTODON_STREAMING_API_BASE_URL:-"${STREAMING
 export MASTODON_STREAMING_API_BASE_URL="${MASTODON_STREAMING_API_BASE_URL:-ws://localhost:${MASTODON_STREAMING_PORT_NUMBER}}"
 export STREAMING_API_BASE_URL="$MASTODON_STREAMING_API_BASE_URL"
 export MASTODON_CFG_STREAMING_API_BASE_URL="$MASTODON_STREAMING_API_BASE_URL"
+MASTODON_SMTP_LOGIN="${MASTODON_SMTP_LOGIN:-"${SMTP_LOGIN:-}"}"
+export MASTODON_SMTP_LOGIN="${MASTODON_SMTP_LOGIN:-5432}"
+export SMTP_LOGIN="$MASTODON_SMTP_LOGIN"
+export MASTODON_CFG_SMTP_LOGIN="$MASTODON_SMTP_LOGIN"
+MASTODON_SMTP_PASSWORD="${MASTODON_SMTP_PASSWORD:-"${SMTP_PASSWORD:-}"}"
+export MASTODON_SMTP_PASSWORD="${MASTODON_SMTP_PASSWORD:-bitnami_mastodon}"
+export SMTP_PASSWORD="$MASTODON_SMTP_PASSWORD"
+export MASTODON_CFG_SMTP_PASSWORD="$MASTODON_SMTP_PASSWORD"
 export RAILS_SERVE_STATIC_FILES="${RAILS_SERVE_STATIC_FILES:-true}"
 MASTODON_BIND_ADDRESS="${MASTODON_BIND_ADDRESS:-"${BIND:-}"}"
 export MASTODON_BIND_ADDRESS="${MASTODON_BIND_ADDRESS:-0.0.0.0}"
diff --git a/bitnami/mastodon/README.md b/bitnami/mastodon/README.md
index 18248bd2c67c..602ef8596993 100644
--- a/bitnami/mastodon/README.md
+++ b/bitnami/mastodon/README.md
@@ -126,6 +126,8 @@ docker-compose up mastodon
 | `MASTODON_AUTHORIZED_FETCH`          | Use secure mode.                                                      | `false`                                                                        |
 | `MASTODON_LIMITED_FEDERATION_MODE`   | Use an allow-list for federating with other servers.                  | `false`                                                                        |
 | `MASTODON_STREAMING_API_BASE_URL`    | Mastodon public api base url.                                         | `ws://localhost:${MASTODON_STREAMING_PORT_NUMBER}`                             |
+| `MASTODON_SMTP_LOGIN`                | SMTP server authentication username.                                  | `5432`                                                                         |
+| `MASTODON_SMTP_PASSWORD`             | SMTP server authentication password.                                  | `bitnami_mastodon`                                                             |
 | `RAILS_SERVE_STATIC_FILES`           | Have puma server the static files in the public/ folder               | `true`                                                                         |
 | `MASTODON_BIND_ADDRESS`              | Address to listen for interfaces                                      | `0.0.0.0`                                                                      |
 | `MASTODON_DATA_TO_PERSIST`           | Data to persist from installations.                                   | `$MASTODON_ASSETS_DIR $MASTODON_SYSTEM_DIR`                                    |