diff --git a/.github/ISSUE_TEMPLATE/update-base-java.md b/.github/ISSUE_TEMPLATE/update-base-java.md
index b29a47cb0..69efe017d 100644
--- a/.github/ISSUE_TEMPLATE/update-base-java.md
+++ b/.github/ISSUE_TEMPLATE/update-base-java.md
@@ -63,7 +63,7 @@ we should also make new versions of Java available for use.
 
 ```shell
 # See the latest version at https://pypi.org/project/image-tools-stackabletech/
-pip install image-tools-stackabletech==0.0.13
+pip install image-tools-stackabletech==0.0.16
 
 # Test a product image can build, eg: ZooKeeper
 bake --product zookeeper=x.y.z # where x.y.z is a valid product version using the newly added Java version
diff --git a/.github/ISSUE_TEMPLATE/update-base-stackable.md b/.github/ISSUE_TEMPLATE/update-base-stackable.md
index 1d20147cf..ebb154ba2 100644
--- a/.github/ISSUE_TEMPLATE/update-base-stackable.md
+++ b/.github/ISSUE_TEMPLATE/update-base-stackable.md
@@ -52,7 +52,7 @@ Add/Change/Remove anything that isn't applicable anymore
 
 ```shell
 # See the latest version at https://pypi.org/project/image-tools-stackabletech/
-pip install image-tools-stackabletech==0.0.13
+pip install image-tools-stackabletech==0.0.16
 
 bake --product vector=x.y.z # where x.y.z is a valid version
 ```
diff --git a/.github/ISSUE_TEMPLATE/update-base-vector.md b/.github/ISSUE_TEMPLATE/update-base-vector.md
index 43ea66ea6..2a8c28e55 100644
--- a/.github/ISSUE_TEMPLATE/update-base-vector.md
+++ b/.github/ISSUE_TEMPLATE/update-base-vector.md
@@ -70,7 +70,7 @@ Add/Change/Remove anything that isn't applicable anymore
 
 ```shell
 # See the latest version at https://pypi.org/project/image-tools-stackabletech/
-pip install image-tools-stackabletech==0.0.13
+pip install image-tools-stackabletech==0.0.16
 
 bake --product vector=x.y.z # where x.y.z is the new version added in this PR
 
diff --git a/.github/ISSUE_TEMPLATE/update-product-airflow.md b/.github/ISSUE_TEMPLATE/update-product-airflow.md
index 80f608ced..158b10e8f 100644
--- a/.github/ISSUE_TEMPLATE/update-product-airflow.md
+++ b/.github/ISSUE_TEMPLATE/update-product-airflow.md
@@ -63,7 +63,7 @@ Add/Change/Remove anything that isn't applicable anymore
 
 ```shell
 # See the latest version at https://pypi.org/project/image-tools-stackabletech/
-pip install image-tools-stackabletech==0.0.13
+pip install image-tools-stackabletech==0.0.16
 
 bake --product airflow=x.y.z # where x.y.z is the new version added in this PR
 
diff --git a/.github/ISSUE_TEMPLATE/update-product-druid.md b/.github/ISSUE_TEMPLATE/update-product-druid.md
index 2305bffb0..04e750553 100644
--- a/.github/ISSUE_TEMPLATE/update-product-druid.md
+++ b/.github/ISSUE_TEMPLATE/update-product-druid.md
@@ -67,7 +67,7 @@ Add/Change/Remove anything that isn't applicable anymore
 
 ```shell
 # See the latest version at https://pypi.org/project/image-tools-stackabletech/
-pip install image-tools-stackabletech==0.0.13
+pip install image-tools-stackabletech==0.0.16
 
 bake --product druid=x.y.z # where x.y.z is the new version added in this PR
 
diff --git a/.github/ISSUE_TEMPLATE/update-product-hbase-phoenix-omid.md b/.github/ISSUE_TEMPLATE/update-product-hbase-phoenix-omid.md
index 88a5768db..633be0368 100644
--- a/.github/ISSUE_TEMPLATE/update-product-hbase-phoenix-omid.md
+++ b/.github/ISSUE_TEMPLATE/update-product-hbase-phoenix-omid.md
@@ -71,7 +71,7 @@ Add/Change/Remove anything that isn't applicable anymore
 
 ```shell
 # See the latest version at https://pypi.org/project/image-tools-stackabletech/
-pip install image-tools-stackabletech==0.0.13
+pip install image-tools-stackabletech==0.0.16
 
 bake --product hbase=x.y.z # where x.y.z is the new version added in this PR
 bake --product omid=x.y.z # where x.y.z is the new version added in this PR
diff --git a/.github/ISSUE_TEMPLATE/update-product-hdfs.md b/.github/ISSUE_TEMPLATE/update-product-hdfs.md
index 1f9b13419..cf3b63350 100644
--- a/.github/ISSUE_TEMPLATE/update-product-hdfs.md
+++ b/.github/ISSUE_TEMPLATE/update-product-hdfs.md
@@ -64,7 +64,7 @@ Add/Change/Remove anything that isn't applicable anymore
 
 ```shell
 # See the latest version at https://pypi.org/project/image-tools-stackabletech/
-pip install image-tools-stackabletech==0.0.13
+pip install image-tools-stackabletech==0.0.16
 
 bake --product hadoop=x.y.z # where x.y.z is the new version added in this PR
 
diff --git a/.github/ISSUE_TEMPLATE/update-product-hive.md b/.github/ISSUE_TEMPLATE/update-product-hive.md
index 7afa60fca..1da166f1e 100644
--- a/.github/ISSUE_TEMPLATE/update-product-hive.md
+++ b/.github/ISSUE_TEMPLATE/update-product-hive.md
@@ -64,7 +64,7 @@ Add/Change/Remove anything that isn't applicable anymore
 
 ```shell
 # See the latest version at https://pypi.org/project/image-tools-stackabletech/
-pip install image-tools-stackabletech==0.0.13
+pip install image-tools-stackabletech==0.0.16
 
 bake --product hive=x.y.z # where x.y.z is the new version added in this PR
 
diff --git a/.github/ISSUE_TEMPLATE/update-product-kafka.md b/.github/ISSUE_TEMPLATE/update-product-kafka.md
index cff61c59c..51d37ed77 100644
--- a/.github/ISSUE_TEMPLATE/update-product-kafka.md
+++ b/.github/ISSUE_TEMPLATE/update-product-kafka.md
@@ -76,7 +76,7 @@ Add/Change/Remove anything that isn't applicable anymore
 
 ```shell
 # See the latest version at https://pypi.org/project/image-tools-stackabletech/
-pip install image-tools-stackabletech==0.0.13
+pip install image-tools-stackabletech==0.0.16
 
 bake --product kafka=x.y.z # where x.y.z is the new version added in this PR
 bake --product kafka-testing-tools=1.0.0 # This version doesn't change
diff --git a/.github/ISSUE_TEMPLATE/update-product-nifi.md b/.github/ISSUE_TEMPLATE/update-product-nifi.md
index 078bc1680..16e3fdc75 100644
--- a/.github/ISSUE_TEMPLATE/update-product-nifi.md
+++ b/.github/ISSUE_TEMPLATE/update-product-nifi.md
@@ -63,7 +63,7 @@ Add/Change/Remove anything that isn't applicable anymore
 
 ```shell
 # See the latest version at https://pypi.org/project/image-tools-stackabletech/
-pip install image-tools-stackabletech==0.0.13
+pip install image-tools-stackabletech==0.0.16
 
 bake --product nifi=x.y.z # where x.y.z is the new version added in this PR
 
diff --git a/.github/ISSUE_TEMPLATE/update-product-opa.md b/.github/ISSUE_TEMPLATE/update-product-opa.md
index b49776b42..f0312208d 100644
--- a/.github/ISSUE_TEMPLATE/update-product-opa.md
+++ b/.github/ISSUE_TEMPLATE/update-product-opa.md
@@ -62,7 +62,7 @@ Add/Change/Remove anything that isn't applicable anymore
 
 ```shell
 # See the latest version at https://pypi.org/project/image-tools-stackabletech/
-pip install image-tools-stackabletech==0.0.13
+pip install image-tools-stackabletech==0.0.16
 
 bake --product opa=x.y.z # where x.y.z is the new version added in this PR
 
