diff --git a/bitnami/logstash/7/debian-10/Dockerfile b/bitnami/logstash/7/debian-10/Dockerfile
index ded5e3de5e4d..504b3e031c19 100644
--- a/bitnami/logstash/7/debian-10/Dockerfile
+++ b/bitnami/logstash/7/debian-10/Dockerfile
@@ -9,22 +9,22 @@ ENV HOME="/" \
 COPY prebuildfs /
 # Install required system packages and dependencies
 RUN install_packages ca-certificates curl libc6 libgcc1 procps sudo unzip zlib1g
-RUN . ./libcomponent.sh && component_unpack "logstash" "7.6.1-0" --checksum e7f3eb4734b7ccc6ba0297a1b48bc3c321b254ce73c722d29b94a74f2a2b752b
-RUN . ./libcomponent.sh && component_unpack "java" "1.8.242-0" --checksum 3a70f3d1c3cd9bc6ec581b2a10373a2b323c0b9af40402ce8d19aeb0b3d02400
-RUN . ./libcomponent.sh && component_unpack "gosu" "1.11.0-3" --checksum c18bb8bcc95aa2494793ed5a506c4d03acc82c8c60ad061d5702e0b4048f0cb1
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "logstash" "7.6.1-0" --checksum e7f3eb4734b7ccc6ba0297a1b48bc3c321b254ce73c722d29b94a74f2a2b752b
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "1.8.242-0" --checksum 3a70f3d1c3cd9bc6ec581b2a10373a2b323c0b9af40402ce8d19aeb0b3d02400
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.11.0-3" --checksum c18bb8bcc95aa2494793ed5a506c4d03acc82c8c60ad061d5702e0b4048f0cb1
 RUN apt-get update && apt-get upgrade -y && \
     rm -r /var/lib/apt/lists /var/cache/apt/archives
 RUN useradd -r -u 1001 -g root logstash
 
 COPY rootfs /
-RUN /postunpack.sh
+RUN /opt/bitnami/scripts/logstash/postunpack.sh
 ENV BITNAMI_APP_NAME="logstash" \
-    BITNAMI_IMAGE_VERSION="7.6.1-debian-10-r11" \
+    BITNAMI_IMAGE_VERSION="7.6.1-debian-10-r12" \
     PATH="/opt/bitnami/logstash/bin:/opt/bitnami/java/bin:/opt/bitnami/common/bin:$PATH"
 
 EXPOSE 8080
 
 WORKDIR /opt/bitnami/logstash
 USER 1001
-ENTRYPOINT [ "/entrypoint.sh" ]
-CMD [ "/run.sh" ]
+ENTRYPOINT [ "/opt/bitnami/scripts/logstash/entrypoint.sh" ]
+CMD [ "/opt/bitnami/scripts/logstash/run.sh" ]
diff --git a/bitnami/logstash/7/debian-10/prebuildfs/build/install-gosu.sh b/bitnami/logstash/7/debian-10/prebuildfs/build/install-gosu.sh
deleted file mode 100755
index 1756700daa89..000000000000
--- a/bitnami/logstash/7/debian-10/prebuildfs/build/install-gosu.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-VERSION="1.11"
-SHA256="0b843df6d86e270c5b0f5cbd3c326a04e18f4b7f9b8457fa497b0454c4b138d7"
-
-curl --silent -L "https://github.com/tianon/gosu/releases/download/${VERSION}/gosu-amd64" > "/usr/local/bin/gosu"
-echo "$SHA256" "/usr/local/bin/gosu" | sha256sum --check
-chmod u+x "/usr/local/bin/gosu"
-mkdir -p "/opt/bitnami/licenses"
-curl --silent -L "https://raw.githubusercontent.com/tianon/gosu/master/LICENSE" > "/opt/bitnami/licenses/gosu-${VERSION}.txt"
diff --git a/bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/.exists b/bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/.exists
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/bitnami/logstash/7/debian-10/prebuildfs/libbitnami.sh b/bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libbitnami.sh
similarity index 94%
rename from bitnami/logstash/7/debian-10/prebuildfs/libbitnami.sh
rename to bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libbitnami.sh
index ec789d8227eb..2160b50559cf 100644
--- a/bitnami/logstash/7/debian-10/prebuildfs/libbitnami.sh
+++ b/bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libbitnami.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
-# shellcheck disable=SC1090
 #
 # Bitnami custom library
 
