diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30a78cb54..2d1f3584c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ All notable changes to this project will be documented in this file.
 ### Added
 
 - hadoop: Add all necessary components to the image to mount HDFS using FUSE ([#400])
-- hbase: Add hbase-operator-tools ([#497]).
+- hbase: Add hbase-operator-tools ([#497], [#498]).
 - java-base: Add needed tzdata-java package ([#425]).
 - testing-tools: Add java, tzdata-java, unzip ([#464], [#465], [#466]).
 
@@ -104,6 +104,7 @@ All notable changes to this project will be documented in this file.
 [#489]: https://github.com/stackabletech/docker-images/pull/489
 [#494]: https://github.com/stackabletech/docker-images/pull/494
 [#497]: https://github.com/stackabletech/docker-images/pull/497
+[#498]: https://github.com/stackabletech/docker-images/pull/498
 
 ## [23.7.0] - 2023-07-14
 
diff --git a/hbase/Dockerfile b/hbase/Dockerfile
index d52b403d0..37cc23d57 100644
--- a/hbase/Dockerfile
+++ b/hbase/Dockerfile
@@ -15,8 +15,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # zip required for the log4shell stuff
 RUN microdnf update && \
     microdnf install \
-    # The GNU gettext utilities contain the envsubst program which \
-    # substitutes the values of environment variables. \
+    # The GNU gettext utilities contain the envsubst program which
+    # substitutes the values of environment variables.
     gettext \
     git \
     gzip \
@@ -61,10 +61,10 @@ RUN curl --fail -L "https://repo.stackable.tech/repository/packages/hbase-operat
     rm -rf /stackable/hbase-operator-tools-${HBASE_OPERATOR_TOOLS}-src
 
 # Resolve paths in bin/hbck2
-RUN # The variable names are intentionally passed to envsubst in single-quotes, \
-    # so that they are not expanded. Disable the according ShellCheck rule: \
-    # shellcheck disable=SC2016 \
-    mv bin/hbck2 bin/hbck2.env && \
+RUN mv bin/hbck2 bin/hbck2.env && \
+    # The variable names are intentionally passed to envsubst in single-quotes,
+    # so that they are not expanded. Disabling ShellCheck rules in a Dockerfile
+    # does not work, so please ignore the according warning (SC2016).
     envsubst '${PRODUCT}:${HBASE_OPERATOR_TOOLS}' < bin/hbck2.env > bin/hbck2 && \
     chmod +x bin/hbck2 && \
     rm bin/hbck2.env