diff --git a/entrypoint/20-envsubst-on-templates.sh b/entrypoint/20-envsubst-on-templates.sh
index d0398b1e..b13daf11 100755
--- a/entrypoint/20-envsubst-on-templates.sh
+++ b/entrypoint/20-envsubst-on-templates.sh
@@ -10,12 +10,28 @@ entrypoint_log() {
     fi
 }
 
+add_stream_block() {
+  if grep -q -E "\s*stream\s*\{" /etc/nginx/nginx.conf; then
+    entrypoint_log "/etc/nginx/nginx.conf contains a stream block; include /etc/nginx/stream_conf.d/*.conf to enable stream templates"
+  else
+    cat << END >> /etc/nginx/nginx.conf
+stream {
+  include /etc/nginx/stream_conf.d/*.conf;
+}
+END
+    entrypoint_log "Appended stream block to /etc/nginx/nginx.conf to include /etc/nginx/stream_conf.d/*.conf"
+  fi
+}
+
 auto_envsubst() {
   local template_dir="${NGINX_ENVSUBST_TEMPLATE_DIR:-/etc/nginx/templates}"
   local suffix="${NGINX_ENVSUBST_TEMPLATE_SUFFIX:-.template}"
   local output_dir="${NGINX_ENVSUBST_OUTPUT_DIR:-/etc/nginx/conf.d}"
   local filter="${NGINX_ENVSUBST_FILTER:-}"
 
+  local stream_suffix="${NGINX_ENVSUBST_STREAM_TEMPLATE_SUFFIX:-.stream-template}"
+  local stream_output_dir="${NGINX_ENVSUBST_STREAM_OUTPUT_DIR:-/etc/nginx/stream_conf.d}"
+
   local template defined_envs relative_path output_path subdir
   defined_envs=$(printf '${%s} ' $(awk "END { for (name in ENVIRON) { print ( name ~ /${filter}/ ) ? name : \"\" } }" < /dev/null ))
   [ -d "$template_dir" ] || return 0
@@ -32,6 +48,25 @@ auto_envsubst() {
     entrypoint_log "$ME: Running envsubst on $template to $output_path"
     envsubst "$defined_envs" < "$template" > "$output_path"
   done
+
+  # Print the first file with the stream suffix, this will be false if there are none
+  if test -n "$(find "$template_dir" -maxdepth 1 -name "*$stream_suffix" -print -quit)"; then
+    # http templates will still have been processed and available
+    if [ ! -w "$stream_output_dir" ]; then
+      entrypoint_log "$ME: ERROR: $template_dir exists, but $stream_output_dir is not writable"
+      return 0
+    fi
+    add_stream_block
+    find "$template_dir" -follow -type f -name "*$stream_suffix" -print | while read -r template; do
+      relative_path="${template#$template_dir/}"
+      output_path="$stream_output_dir/${relative_path%$stream_suffix}"
+      subdir=$(dirname "$relative_path")
+      # create a subdirectory where the template file exists
+      mkdir -p "$stream_output_dir/$subdir"
+      entrypoint_log "$ME: Running envsubst on $template to $output_path"
+      envsubst "$defined_envs" < "$template" > "$output_path"
+    done
+  fi
 }
 
 auto_envsubst