+# shellcheck disable=SC1091
+
 # Load Generic Libraries
-. "${BITNAMI_SCRIPTS_DIR:-}"/liblog.sh
+. /opt/bitnami/scripts/liblog.sh
 
 # Constants
 BOLD='\033[1m'
diff --git a/bitnami/logstash/7/debian-10/prebuildfs/libcomponent.sh b/bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh
similarity index 100%
rename from bitnami/logstash/7/debian-10/prebuildfs/libcomponent.sh
rename to bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh
diff --git a/bitnami/logstash/7/debian-10/prebuildfs/libfile.sh b/bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh
similarity index 100%
rename from bitnami/logstash/7/debian-10/prebuildfs/libfile.sh
rename to bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh
diff --git a/bitnami/logstash/7/debian-10/prebuildfs/libfs.sh b/bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
similarity index 97%
rename from bitnami/logstash/7/debian-10/prebuildfs/libfs.sh
rename to bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
index 1a1fc5522dec..fac947bc44f2 100644
--- a/bitnami/logstash/7/debian-10/prebuildfs/libfs.sh
+++ b/bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
-# shellcheck disable=SC1090
 #
 # Library for file system actions
 
+# shellcheck disable=SC1091
+
 # Load Generic Libraries
-. "${BITNAMI_SCRIPTS_DIR:-}"/liblog.sh
+. /opt/bitnami/scripts/liblog.sh
 
 # Functions
 
diff --git a/bitnami/logstash/7/debian-10/prebuildfs/liblog.sh b/bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh
similarity index 100%
rename from bitnami/logstash/7/debian-10/prebuildfs/liblog.sh
rename to bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh
diff --git a/bitnami/logstash/7/debian-10/prebuildfs/libnet.sh b/bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh
similarity index 97%
rename from bitnami/logstash/7/debian-10/prebuildfs/libnet.sh
rename to bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh
index 96e491e5a9db..e3145b134ece 100644
--- a/bitnami/logstash/7/debian-10/prebuildfs/libnet.sh
+++ b/bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh
@@ -2,8 +2,10 @@
 #
 # Library for network functions
 
+# shellcheck disable=SC1091
+
 # Load Generic Libraries
-. /liblog.sh
+. /opt/bitnami/scripts/liblog.sh
 
 # Functions
 
diff --git a/bitnami/logstash/7/debian-10/prebuildfs/libos.sh b/bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
similarity index 98%
rename from bitnami/logstash/7/debian-10/prebuildfs/libos.sh
rename to bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
index 041581ca0655..b6fc10db1518 100644
--- a/bitnami/logstash/7/debian-10/prebuildfs/libos.sh
+++ b/bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
-# shellcheck disable=SC1090
 #
 # Library for operating system actions
 
+# shellcheck disable=SC1091
+
 # Load Generic Libraries
-. "${BITNAMI_SCRIPTS_DIR:-}"/liblog.sh
+. /opt/bitnami/scripts/liblog.sh
 
 # Functions
 
diff --git a/bitnami/logstash/7/debian-10/prebuildfs/libservice.sh b/bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
similarity index 100%
rename from bitnami/logstash/7/debian-10/prebuildfs/libservice.sh
rename to bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
diff --git a/bitnami/logstash/7/debian-10/prebuildfs/libvalidations.sh b/bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libvalidations.sh
similarity index 98%
rename from bitnami/logstash/7/debian-10/prebuildfs/libvalidations.sh
rename to bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libvalidations.sh
index 63c3d5ff1974..8d827924afe4 100644
--- a/bitnami/logstash/7/debian-10/prebuildfs/libvalidations.sh
+++ b/bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libvalidations.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
-# shellcheck disable=SC1090
 #
 # Validation functions library
 