diff --git a/.github/ISSUE_TEMPLATE/update-product-spark.md b/.github/ISSUE_TEMPLATE/update-product-spark.md
index 30e4be6ff..0ea2a4ca4 100644
--- a/.github/ISSUE_TEMPLATE/update-product-spark.md
+++ b/.github/ISSUE_TEMPLATE/update-product-spark.md
@@ -64,7 +64,7 @@ Add/Change/Remove anything that isn't applicable anymore
 
 ```shell
 # See the latest version at https://pypi.org/project/image-tools-stackabletech/
-pip install image-tools-stackabletech==0.0.13
+pip install image-tools-stackabletech==0.0.16
 
 bake --product spark-k8s=x.y.z # where x.y.z is the new version added in this PR
 
diff --git a/.github/ISSUE_TEMPLATE/update-product-superset.md b/.github/ISSUE_TEMPLATE/update-product-superset.md
index c04169c4d..1f32cd504 100644
--- a/.github/ISSUE_TEMPLATE/update-product-superset.md
+++ b/.github/ISSUE_TEMPLATE/update-product-superset.md
@@ -65,7 +65,7 @@ Add/Change/Remove anything that isn't applicable anymore
 
 ```shell
 # See the latest version at https://pypi.org/project/image-tools-stackabletech/
-pip install image-tools-stackabletech==0.0.13
+pip install image-tools-stackabletech==0.0.16
 
 bake --product superset=x.y.z # where x.y.z is the new version added in this PR
 
diff --git a/.github/ISSUE_TEMPLATE/update-product-trino.md b/.github/ISSUE_TEMPLATE/update-product-trino.md
index 06656a38e..8f3683380 100644
--- a/.github/ISSUE_TEMPLATE/update-product-trino.md
+++ b/.github/ISSUE_TEMPLATE/update-product-trino.md
@@ -73,7 +73,7 @@ Add/Change/Remove anything that isn't applicable anymore
 
 ```shell
 # See the latest version at https://pypi.org/project/image-tools-stackabletech/
-pip install image-tools-stackabletech==0.0.13
+pip install image-tools-stackabletech==0.0.16
 
 bake --product trino=x.y.z # where x.y.z is the new version added in this PR
 bake --product trino-cli=x.y.z # where x.y.z is the new version added in this PR
diff --git a/.github/ISSUE_TEMPLATE/update-product-zookeeper.md b/.github/ISSUE_TEMPLATE/update-product-zookeeper.md
index 0f2f5ca44..b520c2e6d 100644
--- a/.github/ISSUE_TEMPLATE/update-product-zookeeper.md
+++ b/.github/ISSUE_TEMPLATE/update-product-zookeeper.md
@@ -63,7 +63,7 @@ Add/Change/Remove anything that isn't applicable anymore
 
 ```shell
 # See the latest version at https://pypi.org/project/image-tools-stackabletech/
-pip install image-tools-stackabletech==0.0.13
+pip install image-tools-stackabletech==0.0.16
 
 bake --product zookeeper=x.y.z # where x.y.z is the new version added in this PR
 
diff --git a/.github/workflows/mirror.yaml b/.github/workflows/mirror.yaml
index bc03df794..f4cfc35a5 100644
--- a/.github/workflows/mirror.yaml
+++ b/.github/workflows/mirror.yaml
@@ -57,7 +57,7 @@ jobs:
           echo "IMAGE_REPOSITORY=$(.scripts/get_repo_name.sh)" | tee -a "$GITHUB_ENV"
 
       - name: Publish Container Image on oci.stackable.tech
-        uses: stackabletech/actions/publish-image@55d2f9fcbcd7884ac929ea65fd6f069e7b7a49d2 # 0.8.1
+        uses: stackabletech/actions/publish-image@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2
         with:
           image-registry-uri: oci.stackable.tech
           image-registry-username: robot$sdp+github-action-build
@@ -84,7 +84,7 @@ jobs:
           echo "IMAGE_REPOSITORY=$(.scripts/get_repo_name.sh)" | tee -a "$GITHUB_ENV"
 
       - name: Publish and Sign Image Index Manifest to oci.stackable.tech
-        uses: stackabletech/actions/publish-index-manifest@55d2f9fcbcd7884ac929ea65fd6f069e7b7a49d2 # 0.8.1
+        uses: stackabletech/actions/publish-index-manifest@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2
         with:
           image-registry-uri: oci.stackable.tech
           image-registry-username: robot$sdp+github-action-build
diff --git a/.github/workflows/pr_pre-commit.yaml b/.github/workflows/pr_pre-commit.yaml
index ded4d5a31..c84a5aa00 100644
--- a/.github/workflows/pr_pre-commit.yaml
+++ b/.github/workflows/pr_pre-commit.yaml
@@ -16,7 +16,7 @@ jobs:
         with:
           persist-credentials: false
           fetch-depth: 0
-      - uses: stackabletech/actions/run-pre-commit@55d2f9fcbcd7884ac929ea65fd6f069e7b7a49d2 # 0.8.1
+      - uses: stackabletech/actions/run-pre-commit@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           hadolint: ${{ env.HADOLINT_VERSION }}
diff --git a/.github/workflows/preflight.yaml b/.github/workflows/preflight.yaml
index 76c229987..ca2f6cbc7 100644
--- a/.github/workflows/preflight.yaml
+++ b/.github/workflows/preflight.yaml
@@ -80,7 +80,7 @@ jobs:
       - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
         with:
           python-version: '3.x'
-      - run: pip install image-tools-stackabletech==0.0.13
+      - run: pip install image-tools-stackabletech==0.0.16
       - name: Install preflight
         run: |
           wget https://github.com/redhat-openshift-ecosystem/openshift-preflight/releases/download/1.10.0/preflight-linux-amd64
diff --git a/.github/workflows/reusable_build_image.yaml b/.github/workflows/reusable_build_image.yaml
index 33c63de71..7a54dbb7f 100644
--- a/.github/workflows/reusable_build_image.yaml
+++ b/.github/workflows/reusable_build_image.yaml
@@ -27,7 +27,7 @@ jobs:
         with:
           persist-credentials: false
       - id: shard
-        uses: stackabletech/actions/shard@55d2f9fcbcd7884ac929ea65fd6f069e7b7a49d2 # 0.8.1
+        uses: stackabletech/actions/shard@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2
         with:
           product-name: ${{ inputs.product-name }}
     outputs:
@@ -53,18 +53,18 @@ jobs:
           persist-credentials: false
 
       - name: Free Disk Space
-        uses: stackabletech/actions/free-disk-space@55d2f9fcbcd7884ac929ea65fd6f069e7b7a49d2 # 0.8.1
+        uses: stackabletech/actions/free-disk-space@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2
 
       - name: Build Product Image
         id: build
-        uses: stackabletech/actions/build-product-image@55d2f9fcbcd7884ac929ea65fd6f069e7b7a49d2 # 0.8.1
+        uses: stackabletech/actions/build-product-image@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2
         with:
           product-name: ${{ inputs.product-name }}
           product-version: ${{ matrix.versions }}
           sdp-version: ${{ inputs.sdp-version }}
 
       - name: Publish Container Image on oci.stackable.tech
-        uses: stackabletech/actions/publish-image@55d2f9fcbcd7884ac929ea65fd6f069e7b7a49d2 # 0.8.1
+        uses: stackabletech/actions/publish-image@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2
         with:
           image-registry-uri: oci.stackable.tech
           image-registry-username: robot$${{ inputs.registry-namespace }}+github-action-build
@@ -90,7 +90,7 @@ jobs:
           persist-credentials: false
 
       - name: Publish and Sign Image Index Manifest to oci.stackable.tech
-        uses: stackabletech/actions/publish-index-manifest@55d2f9fcbcd7884ac929ea65fd6f069e7b7a49d2 # 0.8.1
+        uses: stackabletech/actions/publish-index-manifest@9aae2d1c14239021bfa33c041010f6fb7adec815 # 0.8.2
         with:
           image-registry-uri: oci.stackable.tech
           image-registry-username: robot$${{ inputs.registry-namespace }}+github-action-build
diff --git a/airflow/Dockerfile b/airflow/Dockerfile
index ed241ff18..c5bcfff4f 100644
--- a/airflow/Dockerfile
+++ b/airflow/Dockerfile
@@ -7,7 +7,7 @@ ARG GIT_SYNC
 # which should contain a image location (e.g. registry.k8s.io/git-sync/git-sync:v3.6.8)
 FROM oci.stackable.tech/sdp/git-sync/git-sync:${GIT_SYNC} AS gitsync-image
 
-FROM stackable/image/statsd_exporter AS statsd_exporter-builder
+FROM stackable/image/shared/statsd-exporter AS statsd_exporter-builder
 
 FROM python:3.12-bookworm AS opa-auth-manager-builder
 
