diff --git a/.github/ISSUE_TEMPLATE/early-pre-release.md b/.github/ISSUE_TEMPLATE/early-pre-release.md
index 9028d996c..a606e125a 100644
--- a/.github/ISSUE_TEMPLATE/early-pre-release.md
+++ b/.github/ISSUE_TEMPLATE/early-pre-release.md
@@ -53,7 +53,7 @@ Part of stackabletech/issues#xxx.
 ## Additional items which don't have a tracking issue
 
 - [ ] jmx_exporter (validate via hdfs-operator smoke tests)
-- [ ] krb5
+- [ ] krb5-testing-tools (Update the base image if possible)
 - [ ] tools (update the versions in version.py)
 - [ ] testing-tools (update the base, maybe keycloak)
 - [ ] statsd_exporter
diff --git a/.github/ISSUE_TEMPLATE/update-product-nifi.md b/.github/ISSUE_TEMPLATE/update-product-nifi.md
index f39826551..add2b4ad4 100644
--- a/.github/ISSUE_TEMPLATE/update-product-nifi.md
+++ b/.github/ISSUE_TEMPLATE/update-product-nifi.md
@@ -33,6 +33,7 @@ Add/Change/Remove anything that isn't applicable anymore
 - [ ] Update other dependencies if applicable (eg: jmx_exporter, kcat, scala, etc).
 - [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below.
 - [ ] Update the version in demos. Add the PR(s) to the list below.
+- [ ] Update versions used in the documentation repository.
 
 ## Related Pull Requests
 
@@ -44,6 +45,7 @@ Add/Change/Remove anything that isn't applicable anymore
 - _Link to the operator PR (getting_started / kuttl / supported-versions)_
 - _Link to any other operator PRs (getting_started / kuttl)_
 - _Link to demo PR (raise against the `main` branch)_
+- _Link to documentation repo PR_
 - _Link to the Release Notes PR in the documentation repo (if not a comment below)_
 
 ## Acceptance
diff --git a/.github/ISSUE_TEMPLATE/update-product-trino.md b/.github/ISSUE_TEMPLATE/update-product-trino.md
index 34c795484..e502c7d8a 100644
--- a/.github/ISSUE_TEMPLATE/update-product-trino.md
+++ b/.github/ISSUE_TEMPLATE/update-product-trino.md
@@ -35,7 +35,7 @@ Add/Change/Remove anything that isn't applicable anymore
 - [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below.
 - [ ] Maybe update versions in `tests/templates/kuttl/opa-authorization/check-opa.py.j2` (if tests fail)
 - [ ] Update the version in demos. Add the PR(s) to the list below.
-- [ ] Update versions used in the documentation repository
+- [ ] Update versions used in the documentation repository.
 
 ### trino-cli
 
@@ -44,7 +44,7 @@ Add/Change/Remove anything that isn't applicable anymore
 - [ ] Update `versions.py` to the latest supported version of JVM (base and devel).
 - [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below.
 - [ ] Update the version in demos. Add the PR(s) to the list below.
-- [ ] Update versions used in the documentation repository
+- [ ] Update versions used in the documentation repository.
 
 ## Related Pull Requests
 
@@ -56,6 +56,7 @@ Add/Change/Remove anything that isn't applicable anymore
 - _Link to the operator PR (getting_started / kuttl / supported-versions)_
 - _Link to any other operator PRs (getting_started / kuttl)_
 - _Link to demo PR (raise against the `main` branch)_
+- _Link to documentation repo PR_
 - _Link to the Release Notes PR in the documentation repo (if not a comment below)_
 
 ## Acceptance
diff --git a/.github/ISSUE_TEMPLATE/update-product-zookeeper.md b/.github/ISSUE_TEMPLATE/update-product-zookeeper.md
index e88d272fd..d3cd23c03 100644
--- a/.github/ISSUE_TEMPLATE/update-product-zookeeper.md
+++ b/.github/ISSUE_TEMPLATE/update-product-zookeeper.md
@@ -33,6 +33,7 @@ Add/Change/Remove anything that isn't applicable anymore
 - [ ] Update other dependencies if applicable (eg: jmx_exporter, etc).
 - [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below.
 - [ ] Update the version in demos. Add the PR(s) to the list below.
+- [ ] Update versions used in the documentation repository.
 
 ## Related Pull Requests
 
@@ -44,6 +45,7 @@ Add/Change/Remove anything that isn't applicable anymore
 - _Link to the operator PR (getting_started / kuttl / supported-versions)_
 - _Link to any other operator PRs (getting_started / kuttl)_
 - _Link to demo PR (raise against the `main` branch)_
+- _Link to documentation repo PR_
 - _Link to the Release Notes PR in the documentation repo (if not a comment below)_
 
 ## Acceptance
diff --git a/.github/workflows/build_krb5.yaml b/.github/workflows/build_krb5-testing-tools.yaml
similarity index 75%
rename from .github/workflows/build_krb5.yaml
rename to .github/workflows/build_krb5-testing-tools.yaml
index b475ee2af..d69cb631e 100644
--- a/.github/workflows/build_krb5.yaml
+++ b/.github/workflows/build_krb5-testing-tools.yaml
@@ -1,7 +1,7 @@
 ---
-name: Build Krb5
+name: Build Krb5 Testing Tools
 run-name: |
-  Build Krb5 (attempt #${{ github.run_attempt }})
+  Build Krb5 Testing Tools (attempt #${{ github.run_attempt }})
 
 on:
   workflow_dispatch:
@@ -13,9 +13,9 @@ on:
     paths:
       # To check dependencies, run this ( you will need to consider transitive dependencies)
       # bake --product PRODUCT -d | grep -v 'docker buildx bake' | jq '.target | keys[]'
-      - krb5/**
+      - krb5-testing-tools/**
       - .github/actions/**
-      - .github/workflows/build_krb5.yaml
+      - .github/workflows/build_krb5-testing-tools.yaml
       - .github/workflows/reusable_build_image.yaml
 
 jobs:
@@ -26,6 +26,6 @@ jobs:
       harbor-robot-secret: ${{ secrets.HARBOR_ROBOT_SDP_GITHUB_ACTION_BUILD_SECRET }}
       slack-token: ${{ secrets.SLACK_CONTAINER_IMAGE_TOKEN }}
     with:
-      product-name: krb5
+      product-name: krb5-testing-tools
       sdp-version: ${{ github.ref_type == 'tag' && github.ref_name || '0.0.0-dev' }}
-      registry-namespace: sdp
+      registry-namespace: stackable
diff --git a/.scripts/enumerate-product-versions.py b/.scripts/enumerate-product-versions.py
index 7c3180c26..56c799617 100644
--- a/.scripts/enumerate-product-versions.py
+++ b/.scripts/enumerate-product-versions.py
@@ -15,7 +15,7 @@
     "hive",
     "kafka",
     "kafka-testing-tools",
-    "krb5",
+    "krb5-testing-tools",
     "nifi",
     "opa",
     "omid",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37ecd583b..b2db4effd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -82,6 +82,7 @@ All notable changes to this project will be documented in this file.
 - vector: Bump to `0.47.0` ([#1152]).
 - zookeeper: backport ZOOKEEPER-4846, ZOOKEEPER-4921, ZOOKEEPER-4925 into Zookeeper 3.9.3 ([#1150]).
 - testing-tools: Update base image ([#1165]).
+- krb5-testing-tools: Rename image from `krb5` ([#1167]).
 
 ### Fixed
 
@@ -187,9 +188,10 @@ All notable changes to this project will be documented in this file.
 [#1152]: https://github.com/stackabletech/docker-images/pull/1152
 [#1156]: https://github.com/stackabletech/docker-images/pull/1156
 [#1157]: https://github.com/stackabletech/docker-images/pull/1157
+[#1161]: https://github.com/stackabletech/docker-images/pull/1161
 [#1163]: https://github.com/stackabletech/docker-images/pull/1163
 [#1165]: https://github.com/stackabletech/docker-images/pull/1165
-[#1161]: https://github.com/stackabletech/docker-images/pull/1161
+[#1167]: https://github.com/stackabletech/docker-images/pull/1167
 
 ## [25.3.0] - 2025-03-21
 
diff --git a/README.md b/README.md
index d0df4da04..9bc8c1182 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ This repository contains Dockerfiles and scripts to build base images for use wi
 | -: | -: | -: | -: |
 | [![Build Airflow]][build_airflow.yaml] | [![Build Druid]][build_druid.yaml] | [![Build Hadoop]][build_hadoop.yaml] | [![Build HBase]][build_hbase.yaml] |
 | [![Build Hello-World]][build_hello-world.yaml] | [![Build Hive]][build_hive.yaml] | [![Build Java Base]][build_java-base.yaml] | [![Build Java Development]][build_java-devel.yaml] |
-| [![Build Kafka Testing Tools]][build_kafka-testing-tools.yaml] | [![Build Kafka]][build_kafka.yaml] | [![Build Krb5]][build_krb5.yaml] | [![Build NiFi]][build_nifi.yaml] |
+| [![Build Kafka Testing Tools]][build_kafka-testing-tools.yaml] | [![Build Kafka]][build_kafka.yaml] | [![Build Krb5 Testing Tools]][build_krb5-testing-tools.yaml] | [![Build NiFi]][build_nifi.yaml] |
 | [![Build Omid]][build_omid.yaml] | [![Build OPA]][build_opa.yaml] | [![Build Spark Connect Client]][build_spark-connect-client.yaml] | [![Build Spark K8s]][build_spark-k8s.yaml] |
 | [![Build Stackable Base]][build_stackable-base.yaml] | [![Build Superset]][build_superset.yaml] | [![Build Testing Tools]][build_testing-tools.yaml] | [![Build Tools]][build_tools.yaml] |
 | [![Build Trino CLI]][build_trino-cli.yaml] | [![Build Trino]][build_trino.yaml] | [![Build Vector]][build_vector.yaml] | [![Build ZooKeeper]][build_zookeeper.yaml] |
@@ -234,8 +234,8 @@ ENTRYPOINT ["/stackable-zookeeper-operator"]
 [build_kafka-testing-tools.yaml]: https://github.com/stackabletech/docker-images/actions/workflows/build_kafka-testing-tools.yaml
 [Build Kafka]: https://github.com/stackabletech/docker-images/actions/workflows/build_kafka.yaml/badge.svg
 [build_kafka.yaml]: https://github.com/stackabletech/docker-images/actions/workflows/build_kafka.yaml
-[Build Krb5]: https://github.com/stackabletech/docker-images/actions/workflows/build_krb5.yaml/badge.svg
-[build_krb5.yaml]: https://github.com/stackabletech/docker-images/actions/workflows/build_krb5.yaml
+[Build Krb5 Testing Tools]: https://github.com/stackabletech/docker-images/actions/workflows/build_krb5-testing-tools.yaml/badge.svg
+[build_krb5-testing-tools.yaml]: https://github.com/stackabletech/docker-images/actions/workflows/build_krb5-testing-tools.yaml
 [Build NiFi]: https://github.com/stackabletech/docker-images/actions/workflows/build_nifi.yaml/badge.svg
 [build_nifi.yaml]: https://github.com/stackabletech/docker-images/actions/workflows/build_nifi.yaml
 [Build Omid]: https://github.com/stackabletech/docker-images/actions/workflows/build_omid.yaml/badge.svg
diff --git a/conf.py b/conf.py
index 2840a9511..4c438447c 100644
--- a/conf.py
+++ b/conf.py
@@ -22,7 +22,7 @@
 java_base = importlib.import_module("java-base.versions")
 java_devel = importlib.import_module("java-devel.versions")
 kafka = importlib.import_module("kafka.versions")
-krb5 = importlib.import_module("krb5.versions")
+krb5_testing_tools = importlib.import_module("krb5-testing-tools.versions")
 vector = importlib.import_module("vector.versions")
 nifi = importlib.import_module("nifi.versions")
 omid = importlib.import_module("omid.versions")
@@ -55,7 +55,7 @@
     {"name": "java-base", "versions": java_base.versions},
     {"name": "java-devel", "versions": java_devel.versions},
     {"name": "kafka", "versions": kafka.versions},
-    {"name": "krb5", "versions": krb5.versions},
+    {"name": "krb5-testing-tools", "versions": krb5_testing_tools.versions},
     {"name": "vector", "versions": vector.versions},
     {"name": "nifi", "versions": nifi.versions},
     {"name": "omid", "versions": omid.versions},
diff --git a/krb5/Dockerfile b/krb5-testing-tools/Dockerfile
similarity index 100%
rename from krb5/Dockerfile
rename to krb5-testing-tools/Dockerfile
diff --git a/krb5-testing-tools/README.md b/krb5-testing-tools/README.md
new file mode 100644
index 000000000..235ef8c3c
--- /dev/null
+++ b/krb5-testing-tools/README.md
@@ -0,0 +1,13 @@
+# krb5-testing-tools
+
+> [!CAUTION]
+> This image is only intended for Stackable-internal tests.
+> **It should not be considered a production-ready Kerberos KDC.**
+
+Used in:
+
+- [ad-init]
+- [hdfs-topology-provider]
+
+[ad-init]: https://github.com/stackabletech/ad-init
+[hdfs-topology-provider]: https://github.com/stackabletech/hdfs-topology-provider
diff --git a/krb5/versions.py b/krb5-testing-tools/versions.py
similarity index 100%
rename from krb5/versions.py
rename to krb5-testing-tools/versions.py
diff --git a/krb5/README.adoc b/krb5/README.adoc
deleted file mode 100644
index a1c046160..000000000
--- a/krb5/README.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-This image is only intended for Stackable-internal tests. It should not be considered a production-ready
-Kerberos KDC.