diff --git a/.github/ISSUE_TEMPLATE/update-base-stackable.md b/.github/ISSUE_TEMPLATE/update-base-stackable.md
index ebb154ba2..30327d1b5 100644
--- a/.github/ISSUE_TEMPLATE/update-base-stackable.md
+++ b/.github/ISSUE_TEMPLATE/update-base-stackable.md
@@ -27,12 +27,17 @@ Add/Change/Remove anything that isn't applicable anymore
 
 ## Update tasks
 
-- [ ] Update UBI version hash in the Dockerfile (`FROM`)
+### `stackable-base`
+
+- [ ] Update `FROM ...ubi-minimal` version hash in the Dockerfile
+- [ ] Update `CONFIG_UTILS_VERSION`
+
+### `stackable-devel`
+
+- [ ] Update `FROM ...ubi-minimal` version hash in the Dockerfile
 - [ ] Update `RUST_DEFAULT_TOOLCHAIN_VERSION`
 - [ ] Update `CARGO_CYCLONEDX_CRATE_VERSION`
 - [ ] Update `CARGO_AUDITABLE_CRATE_VERSION`
-- [ ] Update `PROTOC_VERSION`
-- [ ] Update `CONFIG_UTILS_VERSION`
 
 ## Related Pull Requests
 
diff --git a/.github/ISSUE_TEMPLATE/update-product-druid.md b/.github/ISSUE_TEMPLATE/update-product-druid.md
index 04e750553..97e2da501 100644
--- a/.github/ISSUE_TEMPLATE/update-product-druid.md
+++ b/.github/ISSUE_TEMPLATE/update-product-druid.md
@@ -27,12 +27,13 @@ Add/Change/Remove anything that isn't applicable anymore
 
 ## Update tasks
 
+- [ ] Release a new version of [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer)
 - [ ] Update `versions.py` to reflect the agreed upon versions in the spreadsheet (including the removal of old versions).
+- [ ] Update the [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer/) with the new set of versions.
 - [ ] Upload new version (see `druid/upload_new_druid_version.sh`).
 - [ ] Create a file: `druid/stackable/patches/x.y.z/.gitkeep`, add patches if applicable.
 - [ ] Delete old patch directories.
 - [ ] Update `versions.py` to the latest supported version of JVM (base and devel).
-- [ ] Update the [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer/) with the new set of versions.
 - [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below.
 - [ ] Ensure prerequisites are up to date (required-external-components.adoc).
 - [ ] Update the version in demos. Add the PR(s) to the list below.
@@ -43,11 +44,11 @@ Add/Change/Remove anything that isn't applicable anymore
 > Delete any items that do not apply so that all applicable items can be checked.
 > For example, if you add release notes to the documentation repository, you do not need the latter two criteria.
 
+- [ ] _Link to [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer/) PR_
 - [ ] _Link to the docker-images PR (product update)_
 - [ ] _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 [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer/) PR_
 - [ ] _Link to the Release Notes PR in the documentation repo (if not a comment below)_
 
 ## Acceptance
diff --git a/stackable-base/Dockerfile b/stackable-base/Dockerfile
index 17214fd05..0e2c16d45 100644
--- a/stackable-base/Dockerfile
+++ b/stackable-base/Dockerfile
@@ -1,6 +1,12 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # check=error=true
 
+#
+# Base image for final stages
+# Should not contain any components that are not needed (or helpful) at runtime
+# Build time dependencies that are used in multiple images can be added to `stackable-devel` (or a derivative like `java-devel`) instead
+#
+
 FROM stackable/image/stackable-devel AS config-utils
 
 # Find the latest version here: https://github.com/stackabletech/config-utils/tags
diff --git a/stackable-devel/Dockerfile b/stackable-devel/Dockerfile
index 9b91674ee..bd52f9d16 100644
--- a/stackable-devel/Dockerfile
+++ b/stackable-devel/Dockerfile
@@ -3,6 +3,9 @@
 
 #
 # Base image for builder stages
+# It is intended to be used as an intermediate "workbench" layer to build components
+# It should not be the base for a final image to avoid shipping build time dependencies like `patchable` or `gcc`
+# Use `stackable-base` as a base for the final image stage instead
 #
 
 # Find the latest version at https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5?container-tabs=gti