@@ -25,7 +25,7 @@ EOF
 FROM stackable/image/vector AS airflow-build-image
 
 ARG PRODUCT
-ARG STATSD_EXPORTER
+ARG SHARED_STATSD_EXPORTER
 ARG PYTHON
 ARG TARGETARCH
 ARG STACKABLE_USER_UID
@@ -95,7 +95,7 @@ end)' /tmp/sbom.json > /stackable/app/airflow-${PRODUCT}.cdx.json
 EOF
 
 COPY --from=statsd_exporter-builder /statsd_exporter/statsd_exporter /stackable/statsd_exporter
-COPY --from=statsd_exporter-builder /statsd_exporter/statsd_exporter-${STATSD_EXPORTER}.cdx.json /stackable/statsd_exporter-${STATSD_EXPORTER}.cdx.json
+COPY --from=statsd_exporter-builder /statsd_exporter/statsd_exporter-${SHARED_STATSD_EXPORTER}.cdx.json /stackable/statsd_exporter-${SHARED_STATSD_EXPORTER}.cdx.json
 COPY --from=gitsync-image --chown=${STACKABLE_USER_UID}:0 /git-sync /stackable/git-sync
 
 RUN <<EOF
diff --git a/airflow/versions.py b/airflow/versions.py
index ee7fdc2c9..b4a32c022 100644
--- a/airflow/versions.py
+++ b/airflow/versions.py
@@ -5,7 +5,7 @@
         "git_sync": "v4.4.0",
         "s3fs": "2024.9.0",
         "cyclonedx_bom": "6.0.0",
-        "statsd_exporter": "0.28.0",
+        "shared/statsd-exporter": "0.28.0",
         "tini": "0.19.0",
         "vector": "0.46.1",
         "uv": "0.7.3",
@@ -16,7 +16,7 @@
         "git_sync": "v4.4.0",
         "s3fs": "2024.9.0",
         "cyclonedx_bom": "6.0.0",
-        "statsd_exporter": "0.28.0",
+        "shared/statsd-exporter": "0.28.0",
         "tini": "0.19.0",
         "vector": "0.46.1",
         "uv": "0.7.3",
@@ -27,7 +27,7 @@
         "git_sync": "v4.4.0",
         "s3fs": "2024.9.0",
         "cyclonedx_bom": "6.0.0",
-        "statsd_exporter": "0.28.0",
+        "shared/statsd-exporter": "0.28.0",
         "tini": "0.19.0",
         "vector": "0.46.1",
         "uv": "0.7.3",
diff --git a/conf.py b/conf.py
index c3a016e16..2840a9511 100644
--- a/conf.py
+++ b/conf.py
@@ -14,6 +14,9 @@
 druid = importlib.import_module("druid.versions")
 hadoop = importlib.import_module("hadoop.versions")
 hbase = importlib.import_module("hbase.versions")
+hbase_phoenix = importlib.import_module("hbase.phoenix.versions")
+hbase_opa_authorizer = importlib.import_module("hbase.hbase-opa-authorizer.versions")
+hbase_operator_tools = importlib.import_module("hbase.hbase-operator-tools.versions")
 hello_world = importlib.import_module("hello-world.versions")
 hive = importlib.import_module("hive.versions")
 java_base = importlib.import_module("java-base.versions")
@@ -30,13 +33,13 @@
 superset = importlib.import_module("superset.versions")
 trino_cli = importlib.import_module("trino-cli.versions")
 trino = importlib.import_module("trino.versions")
-trino_storage_connector = importlib.import_module("trino-storage-connector.versions")
+trino_storage_connector = importlib.import_module("trino.storage-connector.versions")
 kafka_testing_tools = importlib.import_module("kafka-testing-tools.versions")
-kcat = importlib.import_module("kcat.versions")
+kcat = importlib.import_module("kafka.kcat.versions")
 testing_tools = importlib.import_module("testing-tools.versions")
 zookeeper = importlib.import_module("zookeeper.versions")
 tools = importlib.import_module("tools.versions")
-statsd_exporter = importlib.import_module("statsd_exporter.versions")
+statsd_exporter = importlib.import_module("shared.statsd-exporter.versions")
 spark_connect_client = importlib.import_module("spark-connect-client.versions")
 
 products = [
@@ -44,6 +47,9 @@
     {"name": "druid", "versions": druid.versions},
     {"name": "hadoop", "versions": hadoop.versions},
     {"name": "hbase", "versions": hbase.versions},
+    {"name": "hbase/phoenix", "versions": hbase_phoenix.versions},
+    {"name": "hbase/hbase-opa-authorizer", "versions": hbase_opa_authorizer.versions},
+    {"name": "hbase/hbase-operator-tools", "versions": hbase_operator_tools.versions},
     {"name": "hello-world", "versions": hello_world.versions},
     {"name": "hive", "versions": hive.versions},
     {"name": "java-base", "versions": java_base.versions},
@@ -60,13 +66,13 @@
     {"name": "superset", "versions": superset.versions},
     {"name": "trino-cli", "versions": trino_cli.versions},
     {"name": "trino", "versions": trino.versions},
-    {"name": "trino-storage-connector", "versions": trino_storage_connector.versions},
+    {"name": "trino/storage-connector", "versions": trino_storage_connector.versions},
     {"name": "kafka-testing-tools", "versions": kafka_testing_tools.versions},
-    {"name": "kcat", "versions": kcat.versions},
+    {"name": "kafka/kcat", "versions": kcat.versions},
     {"name": "testing-tools", "versions": testing_tools.versions},
     {"name": "zookeeper", "versions": zookeeper.versions},
     {"name": "tools", "versions": tools.versions},
-    {"name": "statsd_exporter", "versions": statsd_exporter.versions},
+    {"name": "shared/statsd-exporter", "versions": statsd_exporter.versions},
     {"name": "spark-connect-client", "versions": spark_connect_client.versions},
 ]
 
diff --git a/hbase/Dockerfile b/hbase/Dockerfile
index 1b59478c2..25b407a94 100644
--- a/hbase/Dockerfile
+++ b/hbase/Dockerfile
@@ -3,12 +3,17 @@
 
 FROM stackable/image/hadoop AS hadoop-builder
 
+FROM stackable/image/hbase/phoenix AS phoenix
+
+FROM stackable/image/hbase/hbase-operator-tools AS hbase-operator-tools
+
+FROM stackable/image/hbase/hbase-opa-authorizer AS hbase-opa-authorizer
+
 FROM stackable/image/java-devel AS hbase-builder
 
 ARG PRODUCT
-ARG HBASE_OPERATOR_TOOLS
+ARG HBASE_HBASE_OPERATOR_TOOLS
 ARG ASYNC_PROFILER
-ARG PHOENIX
 ARG HBASE_PROFILE
 ARG HADOOP
 ARG TARGETARCH
@@ -95,113 +100,6 @@ fi
 chmod --recursive g=u /stackable
 EOF
 
