diff --git a/bitnami/logstash/7/debian-11/Dockerfile b/bitnami/logstash/7/debian-11/Dockerfile
index 78da3432a99a..1e0de8255a69 100644
--- a/bitnami/logstash/7/debian-11/Dockerfile
+++ b/bitnami/logstash/7/debian-11/Dockerfile
@@ -6,7 +6,7 @@ ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="7.17.7-debian-11-r11" \
+      org.opencontainers.image.ref.name="7.17.7-debian-11-r12" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/logstash" \
       org.opencontainers.image.title="logstash" \
       org.opencontainers.image.vendor="VMware, Inc." \
diff --git a/bitnami/logstash/7/debian-11/rootfs/opt/bitnami/scripts/logstash-env.sh b/bitnami/logstash/7/debian-11/rootfs/opt/bitnami/scripts/logstash-env.sh
index cd1c4b47edbf..99ae4c7c4cda 100644
--- a/bitnami/logstash/7/debian-11/rootfs/opt/bitnami/scripts/logstash-env.sh
+++ b/bitnami/logstash/7/debian-11/rootfs/opt/bitnami/scripts/logstash-env.sh
@@ -77,7 +77,6 @@ export LOGSTASH_VOLUME_DIR="/bitnami/logstash"
 export LOGSTASH_DATA_DIR="${LOGSTASH_VOLUME_DIR}/data"
 export LOGSTASH_MOUNTED_CONF_DIR="${LOGSTASH_VOLUME_DIR}/config"
 export LOGSTASH_MOUNTED_PIPELINE_CONF_DIR="${LOGSTASH_VOLUME_DIR}/pipeline"
-export PATH="${LOGSTASH_BIN_DIR}:${BITNAMI_ROOT_DIR}/common/bin:${PATH}"
 
 # System users (when running with a privileged user)
 export LOGSTASH_DAEMON_USER="logstash"
@@ -113,4 +112,10 @@ export LOGSTASH_ENABLE_ELASTICSEARCH_OUTPUT="${LOGSTASH_ENABLE_ELASTICSEARCH_OUT
 export LOGSTASH_ELASTICSEARCH_HOST="${LOGSTASH_ELASTICSEARCH_HOST:-elasticsearch}"
 export LOGSTASH_ELASTICSEARCH_PORT_NUMBER="${LOGSTASH_ELASTICSEARCH_PORT_NUMBER:-9200}"
 
+# Default JVM configuration
+export JAVA_HOME="${BITNAMI_ROOT_DIR}/java"
+
+# Other parameters
+export PATH="${LOGSTASH_BIN_DIR}:${JAVA_HOME}/bin:${BITNAMI_ROOT_DIR}/common/bin:${PATH}"
+
 # Custom environment variables may be defined below
diff --git a/bitnami/logstash/README.md b/bitnami/logstash/README.md
index ccf9fb9c810f..05f03a442875 100644
--- a/bitnami/logstash/README.md
+++ b/bitnami/logstash/README.md
@@ -32,7 +32,7 @@ $ docker-compose up -d
 
 ## How to deploy Logstash in Kubernetes?
 
-Deploying Bitnami applications as Helm Charts is the easiest way to get started with our applications on Kubernetes. Read more about the installation in the [Bitnami Logstash Chart GitHub repository](https://github.com/bitnami/charts/tree/master/bitnami/logstash).
+Deploying Bitnami applications as Helm Charts is the easiest way to get started with our applications on Kubernetes. Read more about the installation in the [Bitnami Logstash Chart GitHub repository](https://github.com/bitnami/charts/tree/main/bitnami/logstash).
 
 Bitnami containers can be used with [Kubeapps](https://kubeapps.dev/) for deployment and management of Helm Charts in clusters.
 
@@ -187,7 +187,7 @@ The Bitnami Logstash image provides a way to create your custom image installing
 To create your own image providing plugins execute the flowing command:
 
 ```console
-$ docker build --build-arg LOGSTASH_PLUGINS=<plugin1,plugin2,...> -t bitnami/logstash:latest 'https://github.com/bitnami/containers/blob/main/bitnami/logstash.git#master:8/debian-11'
+$ docker build --build-arg LOGSTASH_PLUGINS=<plugin1,plugin2,...> -t bitnami/logstash:latest 'https://github.com/bitnami/containers/blob/main/bitnami/logstash.git#main:8/debian-11'
 ```
 
 The command above will build the image providing this GitHub repository as build context, and will pass the list of plugins to install to the build logic.