+# shellcheck disable=SC1091
+
 # Load Generic Libraries
-. "${BITNAMI_SCRIPTS_DIR:-}"/liblog.sh
+. /opt/bitnami/scripts/liblog.sh
 
 # Functions
 
diff --git a/bitnami/logstash/7/debian-10/prebuildfs/libversion.sh b/bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh
similarity index 95%
rename from bitnami/logstash/7/debian-10/prebuildfs/libversion.sh
rename to bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh
index 6836372e0b55..66d4f457bdd2 100644
--- a/bitnami/logstash/7/debian-10/prebuildfs/libversion.sh
+++ b/bitnami/logstash/7/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
-# shellcheck disable=SC1090
 #
 # Library for managing versions strings
 
+# shellcheck disable=SC1091
+
 # Load Generic Libraries
-. "${BITNAMI_SCRIPTS_DIR:-}"/liblog.sh
+. /opt/bitnami/scripts/liblog.sh
 
 # Functions
 ########################
diff --git a/bitnami/logstash/7/debian-10/rootfs/licenses/licenses.txt b/bitnami/logstash/7/debian-10/rootfs/opt/bitnami/licenses/licenses.txt
similarity index 100%
rename from bitnami/logstash/7/debian-10/rootfs/licenses/licenses.txt
rename to bitnami/logstash/7/debian-10/rootfs/opt/bitnami/licenses/licenses.txt
diff --git a/bitnami/logstash/7/debian-10/rootfs/liblogstash.sh b/bitnami/logstash/7/debian-10/rootfs/opt/bitnami/scripts/liblogstash.sh
similarity index 96%
rename from bitnami/logstash/7/debian-10/rootfs/liblogstash.sh
rename to bitnami/logstash/7/debian-10/rootfs/opt/bitnami/scripts/liblogstash.sh
index 9084ee1cf846..416fe5149388 100644
--- a/bitnami/logstash/7/debian-10/rootfs/liblogstash.sh
+++ b/bitnami/logstash/7/debian-10/rootfs/opt/bitnami/scripts/liblogstash.sh
@@ -2,14 +2,13 @@
 #
 # Bitnami Logstash library
 
-# shellcheck disable=SC1090
 # shellcheck disable=SC1091
 
 # Load Generic Libraries
-. /liblog.sh
-. /libvalidations.sh
-. /libos.sh
-. /libfs.sh
+. /opt/bitnami/scripts/liblog.sh
+. /opt/bitnami/scripts/libvalidations.sh
+. /opt/bitnami/scripts/libos.sh
+. /opt/bitnami/scripts/libfs.sh
 
 ########################
 # Loads global variables used on LogstashLogstash configuration.
diff --git a/bitnami/logstash/7/debian-10/rootfs/entrypoint.sh b/bitnami/logstash/7/debian-10/rootfs/opt/bitnami/scripts/logstash/entrypoint.sh
similarity index 62%
rename from bitnami/logstash/7/debian-10/rootfs/entrypoint.sh
rename to bitnami/logstash/7/debian-10/rootfs/opt/bitnami/scripts/logstash/entrypoint.sh
index 8c74d8d041a0..2a8444d10656 100755
--- a/bitnami/logstash/7/debian-10/rootfs/entrypoint.sh
+++ b/bitnami/logstash/7/debian-10/rootfs/opt/bitnami/scripts/logstash/entrypoint.sh
@@ -8,18 +8,18 @@ set -o pipefail
 #set -o xtrace # Uncomment this line for debugging purpose
 
 # Load libraries
-. /libbitnami.sh
-. /liblog.sh
-. /liblogstash.sh
+. /opt/bitnami/scripts/libbitnami.sh
+. /opt/bitnami/scripts/liblog.sh
+. /opt/bitnami/scripts/liblogstash.sh
 
 # Load Logstash environment variables
 eval "$(logstash_env)"
 
 print_welcome_page
 
-if [[ "$*" = *"/run.sh"* ]]; then
+if [[ "$*" = *"/opt/bitnami/scripts/logstash/run.sh"* ]]; then
     info "** Starting Logstash setup **"