-
-FROM stackable/image/java-devel AS opa-authorizer-builder
-
-ARG PRODUCT
-ARG OPA_AUTHORIZER
-ARG DELETE_CACHES
-ARG STACKABLE_USER_UID
-
-USER ${STACKABLE_USER_UID}
-WORKDIR /stackable
-
-# Use the product version as cache id "maven-opa-${PRODUCT}" to avoid the "rm -rf" problem described above.
-# Using the OPA_AUTHORIZER arg is not unique if the same version is used for multiple products.
-RUN --mount=type=cache,id=maven-opa-${PRODUCT},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
-###
-### OPA Authorizer (only for 2.6 upwards)
-###
-if [[ -n "$OPA_AUTHORIZER" ]]; then
-    git clone --depth 1 --branch "$OPA_AUTHORIZER" https://github.com/stackabletech/hbase-opa-authorizer.git
-    mvn \
-      --batch-mode \
-      --no-transfer-progress \
-      -DskipTests \
-      -Dmaven.test.skip=true \
-      -fhbase-opa-authorizer \
-      package
-else
-  # Create a dummy jar to avoid errors when copying it the final image
-  mkdir -p hbase-opa-authorizer/target
-  touch hbase-opa-authorizer/target/hbase-opa-authorizer.jar
-fi
-
-if [ "${DELETE_CACHES}" = "true" ] ; then
-  rm -rf /stackable/.m2/repository/*
-fi
-
-# set correct groups
-chmod --recursive g=u /stackable
-EOF
-
-
-FROM stackable/image/java-devel AS hbase-operator-tools-builder
-
-ARG HBASE_OPERATOR_TOOLS
-ARG HBASE_THIRDPARTY
-ARG PRODUCT
-ARG STACKABLE_USER_UID
-
-# Setting this to anything other than "true" will keep the cache folders around (e.g. for Maven, NPM etc.)
-# This can be used to speed up builds when disk space is of no concern.
-ARG DELETE_CACHES="true"
-
-# Resolve paths in bin/hbck2
-# 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).
-COPY --chown=${STACKABLE_USER_UID}:0 hbase/stackable/bin/hbck2.env /stackable/bin/
-COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/patches/patchable.toml /stackable/src/hbase-operator-tools/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/patches/${HBASE_OPERATOR_TOOLS} /stackable/src/hbase-operator-tools/stackable/patches/${HBASE_OPERATOR_TOOLS}
-COPY --chown=${STACKABLE_USER_UID}:0 hbase/stackable/bin/hbase-entrypoint.sh /stackable/bin/
-
-USER ${STACKABLE_USER_UID}
-WORKDIR /stackable
-
-# Cache mounts are owned by root by default
-# We need to explicitly give the uid to use
-RUN --mount=type=cache,id=maven-hbase-operator-tools-${HBASE_OPERATOR_TOOLS},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
-cd "$(/stackable/patchable --images-repo-root=src checkout hbase-operator-tools ${HBASE_OPERATOR_TOOLS})"
-
-mvn \
-  --batch-mode \
-  --no-transfer-progress \
-  -Dhbase.version=${PRODUCT} \
-  -Dhbase-thirdparty.version=${HBASE_THIRDPARTY} \
-  -DskipTests \
-  -Dmaven.test.skip=true \
-  package assembly:single
-
-# We need the "*" here as the directory won't be the same as the final tar file for SNAPSHOTs which we currently have to use for 2.6
-# And we're stripping the top level directory while extracting because it may be called different than the folder name when it's a SNAPSHOT
-mkdir /stackable/hbase-operator-tools-${HBASE_OPERATOR_TOOLS}
-tar -xz \
-  -f hbase-operator-tools-assembly/target/hbase-operator-tools-*-bin.tar.gz \
-  -C /stackable/hbase-operator-tools-${HBASE_OPERATOR_TOOLS}/ \
-  --strip-components=1
-mv hbase-operator-tools-assembly/target/bom.json /stackable/hbase-operator-tools-${HBASE_OPERATOR_TOOLS}/hbase-operator-tools-${HBASE_OPERATOR_TOOLS}.cdx.json
-(cd .. && rm -r ${HBASE_OPERATOR_TOOLS})
-
-envsubst '${PRODUCT}:${HBASE_OPERATOR_TOOLS}' < /stackable/bin/hbck2.env > /stackable/bin/hbck2
-chmod +x /stackable/bin/hbck2
-rm /stackable/bin/hbck2.env
-
-# We're removing these to make the intermediate layer smaller
-# This can be necessary even though it's only a builder image because the GitHub Action Runners only have very limited space available
-# and we are sometimes running into errors because we're out of space.
-# Therefore, we try to clean up all layers as much as possible.
-if [ "${DELETE_CACHES}" = "true" ] ; then
-  rm -rf /stackable/.m2/repository/*
-  rm -rf /stackable/.npm/*
-  rm -rf /stackable/.cache/*
-fi
-
-# set correct groups
-chmod --recursive g=u /stackable
-EOF
-
-
 # Splitting this out into its own builder so that Hadoop & HBase can be built in parallel
 # envsubst is only available in java-devel which is why we don't just do this in the final image
 FROM stackable/image/java-devel AS hadoop-s3-builder
@@ -240,76 +138,14 @@ rm /stackable/bin/export-snapshot-to-s3.env
 chmod --recursive g=u /stackable
 EOF
 
-
-FROM stackable/image/java-devel AS phoenix-builder
-
-ARG PRODUCT
-ARG ASYNC_PROFILER
-ARG PHOENIX
-ARG HBASE_PROFILE
-ARG HADOOP
-ARG STACKABLE_USER_UID
-
-# Setting this to anything other than "true" will keep the cache folders around (e.g. for Maven, NPM etc.)
-# This can be used to speed up builds when disk space is of no concern.
-ARG DELETE_CACHES="true"
-
-COPY --chown=${STACKABLE_USER_UID}:0 hbase/phoenix/stackable/patches/patchable.toml /stackable/src/phoenix/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 hbase/phoenix/stackable/patches/${PHOENIX} /stackable/src/phoenix/stackable/patches/${PHOENIX}
-USER ${STACKABLE_USER_UID}
-WORKDIR /stackable
-
-RUN --mount=type=cache,id=maven-phoenix-${PHOENIX}-${PRODUCT},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
-cd "$(/stackable/patchable --images-repo-root=src checkout phoenix ${PHOENIX})"
-
-# The Maven command can be found inside of the scripts in the create-release folder (release-util.sh as of Phoenix 5.2.0)
-# https://github.com/apache/phoenix/tree/5.2.0/dev/create-release
-mvn \
-  --batch-mode \
-  --no-transfer-progress \
-  -Dhbase.version=${PRODUCT} \
-  -Dhbase.profile=${HBASE_PROFILE} \
-  -Dhadoop.version=${HADOOP} \
-  -DskipTests \
-  -Dmaven.test.skip=true \
-  -Dcheckstyle.skip=true \
-  clean \
-  package
-
-# We need the "*" here as the directory won't be the same as the final tar file for SNAPSHOTs which we currently have to use for 2.6
-# And we're stripping the top level directory while extracting because it may be called different than the folder name when it's a SNAPSHOT
-mkdir /stackable/phoenix-${HBASE_PROFILE}-${PHOENIX}-bin
-tar -xz -f phoenix-assembly/target/phoenix-hbase-*-bin.tar.gz -C /stackable/phoenix-${HBASE_PROFILE}-${PHOENIX}-bin/ --strip-components=1
-mv phoenix-assembly/target/bom.json /stackable/phoenix-${HBASE_PROFILE}-${PHOENIX}-bin/phoenix-${HBASE_PROFILE}-${PHOENIX}.cdx.json
-
-# Remove sources
-(cd .. && rm -r ${PHOENIX})
-ln -s "/stackable/phoenix-${HBASE_PROFILE}-${PHOENIX}-bin" /stackable/phoenix
-
-# We're removing these to make the intermediate layer smaller
-# This can be necessary even though it's only a builder image because the GitHub Action Runners only have very limited space available
-# and we are sometimes running into errors because we're out of space.
-# Therefore, we try to clean up all layers as much as possible.
-if [ "${DELETE_CACHES}" = "true" ] ; then
-  rm -rf /stackable/.m2/repository/*
-  rm -rf /stackable/.npm/*
-  rm -rf /stackable/.cache/*
-fi
-
-# set correct groups
-chmod --recursive g=u /stackable
-EOF
-
-
 # Final Image
 FROM stackable/image/java-base AS final
 
 ARG PRODUCT
 ARG RELEASE
 ARG HADOOP
-ARG PHOENIX
 ARG HBASE_PROFILE
-ARG HBASE_OPERATOR_TOOLS
+ARG HBASE_HBASE_OPERATOR_TOOLS
 ARG STACKABLE_USER_UID
 
 ARG NAME="Apache HBase"
@@ -337,11 +173,11 @@ LABEL io.k8s.display-name="${NAME}"
 COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-builder /stackable/hbase-${PRODUCT} /stackable/hbase-${PRODUCT}/
 COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-builder /stackable/async-profiler /stackable/async-profiler/
 
-COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-operator-tools-builder /stackable/hbase-operator-tools-${HBASE_OPERATOR_TOOLS} /stackable/hbase-operator-tools-${HBASE_OPERATOR_TOOLS}/
-COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-operator-tools-builder /stackable/bin/hbck2 /stackable/bin/hbck2
-COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-operator-tools-builder /stackable/bin/hbase-entrypoint.sh /stackable/hbase-${PRODUCT}/bin/hbase-entrypoint.sh
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-operator-tools /stackable/hbase-operator-tools-${HBASE_HBASE_OPERATOR_TOOLS} /stackable/hbase-operator-tools-${HBASE_HBASE_OPERATOR_TOOLS}/
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-operator-tools /stackable/bin/hbck2 /stackable/bin/hbck2
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-operator-tools /stackable/bin/hbase-entrypoint.sh /stackable/hbase-${PRODUCT}/bin/hbase-entrypoint.sh
 
-COPY --chown=${STACKABLE_USER_UID}:0 --from=phoenix-builder /stackable/phoenix /stackable/phoenix/
+COPY --chown=${STACKABLE_USER_UID}:0 --from=phoenix /stackable/phoenix /stackable/phoenix/
 
 COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-s3-builder /stackable/bin/export-snapshot-to-s3 /stackable/bin/export-snapshot-to-s3
 COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-s3-builder /stackable/hadoop/share/hadoop/tools/lib/ /stackable/hadoop/share/hadoop/tools/lib/
@@ -354,7 +190,7 @@ COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-builder \
   /stackable/hadoop/share/hadoop/tools/lib/hadoop-azure-${HADOOP}.jar \
   /stackable/hbase-${PRODUCT}/lib/
 
-COPY --chown=${STACKABLE_USER_UID}:0 --from=opa-authorizer-builder /stackable/hbase-opa-authorizer/target/hbase-opa-authorizer*.jar /stackable/hbase-${PRODUCT}/lib
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-opa-authorizer /stackable/hbase-opa-authorizer/target/hbase-opa-authorizer*.jar /stackable/hbase-${PRODUCT}/lib
 
 RUN <<EOF
 microdnf update
@@ -378,7 +214,7 @@ ln --symbolic --logical --verbose "/stackable/hbase-${PRODUCT}" /stackable/hbase
 chown --no-dereference ${STACKABLE_USER_UID}:0 /stackable/hbase
 chmod g=u /stackable/hbase
 
-ln --symbolic --logical --verbose "/stackable/hbase-operator-tools-${HBASE_OPERATOR_TOOLS}" /stackable/hbase-operator-tools
+ln --symbolic --logical --verbose "/stackable/hbase-operator-tools-${HBASE_HBASE_OPERATOR_TOOLS}" /stackable/hbase-operator-tools
 chown --no-dereference ${STACKABLE_USER_UID}:0 /stackable/hbase-operator-tools
 chmod g=u /stackable/hbase-operator-tools
 
diff --git a/hbase/hbase-opa-authorizer/Dockerfile b/hbase/hbase-opa-authorizer/Dockerfile
new file mode 100644
index 000000000..b2e5e723c
--- /dev/null
+++ b/hbase/hbase-opa-authorizer/Dockerfile
@@ -0,0 +1,35 @@
+FROM stackable/image/java-devel
+
+ARG PRODUCT
+ARG DELETE_CACHES
+ARG STACKABLE_USER_UID
+
+USER ${STACKABLE_USER_UID}
+WORKDIR /stackable
+
+RUN --mount=type=cache,id=maven-opa,uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
+###
+### OPA Authorizer (only for 2.6 upwards)
+###
+if [[ -n "$PRODUCT" ]]; then
+    git clone --depth 1 --branch "$PRODUCT" https://github.com/stackabletech/hbase-opa-authorizer.git
+    mvn \
+      --batch-mode \
+      --no-transfer-progress \
+      -DskipTests \
+      -Dmaven.test.skip=true \
+      -fhbase-opa-authorizer \
+      package
+else
+  # Create a dummy jar to avoid errors when copying it the final image
+  mkdir -p hbase-opa-authorizer/target
+  touch hbase-opa-authorizer/target/hbase-opa-authorizer.jar
+fi
+
+if [ "${DELETE_CACHES}" = "true" ] ; then
+  rm -rf /stackable/.m2/repository/*
+fi
+
+# set correct groups
+chmod --recursive g=u /stackable
+EOF
diff --git a/hbase/hbase-opa-authorizer/versions.py b/hbase/hbase-opa-authorizer/versions.py
new file mode 100644
index 000000000..cd1f2934f
--- /dev/null
+++ b/hbase/hbase-opa-authorizer/versions.py
@@ -0,0 +1,7 @@
+versions = [
+    {
+        "product": "0.1.0",
+        "java-devel": "11",
+        "delete_caches": "true",
+    },
+]
diff --git a/hbase/hbase-operator-tools/Dockerfile b/hbase/hbase-operator-tools/Dockerfile
new file mode 100644
index 000000000..80676e0ea
--- /dev/null
+++ b/hbase/hbase-operator-tools/Dockerfile
@@ -0,0 +1,64 @@
+FROM stackable/image/java-devel
+
+ARG PRODUCT
+ARG HBASE_THIRDPARTY
+ARG HBASE_VERSION
+ARG STACKABLE_USER_UID
+
+# Setting this to anything other than "true" will keep the cache folders around (e.g. for Maven, NPM etc.)
+# This can be used to speed up builds when disk space is of no concern.
+ARG DELETE_CACHES="true"
+
+# Resolve paths in bin/hbck2
+# 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).
+COPY --chown=${STACKABLE_USER_UID}:0 hbase/stackable/bin/hbck2.env /stackable/bin/
+COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/patches/patchable.toml /stackable/src/hbase-operator-tools/stackable/patches/patchable.toml
+COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/patches/${PRODUCT} /stackable/src/hbase-operator-tools/stackable/patches/${PRODUCT}
+COPY --chown=${STACKABLE_USER_UID}:0 hbase/stackable/bin/hbase-entrypoint.sh /stackable/bin/
+
+USER ${STACKABLE_USER_UID}
+WORKDIR /stackable
+
+# Cache mounts are owned by root by default
+# We need to explicitly give the uid to use
+RUN --mount=type=cache,id=maven-hbase-operator-tools-${PRODUCT},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
+cd "$(/stackable/patchable --images-repo-root=src checkout hbase-operator-tools ${PRODUCT})"
+
+mvn \
+  --batch-mode \
+  --no-transfer-progress \
+  -Dhbase.version=${HBASE_VERSION} \
+  -Dhbase-thirdparty.version=${HBASE_THIRDPARTY} \
+  -DskipTests \
+  -Dmaven.test.skip=true \
+  package assembly:single
+
+# We need the "*" here as the directory won't be the same as the final tar file for SNAPSHOTs which we currently have to use for 2.6
+# And we're stripping the top level directory while extracting because it may be called different than the folder name when it's a SNAPSHOT
+mkdir /stackable/hbase-operator-tools-${PRODUCT}
+tar -xz \
+  -f hbase-operator-tools-assembly/target/hbase-operator-tools-*-bin.tar.gz \
+  -C /stackable/hbase-operator-tools-${PRODUCT}/ \
+  --strip-components=1
+mv hbase-operator-tools-assembly/target/bom.json /stackable/hbase-operator-tools-${PRODUCT}/hbase-operator-tools-${PRODUCT}.cdx.json
+(cd .. && rm -r ${PRODUCT})
+
+envsubst '${PRODUCT}:${PRODUCT}' < /stackable/bin/hbck2.env > /stackable/bin/hbck2
+chmod +x /stackable/bin/hbck2
+rm /stackable/bin/hbck2.env
+
+# We're removing these to make the intermediate layer smaller
+# This can be necessary even though it's only a builder image because the GitHub Action Runners only have very limited space available
+# and we are sometimes running into errors because we're out of space.
+# Therefore, we try to clean up all layers as much as possible.
+if [ "${DELETE_CACHES}" = "true" ] ; then
+  rm -rf /stackable/.m2/repository/*
+  rm -rf /stackable/.npm/*
+  rm -rf /stackable/.cache/*
+fi
+
+# set correct groups
+chmod --recursive g=u /stackable
+EOF
diff --git a/hbase/hbase-operator-tools/versions.py b/hbase/hbase-operator-tools/versions.py
new file mode 100644
index 000000000..22a6aaf41
--- /dev/null
+++ b/hbase/hbase-operator-tools/versions.py
@@ -0,0 +1,16 @@
+versions = [
+    {
+        "product": "1.2.0",
+        "hbase_thirdparty": "4.1.5",
+        "hbase_version": "2.4.18",
+        "java-devel": "11",
+        "delete_caches": "true",
+    },
+    {
+        "product": "1.3.0-fd5a5fb",
+        "hbase_thirdparty": "4.1.9",
+        "hbase_version": "2.6.1",
+        "java-devel": "11",
+        "delete_caches": "true",
+    },
+]
diff --git a/hbase/phoenix/Dockerfile b/hbase/phoenix/Dockerfile
new file mode 100644
index 000000000..2d9273b3c
--- /dev/null
+++ b/hbase/phoenix/Dockerfile
@@ -0,0 +1,57 @@
+FROM stackable/image/java-devel
+
+ARG PRODUCT
+ARG ASYNC_PROFILER
+ARG HBASE_VERSION
+ARG HBASE_PROFILE
+ARG HADOOP_VERSION
+ARG STACKABLE_USER_UID
+
+# Setting this to anything other than "true" will keep the cache folders around (e.g. for Maven, NPM etc.)
+# This can be used to speed up builds when disk space is of no concern.
+ARG DELETE_CACHES="true"
+
+COPY --chown=${STACKABLE_USER_UID}:0 hbase/phoenix/stackable/patches/patchable.toml /stackable/src/phoenix/stackable/patches/patchable.toml
+COPY --chown=${STACKABLE_USER_UID}:0 hbase/phoenix/stackable/patches/${PRODUCT} /stackable/src/phoenix/stackable/patches/${PRODUCT}
+USER ${STACKABLE_USER_UID}
+WORKDIR /stackable
+
+RUN --mount=type=cache,id=maven-phoenix-${PRODUCT},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
+cd "$(/stackable/patchable --images-repo-root=src checkout phoenix ${PRODUCT})"
+
+# The Maven command can be found inside of the scripts in the create-release folder (release-util.sh as of Phoenix 5.2.0)
+# https://github.com/apache/phoenix/tree/5.2.0/dev/create-release
+mvn \
+  --batch-mode \
+  --no-transfer-progress \
+  -Dhbase.version=${HBASE_VERSION} \
+  -Dhbase.profile=${HBASE_PROFILE} \
+  -Dhadoop.version=${HADOOP_VERSION} \
+  -DskipTests \
+  -Dcheckstyle.skip=true \
+  clean \
+  package
+
+# We need the "*" here as the directory won't be the same as the final tar file for SNAPSHOTs which we currently have to use for 2.6
+# And we're stripping the top level directory while extracting because it may be called different than the folder name when it's a SNAPSHOT
+mkdir /stackable/phoenix-${HBASE_PROFILE}-${PRODUCT}-bin
+tar -xz -f phoenix-assembly/target/phoenix-hbase-*-bin.tar.gz -C /stackable/phoenix-${HBASE_PROFILE}-${PRODUCT}-bin/ --strip-components=1
+mv phoenix-assembly/target/bom.json /stackable/phoenix-${HBASE_PROFILE}-${PRODUCT}-bin/phoenix-${HBASE_PROFILE}-${PRODUCT}.cdx.json
+
+# Remove sources
+(cd .. && rm -r ${PRODUCT})
+ln -s "/stackable/phoenix-${HBASE_PROFILE}-${PRODUCT}-bin" /stackable/phoenix
+
+# We're removing these to make the intermediate layer smaller
+# This can be necessary even though it's only a builder image because the GitHub Action Runners only have very limited space available
+# and we are sometimes running into errors because we're out of space.
+# Therefore, we try to clean up all layers as much as possible.
+if [ "${DELETE_CACHES}" = "true" ] ; then
+  rm -rf /stackable/.m2/repository/*
+  rm -rf /stackable/.npm/*
+  rm -rf /stackable/.cache/*
+fi
+
+# set correct groups
+chmod --recursive g=u /stackable
+EOF
diff --git a/hbase/phoenix/versions.py b/hbase/phoenix/versions.py
new file mode 100644
index 000000000..d5949fc41
--- /dev/null
+++ b/hbase/phoenix/versions.py
@@ -0,0 +1,10 @@
+versions = [
+    {
+        "product": "5.2.1",
+        "hbase_version": "2.6.1",
+        "hadoop_version": "3.3.6",
+        "java-devel": "11",
+        "hbase_profile": "2.6",
+        "delete_caches": "true",
+    },
+]
diff --git a/hbase/versions.py b/hbase/versions.py
index 2731c0328..b787609c4 100644
--- a/hbase/versions.py
+++ b/hbase/versions.py
@@ -3,28 +3,26 @@
     # hbase-thirdparty is used to build the hbase-operator-tools and should be set to the version defined in the POM of HBase.
     {
         "product": "2.6.1",
-        "hbase_thirdparty": "4.1.9",
-        "hbase_operator_tools": "1.3.0-fd5a5fb",
+        "hbase/hbase-operator-tools": "1.3.0-fd5a5fb",
+        "hbase/phoenix": "5.2.1",
+        "hbase/hbase-opa-authorizer": "0.1.0",  # only for HBase 2.6.1
+        "hadoop": "3.3.6",
         "java-base": "11",
         "java-devel": "11",
-        "async_profiler": "2.9",
-        "phoenix": "5.2.1",
         "hbase_profile": "2.6",
-        "hadoop": "3.3.6",
-        "opa_authorizer": "0.1.0",  # only for HBase 2.6.1
+        "async_profiler": "2.9",
         "delete_caches": "true",
     },
     {
         "product": "2.6.2",
-        "hbase_thirdparty": "4.1.10",
-        "hbase_operator_tools": "1.3.0-fd5a5fb",
+        "hbase/hbase-operator-tools": "1.3.0-fd5a5fb",
+        "hbase/phoenix": "5.2.1",
+        "hbase/hbase-opa-authorizer": "0.1.0",  # only for HBase 2.6.1
+        "hadoop": "3.4.1",
         "java-base": "11",
         "java-devel": "11",
-        "async_profiler": "2.9",
-        "phoenix": "5.2.1",
         "hbase_profile": "2.6",
-        "hadoop": "3.4.1",
-        "opa_authorizer": "0.1.0",  # only for HBase 2.6.1
+        "async_profiler": "2.9",
         "delete_caches": "true",
     },
 ]
diff --git a/kafka-testing-tools/Dockerfile b/kafka-testing-tools/Dockerfile
index a15cc7d9d..04fb7077e 100644
--- a/kafka-testing-tools/Dockerfile
+++ b/kafka-testing-tools/Dockerfile
@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1.10.0@sha256:865e5dd094beca432e8c0a1d5e1c465db5f998dca4e439981029b3b81fb39ed5
 # check=error=true
 
-FROM stackable/image/kcat AS kcat
+FROM stackable/image/kafka/kcat AS kcat
 
 FROM stackable/image/stackable-base AS final
 
 ARG PRODUCT
-ARG KCAT
+ARG KAFKA_KCAT
 ARG RELEASE
 ARG STACKABLE_USER_UID
 
@@ -30,8 +30,8 @@ RUN microdnf install  \
     && rm -rf /var/cache/yum
 
 # Store kcat version with binary name and add softlink
-COPY --chown=${STACKABLE_USER_UID}:0 --from=kcat /stackable/kcat-${KCAT}/kcat /stackable/kcat-${KCAT}
-RUN ln -s /stackable/kcat-${KCAT} /stackable/kcat
+COPY --chown=${STACKABLE_USER_UID}:0 --from=kcat /stackable/kcat-${KAFKA_KCAT}/kcat /stackable/kcat-${KAFKA_KCAT}
+RUN ln -s /stackable/kcat-${KAFKA_KCAT} /stackable/kcat
 COPY --chown=${STACKABLE_USER_UID}:0 --from=kcat /licenses /licenses
 
 COPY --chown=${STACKABLE_USER_UID}:0 kafka-testing-tools/licenses /licenses
diff --git a/kafka-testing-tools/versions.py b/kafka-testing-tools/versions.py
index c55bab033..b706d446e 100644
--- a/kafka-testing-tools/versions.py
+++ b/kafka-testing-tools/versions.py
@@ -1,7 +1,7 @@
 versions = [
     {
         "product": "1.0.0",
-        "kcat": "1.7.0",
+        "kafka/kcat": "1.7.0",
         "java-base": "11",
         "stackable-base": "1.0.0",
     }
diff --git a/kafka/Dockerfile b/kafka/Dockerfile
index df64d10cb..8198b7896 100644
--- a/kafka/Dockerfile
+++ b/kafka/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.10.0@sha256:865e5dd094beca432e8c0a1d5e1c465db5f998dca4e439981029b3b81fb39ed5
 # check=error=true
 
-FROM stackable/image/kcat AS kcat
+FROM stackable/image/kafka/kcat AS kcat
 
 FROM stackable/image/java-devel AS kafka-builder
 
@@ -50,7 +50,7 @@ FROM stackable/image/java-base AS final
 ARG RELEASE
 ARG PRODUCT
 ARG SCALA
-ARG KCAT
+ARG KAFKA_KCAT
 ARG STACKABLE_USER_UID
 
 LABEL \
@@ -65,7 +65,7 @@ LABEL \
 COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-builder /stackable/kafka_${SCALA}-${PRODUCT} /stackable/kafka_${SCALA}-${PRODUCT}
 COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-builder /stackable/kafka_${SCALA}-${PRODUCT}.cdx.json /stackable/kafka_${SCALA}-${PRODUCT}/kafka_${SCALA}-${PRODUCT}.cdx.json
 COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-builder /stackable/jmx/ /stackable/jmx/
-COPY --chown=${STACKABLE_USER_UID}:0 --from=kcat /stackable/kcat-${KCAT}/kcat /stackable/bin/kcat-${KCAT}
+COPY --chown=${STACKABLE_USER_UID}:0 --from=kcat /stackable/kcat-${KAFKA_KCAT}/kcat /stackable/bin/kcat-${KAFKA_KCAT}
 COPY --chown=${STACKABLE_USER_UID}:0 --from=kcat /licenses /licenses
 
 COPY --chown=${STACKABLE_USER_UID}:0 kafka/licenses /licenses
@@ -84,7 +84,7 @@ chown ${STACKABLE_USER_UID}:0 /stackable/package_manifest.txt
 chmod g=u /stackable/package_manifest.txt
 rm -rf /var/cache/yum
 
-ln -s /stackable/bin/kcat-${KCAT} /stackable/bin/kcat
+ln -s /stackable/bin/kcat-${KAFKA_KCAT} /stackable/bin/kcat
 chown -h ${STACKABLE_USER_UID}:0 /stackable/bin/kcat
 # kcat was located in /stackable/kcat - legacy
 ln -s /stackable/bin/kcat /stackable/kcat
diff --git a/kcat/Dockerfile b/kafka/kcat/Dockerfile
similarity index 98%
rename from kcat/Dockerfile
rename to kafka/kcat/Dockerfile
index 0542a00f7..0190c59b0 100644
--- a/kcat/Dockerfile
+++ b/kafka/kcat/Dockerfile
@@ -39,7 +39,7 @@ cd kcat-${PRODUCT}
 chmod --recursive g=u /stackable/kcat-${PRODUCT}
 EOF
 
-COPY --chown=${STACKABLE_USER_UID}:0 kcat/licenses /licenses
+COPY --chown=${STACKABLE_USER_UID}:0 kafka/kcat/licenses /licenses
 
 # SNIPPET 1
 # 145.2 gcc  -I/stackable/kcat-1.7.0/tmp-bootstrap/usr/include -I/stackable/kcat-1.7.0/tmp-bootstrap/usr/include -g -O2 -Wall -Wsign-compare -Wfloat-equal -Wpointer-arith -Wcast-align -L/stackable/kcat-1.7.0/tmp-bootstrap/usr/lib -Wl,-rpath-link=/stackable/kcat-1.7.0/tmp-bootstrap/usr/lib -L/stackable/kcat-1.7.0/tmp-bootstrap/usr/lib -Wl,-rpath-link=/stackable/kcat-1.7.0/tmp-bootstrap/usr/lib kcat.o format.o tools.o input.o json.o avro.o -o kcat  -lm -ldl -lpthread -lrt -lpthread -lrt  -L/stackable/kcat-1.7.0/tmp-bootstrap/usr/lib  /stackable/kcat-1.7.0/tmp-bootstrap/usr/lib/libavro.a /stackable/kcat-1.7.0/tmp-bootstrap/usr/lib/libjansson.a -lcurl /stackable/kcat-1.7.0/tmp-bootstrap/usr/lib/libserdes.a -Wl,-Bstatic -lavro -Wl,-Bdynamic /stackable/kcat-1.7.0/tmp-bootstrap/usr/lib/libyajl_s.a -L/stackable/kcat-1.7.0/tmp-bootstrap/usr/lib //stackable/kcat-1.7.0/tmp-bootstrap/usr/lib/librdkafka.a -lm -ldl -lpthread -lrt -lz -lcrypto -lssl -lsasl2   -lm -ldl -lpthread -lrt -lpthread -lrt  -L/stackable/kcat-1.7.0/tmp-bootstrap/usr/lib  /stackable/kcat-1.7.0/tmp-bootstrap/usr/lib/libavro.a /stackable/kcat-1.7.0/tmp-bootstrap/usr/lib/libjansson.a -lcurl
diff --git a/kcat/README.md b/kafka/kcat/README.md
similarity index 100%
rename from kcat/README.md
rename to kafka/kcat/README.md
diff --git a/kcat/licenses/KCAT_LICENSES b/kafka/kcat/licenses/KCAT_LICENSES
similarity index 100%
rename from kcat/licenses/KCAT_LICENSES
rename to kafka/kcat/licenses/KCAT_LICENSES
diff --git a/kcat/licenses/STACKABLE_LICENSE b/kafka/kcat/licenses/STACKABLE_LICENSE
similarity index 100%
rename from kcat/licenses/STACKABLE_LICENSE
rename to kafka/kcat/licenses/STACKABLE_LICENSE
diff --git a/kcat/versions.py b/kafka/kcat/versions.py
similarity index 100%
rename from kcat/versions.py
rename to kafka/kcat/versions.py
diff --git a/kafka/versions.py b/kafka/versions.py
index e58ff8d53..47bb50d94 100644
--- a/kafka/versions.py
+++ b/kafka/versions.py
@@ -4,7 +4,7 @@
         "java-base": "21",
         "java-devel": "21",
         "scala": "2.13",
-        "kcat": "1.7.0",
+        "kafka/kcat": "1.7.0",
         "opa_authorizer": "1.5.1",
         "jmx_exporter": "1.2.0",
     },
@@ -13,7 +13,7 @@
         "java-base": "21",
         "java-devel": "21",
         "scala": "2.13",
-        "kcat": "1.7.0",
+        "kafka/kcat": "1.7.0",
         "opa_authorizer": "1.5.1",
         "jmx_exporter": "1.2.0",
     },
@@ -22,7 +22,7 @@
         "java-base": "21",
         "java-devel": "21",
         "scala": "2.13",
-        "kcat": "1.7.0",
+        "kafka/kcat": "1.7.0",
         "opa_authorizer": "1.5.1",
         "jmx_exporter": "1.2.0",
     },
@@ -31,7 +31,7 @@
         "java-base": "21",
         "java-devel": "21",
         "scala": "2.13",
-        "kcat": "1.7.0",
+        "kafka/kcat": "1.7.0",
         "opa_authorizer": "1.5.1",
         "jmx_exporter": "1.2.0",
     },
diff --git a/statsd_exporter/Dockerfile b/shared/statsd-exporter/Dockerfile
similarity index 100%
rename from statsd_exporter/Dockerfile
rename to shared/statsd-exporter/Dockerfile
diff --git a/statsd_exporter/README.md b/shared/statsd-exporter/README.md
similarity index 100%
rename from statsd_exporter/README.md
rename to shared/statsd-exporter/README.md
diff --git a/statsd_exporter/upload_new_statsd_exporter_version.sh b/shared/statsd-exporter/upload_new_statsd_exporter_version.sh
similarity index 100%
rename from statsd_exporter/upload_new_statsd_exporter_version.sh
rename to shared/statsd-exporter/upload_new_statsd_exporter_version.sh
diff --git a/statsd_exporter/versions.py b/shared/statsd-exporter/versions.py
similarity index 100%
rename from statsd_exporter/versions.py
rename to shared/statsd-exporter/versions.py
diff --git a/superset/Dockerfile b/superset/Dockerfile
index d69a039ef..cbf8a0617 100644
--- a/superset/Dockerfile
+++ b/superset/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.10.0@sha256:865e5dd094beca432e8c0a1d5e1c465db5f998dca4e439981029b3b81fb39ed5
 # check=error=true
 
-FROM stackable/image/statsd_exporter AS statsd_exporter-builder
+FROM stackable/image/shared/statsd-exporter AS statsd_exporter-builder
 
 FROM stackable/image/stackable-base AS opa-authorizer-builder
 
@@ -36,6 +36,7 @@ EOF
 FROM stackable/image/vector AS builder
 
 ARG PRODUCT
+ARG SHARED_STATSD_EXPORTER
 ARG PYTHON
 ARG AUTHLIB
 ARG TARGETARCH
@@ -121,6 +122,7 @@ RUN python3 -m venv /stackable/app \
     uv pip install --no-cache-dir /tmp/opa_authorizer-0.1.0-py3-none-any.whl
 
 COPY --from=statsd_exporter-builder /statsd_exporter/statsd_exporter /stackable/statsd_exporter
+COPY --from=statsd_exporter-builder /statsd_exporter/statsd_exporter-${SHARED_STATSD_EXPORTER}.cdx.json /stackable/statsd_exporter-${SHARED_STATSD_EXPORTER}.cdx.json
 
 RUN <<EOF
 cd /stackable
diff --git a/superset/versions.py b/superset/versions.py
index 3302ffcff..3961a607d 100644
--- a/superset/versions.py
+++ b/superset/versions.py
@@ -4,7 +4,7 @@
         "python": "3.9",
         "cyclonedx_bom": "6.0.0",
         "vector": "0.46.1",
-        "statsd_exporter": "0.28.0",
+        "shared/statsd-exporter": "0.28.0",
         "authlib": "1.2.1",  # https://github.com/dpgaspar/Flask-AppBuilder/blob/release/4.4.1/requirements/extra.txt#L7
         "stackable-base": "1.0.0",
         "uv": "0.7.3",
@@ -14,7 +14,7 @@
         "python": "3.9",  # 3.11 support was merged in January 2025 (two months after 4.1.1 release), 3.10 is not available in our UBI image, so we need to stay on 3.9 for now
         "cyclonedx_bom": "6.0.0",
         "vector": "0.46.1",
-        "statsd_exporter": "0.28.0",
+        "shared/statsd-exporter": "0.28.0",
         "authlib": "1.2.1",  # https://github.com/dpgaspar/Flask-AppBuilder/blob/release/4.5.0/requirements/extra.txt#L7
         "stackable-base": "1.0.0",
         "uv": "0.7.3",
@@ -24,7 +24,7 @@
         "python": "3.9",
         "cyclonedx_bom": "6.0.0",
         "vector": "0.46.1",
-        "statsd_exporter": "0.28.0",
+        "shared/statsd-exporter": "0.28.0",
         "authlib": "1.2.1",  # https://github.com/dpgaspar/Flask-AppBuilder/blob/release/4.5.0/requirements/extra.txt#L7
         "stackable-base": "1.0.0",
         "uv": "0.7.3",
diff --git a/trino/Dockerfile b/trino/Dockerfile
index ced25c68a..4c04e575e 100644
--- a/trino/Dockerfile
+++ b/trino/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.10.0@sha256:865e5dd094beca432e8c0a1d5e1c465db5f998dca4e439981029b3b81fb39ed5
 # check=error=true
 
-FROM stackable/image/trino-storage-connector AS trino-storage-connector-image
+FROM stackable/image/trino/storage-connector AS trino-storage-connector-image
 
 FROM stackable/image/java-devel AS trino-builder
 
diff --git a/trino-storage-connector/Dockerfile b/trino/storage-connector/Dockerfile
similarity index 89%
rename from trino-storage-connector/Dockerfile
rename to trino/storage-connector/Dockerfile
index b9b9cedd6..c0d246d16 100644
--- a/trino-storage-connector/Dockerfile
+++ b/trino/storage-connector/Dockerfile
@@ -8,8 +8,8 @@ ARG STACKABLE_USER_UID
 
 WORKDIR /stackable
 
-COPY --chown=${STACKABLE_USER_UID}:0 trino-storage-connector/stackable/patches/patchable.toml /stackable/src/trino-storage-connector/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 trino-storage-connector/stackable/patches/${PRODUCT} /stackable/src/trino-storage-connector/stackable/patches/${PRODUCT}
+COPY --chown=${STACKABLE_USER_UID}:0 trino/storage-connector/stackable/patches/patchable.toml /stackable/src/trino-storage-connector/stackable/patches/patchable.toml
+COPY --chown=${STACKABLE_USER_UID}:0 trino/storage-connector/stackable/patches/${PRODUCT} /stackable/src/trino-storage-connector/stackable/patches/${PRODUCT}
 
 # adding a hadolint ignore for SC2215, due to https://github.com/hadolint/hadolint/issues/980
 # hadolint ignore=SC2215
diff --git a/trino-storage-connector/licenses/SNOWLIFT_TRINO_STORAGE_LICENSE b/trino/storage-connector/licenses/SNOWLIFT_TRINO_STORAGE_LICENSE
similarity index 100%
rename from trino-storage-connector/licenses/SNOWLIFT_TRINO_STORAGE_LICENSE
rename to trino/storage-connector/licenses/SNOWLIFT_TRINO_STORAGE_LICENSE
diff --git a/trino-storage-connector/licenses/STACKABLE_LICENSE b/trino/storage-connector/licenses/STACKABLE_LICENSE
similarity index 100%
rename from trino-storage-connector/licenses/STACKABLE_LICENSE
rename to trino/storage-connector/licenses/STACKABLE_LICENSE
diff --git a/trino-storage-connector/stackable/patches/451/0001-Add-CycloneDX-plugin.patch b/trino/storage-connector/stackable/patches/451/0001-Add-CycloneDX-plugin.patch
similarity index 100%
rename from trino-storage-connector/stackable/patches/451/0001-Add-CycloneDX-plugin.patch
rename to trino/storage-connector/stackable/patches/451/0001-Add-CycloneDX-plugin.patch
diff --git a/trino-storage-connector/stackable/patches/451/patchable.toml b/trino/storage-connector/stackable/patches/451/patchable.toml
similarity index 100%
rename from trino-storage-connector/stackable/patches/451/patchable.toml
rename to trino/storage-connector/stackable/patches/451/patchable.toml
diff --git a/trino-storage-connector/stackable/patches/455/0001-Add-CycloneDX-plugin.patch b/trino/storage-connector/stackable/patches/455/0001-Add-CycloneDX-plugin.patch
similarity index 100%
rename from trino-storage-connector/stackable/patches/455/0001-Add-CycloneDX-plugin.patch
rename to trino/storage-connector/stackable/patches/455/0001-Add-CycloneDX-plugin.patch
diff --git a/trino-storage-connector/stackable/patches/455/patchable.toml b/trino/storage-connector/stackable/patches/455/patchable.toml
similarity index 100%
rename from trino-storage-connector/stackable/patches/455/patchable.toml
rename to trino/storage-connector/stackable/patches/455/patchable.toml
diff --git a/trino-storage-connector/stackable/patches/470/0001-Add-CycloneDX-plugin.patch b/trino/storage-connector/stackable/patches/470/0001-Add-CycloneDX-plugin.patch
similarity index 100%
rename from trino-storage-connector/stackable/patches/470/0001-Add-CycloneDX-plugin.patch
rename to trino/storage-connector/stackable/patches/470/0001-Add-CycloneDX-plugin.patch
diff --git a/trino-storage-connector/stackable/patches/470/patchable.toml b/trino/storage-connector/stackable/patches/470/patchable.toml
similarity index 100%
rename from trino-storage-connector/stackable/patches/470/patchable.toml
rename to trino/storage-connector/stackable/patches/470/patchable.toml
diff --git a/trino-storage-connector/stackable/patches/patchable.toml b/trino/storage-connector/stackable/patches/patchable.toml
similarity index 100%
rename from trino-storage-connector/stackable/patches/patchable.toml
rename to trino/storage-connector/stackable/patches/patchable.toml
diff --git a/trino-storage-connector/upload_new_trino_storage_connector_version.sh b/trino/storage-connector/upload_new_trino_storage_connector_version.sh
similarity index 100%
rename from trino-storage-connector/upload_new_trino_storage_connector_version.sh
rename to trino/storage-connector/upload_new_trino_storage_connector_version.sh
diff --git a/trino-storage-connector/versions.py b/trino/storage-connector/versions.py
similarity index 100%
rename from trino-storage-connector/versions.py
rename to trino/storage-connector/versions.py
diff --git a/trino/versions.py b/trino/versions.py
index daaba71a9..21c163e8c 100644
--- a/trino/versions.py
+++ b/trino/versions.py
@@ -4,20 +4,20 @@
         "java-base": "22",
         "java-devel": "22",
         "jmx_exporter": "1.2.0",
-        "trino-storage-connector": "451",
+        "trino/storage-connector": "451",
     },
     {
         "product": "455",
         "java-base": "22",
         "java-devel": "22",
         "jmx_exporter": "1.2.0",
-        "trino-storage-connector": "455",
+        "trino/storage-connector": "455",
     },
     {
         "product": "470",
         "java-base": "23",
         "java-devel": "23",
         "jmx_exporter": "1.2.0",
-        "trino-storage-connector": "470",
+        "trino/storage-connector": "470",
     },
 ]