diff --git a/CHANGELOG.md b/CHANGELOG.md
index bec3f7b19..b8a18d78d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file.
 - kafka: Add cyrus-sasl-gssapi package for kerberos ([#874]).
 - spark: Add HBase connector ([#878], [#882]).
 - hbase: hbase-entrypoint.sh script to start and gracefully stop services ([#898]).
+- tools: install yq command line tool for YAML manipulation ([#912]).
 
 ### Changed
 
@@ -95,6 +96,7 @@ All notable changes to this project will be documented in this file.
 [#903]: https://github.com/stackabletech/docker-images/pull/903
 [#907]: https://github.com/stackabletech/docker-images/pull/907
 [#910]: https://github.com/stackabletech/docker-images/pull/910
+[#912]: https://github.com/stackabletech/docker-images/pull/912
 
 ## [24.7.0] - 2024-07-24
 
diff --git a/tools/Dockerfile b/tools/Dockerfile
index c13ce644a..22ef5aa5c 100644
--- a/tools/Dockerfile
+++ b/tools/Dockerfile
@@ -7,6 +7,7 @@ ARG PRODUCT
 ARG KUBECTL_VERSION
 ARG RELEASE
 ARG JQ_VERSION
+ARG YQ_VERSION
 ARG TARGETARCH
 ARG STACKABLE_USER_UID
 
@@ -44,6 +45,12 @@ curl "https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux
     -o /stackable/bin/jq
 chmod +x /stackable/bin/jq
 
+# Needed to to patch manifests in OLM environments with tolerations
+# and environment variables.
+curl "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_${TARGETARCH}" \
+    -o /stackable/bin/yq
+chmod +x /stackable/bin/yq
+
 # All files and folders owned by root group to support running as arbitrary users.
 # This is best practice as all container users will belong to the root group (0).
 chown -R ${STACKABLE_USER_UID}:0 /stackable
diff --git a/tools/versions.py b/tools/versions.py
index a70048650..6fd96cda0 100644
--- a/tools/versions.py
+++ b/tools/versions.py
@@ -4,5 +4,6 @@
         "kubectl_version": "1.31.1",
         "jq_version": "1.7.1",
         "stackable-base": "1.0.0",
+        "yq_version": "4.44.3",
     },
 ]