-    /setup.sh
+    /opt/bitnami/scripts/logstash/setup.sh
     info "** Logstash setup finished! **"
 fi
 
diff --git a/bitnami/logstash/7/debian-10/rootfs/postunpack.sh b/bitnami/logstash/7/debian-10/rootfs/opt/bitnami/scripts/logstash/postunpack.sh
similarity index 85%
rename from bitnami/logstash/7/debian-10/rootfs/postunpack.sh
rename to bitnami/logstash/7/debian-10/rootfs/opt/bitnami/scripts/logstash/postunpack.sh
index 47d992f528c7..a1f8c96a2019 100755
--- a/bitnami/logstash/7/debian-10/rootfs/postunpack.sh
+++ b/bitnami/logstash/7/debian-10/rootfs/opt/bitnami/scripts/logstash/postunpack.sh
@@ -8,8 +8,8 @@ set -o pipefail
 # set -o xtrace # Uncomment this line for debugging purpose
 
 # Load libraries
-. /libfs.sh
-. /liblogstash.sh
+. /opt/bitnami/scripts/libfs.sh
+. /opt/bitnami/scripts/liblogstash.sh
 
 # Load Logstash environment variables
 eval "$(logstash_env)"
diff --git a/bitnami/logstash/7/debian-10/rootfs/run.sh b/bitnami/logstash/7/debian-10/rootfs/opt/bitnami/scripts/logstash/run.sh
similarity index 91%
rename from bitnami/logstash/7/debian-10/rootfs/run.sh
rename to bitnami/logstash/7/debian-10/rootfs/opt/bitnami/scripts/logstash/run.sh
index 8ed69329b30f..338e8bbd525d 100755
--- a/bitnami/logstash/7/debian-10/rootfs/run.sh
+++ b/bitnami/logstash/7/debian-10/rootfs/opt/bitnami/scripts/logstash/run.sh
@@ -8,8 +8,8 @@ set -o pipefail
 # set -o xtrace # Uncomment this line for debugging purpose
 
 # Load libraries
-. /liblog.sh
-. /liblogstash.sh
+. /opt/bitnami/scripts/liblog.sh
+. /opt/bitnami/scripts/liblogstash.sh
 
 # Load Logstash environment variables
 eval "$(logstash_env)"
diff --git a/bitnami/logstash/7/debian-10/rootfs/setup.sh b/bitnami/logstash/7/debian-10/rootfs/opt/bitnami/scripts/logstash/setup.sh
similarity index 92%
rename from bitnami/logstash/7/debian-10/rootfs/setup.sh
rename to bitnami/logstash/7/debian-10/rootfs/opt/bitnami/scripts/logstash/setup.sh
index aa1d965dff28..c0ef6caec829 100755
--- a/bitnami/logstash/7/debian-10/rootfs/setup.sh
+++ b/bitnami/logstash/7/debian-10/rootfs/opt/bitnami/scripts/logstash/setup.sh
@@ -8,7 +8,7 @@ set -o pipefail
 # set -o xtrace # Uncomment this line for debugging purpose
 
 # Load libraries
-. /liblogstash.sh
+. /opt/bitnami/scripts/liblogstash.sh
 
 # Load Logstash environment variables
 eval "$(logstash_env)"
diff --git a/bitnami/logstash/README.md b/bitnami/logstash/README.md
index 2c90d8422b02..cbddcdfa116c 100644
--- a/bitnami/logstash/README.md
+++ b/bitnami/logstash/README.md
@@ -44,7 +44,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/).
 
 
-* [`7-debian-10`, `7.6.1-debian-10-r11`, `7`, `7.6.1`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-logstash/blob/7.6.1-debian-10-r11/7/debian-10/Dockerfile)
+* [`7-debian-10`, `7.6.1-debian-10-r12`, `7`, `7.6.1`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-logstash/blob/7.6.1-debian-10-r12/7/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/logstash GitHub repo](https://github.com/bitnami/bitnami-docker-logstash).