diff --git a/bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/libmastodon.sh b/bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/libmastodon.sh
index ef393d263ab6..a19c40988945 100644
--- a/bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/libmastodon.sh
+++ b/bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/libmastodon.sh
@@ -111,7 +111,7 @@ mastodon_validate() {
         check_empty_value "MASTODON_S3_HOSTNAME"
         check_resolved_hostname "$MASTODON_S3_HOSTNAME"
         check_valid_port "MASTODON_S3_PORT_NUMBER"
-        check_empty_value "MASTODON_S3_ALIAS"
+        check_empty_value "MASTODON_S3_ALIAS_HOST"
         check_empty_value "MASTODON_S3_ENDPOINT"
         check_empty_value "MASTODON_AWS_ACCESS_KEY_ID"
         check_empty_value "MASTODON_AWS_SECRET_ACCESS_KEY"
diff --git a/bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/mastodon-env.sh b/bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/mastodon-env.sh
index 10edbadb0ae8..af80108dd1ce 100644
--- a/bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/mastodon-env.sh
+++ b/bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/mastodon-env.sh
@@ -95,6 +95,7 @@ mastodon_env_vars=(
     AWS_SECRET_ACCESS_KEY
     AWS_ACCESS_KEY_ID
     S3_ENDPOINT
+    S3_REGION
 )
 for env_var in "${mastodon_env_vars[@]}"; do
     file_env_var="${env_var}_FILE"
@@ -247,7 +248,7 @@ MASTODON_AWS_ACCESS_KEY_ID="${MASTODON_AWS_ACCESS_KEY_ID:-"${AWS_ACCESS_KEY_ID:-
 export MASTODON_AWS_ACCESS_KEY_ID="${MASTODON_AWS_ACCESS_KEY_ID:-}"
 export AWS_ACCESS_KEY_ID="$MASTODON_AWS_ACCESS_KEY_ID"
 export MASTODON_CFG_AWS_ACCESS_KEY_ID="$MASTODON_AWS_ACCESS_KEY_ID"
-export MASTODON_S3_REGION="${MASTODON_S3_REGION:-us-east-1}"
+export MASTODON_S3_REGION="${MASTODON_S3_REGION:-"${S3_REGION:-us-east-1}"}"
 MASTODON_S3_ENDPOINT="${MASTODON_S3_ENDPOINT:-"${S3_ENDPOINT:-}"}"
 export MASTODON_S3_ENDPOINT="${MASTODON_S3_ENDPOINT:-${MASTODON_S3_PROTOCOL}://${MASTODON_S3_HOSTNAME}:${MASTODON_S3_PORT_NUMBER}}"
 export S3_ENDPOINT="$MASTODON_S3_ENDPOINT"