diff --git a/.github/workflows/build_airflow.yaml b/.github/workflows/build_airflow.yaml
index bebfcd206..f12d5c726 100644
--- a/.github/workflows/build_airflow.yaml
+++ b/.github/workflows/build_airflow.yaml
@@ -17,7 +17,7 @@ on:
       # bake --product PRODUCT -d | grep -v 'docker buildx bake' | jq '.target | keys[]'
       - airflow/**
       - vector/**
-      - stackable-base/**
+      - stackable-devel/**
       - .github/actions/**
       - .github/workflows/build_airflow.yaml
       - .github/workflows/reusable_build_image.yaml
diff --git a/.github/workflows/build_superset.yaml b/.github/workflows/build_superset.yaml
index eb4eed00d..740ea557e 100644
--- a/.github/workflows/build_superset.yaml
+++ b/.github/workflows/build_superset.yaml
@@ -17,7 +17,7 @@ on:
       # bake --product PRODUCT -d | grep -v 'docker buildx bake' | jq '.target | keys[]'
       - superset/**
       - vector/**
-      - stackable-base/**
+      - stackable-devel/**
       - .github/actions/**
       - .github/workflows/build_superset.yaml
       - .github/workflows/reusable_build_image.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 210e1d31b..b79300f6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ All notable changes to this project will be documented in this file.
 - nifi: Add `2.6.0` ([#1293]).
 - hive: Add `4.1.0` ([#1295]).
 - hbase: Add `2.6.3` ([#1296]).
+- airflow,superset: Build from source ([#1304]).
 
 ### Changed
 
@@ -95,6 +96,7 @@ All notable changes to this project will be documented in this file.
 [#1296]: https://github.com/stackabletech/docker-images/pull/1296
 [#1300]: https://github.com/stackabletech/docker-images/pull/1300
 [#1301]: https://github.com/stackabletech/docker-images/pull/1301
+[#1304]: https://github.com/stackabletech/docker-images/pull/1304
 
 ## [25.7.0] - 2025-07-23
 
diff --git a/airflow/Dockerfile b/airflow/Dockerfile
index 164edb912..9cebd874d 100644
--- a/airflow/Dockerfile
+++ b/airflow/Dockerfile
@@ -37,13 +37,13 @@ uv run pytest --disable-warnings
 uv build
 EOF
 
-FROM local-image/vector AS airflow-build-image
+FROM local-image/stackable-devel AS airflow-build-image
 
 ARG PRODUCT_VERSION
-ARG SHARED_STATSD_EXPORTER_VERSION
 ARG PYTHON_VERSION
 ARG TARGETARCH
 ARG STACKABLE_USER_UID
+ARG NODEJS_VERSION
 ARG S3FS_VERSION
 ARG CYCLONEDX_BOM_VERSION
 ARG UV_VERSION
@@ -54,7 +54,8 @@ ARG UV_VERSION
 # Requires implementation of https://github.com/apache/airflow/blob/2.2.5/scripts/docker/install_mysql.sh
 ARG AIRFLOW_EXTRAS
 
-RUN microdnf update && \
+RUN microdnf module enable -y nodejs:${NODEJS_VERSION} && \
+    microdnf update && \
     microdnf install \
         cyrus-sasl-devel \
         # Needed by ./configure to build gevent, see snippet [1] at the end of file
@@ -72,6 +73,9 @@ RUN microdnf update && \
         python${PYTHON_VERSION}-wheel \
         # The airflow odbc provider can compile without the development files (headers and libraries) (see https://github.com/stackabletech/docker-images/pull/683)
         unixODBC \
+        # Needed for Airflow UI assets
+        npm \
+        nodejs \
         # Needed to modify the SBOM
         jq && \
     microdnf clean all && \
@@ -81,6 +85,11 @@ COPY airflow/stackable/constraints/${PRODUCT_VERSION}/constraints-python${PYTHON
 COPY airflow/stackable/constraints/${PRODUCT_VERSION}/build-constraints-python${PYTHON_VERSION}.txt /tmp/build-constraints.txt
 COPY --from=opa-auth-manager-builder /tmp/opa-auth-manager/dist/opa_auth_manager-0.1.0-py3-none-any.whl /tmp/
 
+COPY --chown=${STACKABLE_USER_UID}:0 airflow/stackable/patches/patchable.toml /stackable/src/airflow/stackable/patches/patchable.toml
+COPY --chown=${STACKABLE_USER_UID}:0 airflow/stackable/patches/${PRODUCT_VERSION} /stackable/src/airflow/stackable/patches/${PRODUCT_VERSION}
+
+WORKDIR /stackable
+
 RUN <<EOF
 python${PYTHON_VERSION} -m venv --system-site-packages /stackable/app
 
@@ -90,8 +99,44 @@ source /stackable/app/bin/activate
 # Also install uv to get support for build constraints
 pip install --no-cache-dir --upgrade pip
 pip install --no-cache-dir uv==${UV_VERSION}
+uv tool install hatch
+
+cd "$(/stackable/patchable --images-repo-root=src checkout airflow ${PRODUCT_VERSION})"
+
+if [ -d "./airflow-core" ]; then
+  # Airflow 3.x
+  cd airflow-core/src/airflow/ui
+
+  # build front-end assets
+  npm install -g pnpm@10.18.2
+  pnpm install --frozen-lockfile
+  pnpm run build
+
+  # build airflow wheel from airflow root folder
+  # this picks up the UI assets from the pnpm build, and the dependencies from the root folder
+  cd ../../..
+  /root/.local/bin/hatch build -t wheel
+  # First install the full apache-airflow package to get all dependencies including database drivers
+  uv pip install --no-cache-dir apache-airflow[${AIRFLOW_EXTRAS}]==${PRODUCT_VERSION} --constraint /tmp/constraints.txt --build-constraints /tmp/build-constraints.txt
+  # Then install the locally built core wheel to override the core package
+  uv pip install --no-cache-dir dist/apache_airflow_core-${PRODUCT_VERSION}-py3-none-any.whl[${AIRFLOW_EXTRAS}] --constraint /tmp/constraints.txt --build-constraints /tmp/build-constraints.txt
+else
+  # Airflow 2.x
+  # build front-end assets
+  cd airflow/www
+  npm install -g yarn@1.22.22
+  yarn install --frozen-lockfile
+  yarn run build
+
+  # build airflow wheel from airflow root folder
+  cd ../..
+  /root/.local/bin/hatch build -t wheel
+  # First install the full apache-airflow package to get all dependencies including database drivers
+  uv pip install --no-cache-dir apache-airflow[${AIRFLOW_EXTRAS}]==${PRODUCT_VERSION} --constraint /tmp/constraints.txt --build-constraints /tmp/build-constraints.txt
+  # Then install the locally built wheel to override with patched version
+  uv pip install --no-cache-dir dist/apache_airflow-${PRODUCT_VERSION}-py3-none-any.whl[${AIRFLOW_EXTRAS}] --constraint /tmp/constraints.txt --build-constraints /tmp/build-constraints.txt
+fi
 
-uv pip install --no-cache-dir apache-airflow[${AIRFLOW_EXTRAS}]==${PRODUCT_VERSION} --constraint /tmp/constraints.txt --build-constraints /tmp/build-constraints.txt
 # Needed for pandas S3 integration to e.g. write and read csv and parquet files to/from S3
 uv pip install --no-cache-dir s3fs==${S3FS_VERSION} cyclonedx-bom==${CYCLONEDX_BOM_VERSION}
 # Needed for OIDC
@@ -102,6 +147,7 @@ uv pip install --no-cache-dir /tmp/opa_auth_manager-0.1.0-py3-none-any.whl
 # Create the SBOM for Airflow
 # Important: All `pip install` commands must be above this line, otherwise the SBOM will be incomplete
 cyclonedx-py environment --schema-version 1.5 --outfile /tmp/sbom.json
+uv pip uninstall cyclonedx-bom
 
 # Break circular dependencies by removing the apache-airflow dependency from the providers
 jq '.dependencies |= map(if .ref | test("^apache-airflow-providers-") then
@@ -111,10 +157,6 @@ else
 end)' /tmp/sbom.json > /stackable/app/airflow-${PRODUCT_VERSION}.cdx.json
 EOF
 
-COPY --from=statsd_exporter-builder /statsd_exporter/statsd_exporter /stackable/statsd_exporter
-COPY --from=statsd_exporter-builder /statsd_exporter/statsd_exporter-${SHARED_STATSD_EXPORTER_VERSION}.cdx.json /stackable/statsd_exporter-${SHARED_STATSD_EXPORTER_VERSION}.cdx.json
-COPY --from=gitsync-image --chown=${STACKABLE_USER_UID}:0 /git-sync /stackable/git-sync
-
 RUN <<EOF
 mkdir -pv /stackable/airflow
 mkdir -pv /stackable/airflow/dags
@@ -130,6 +172,7 @@ ARG PYTHON_VERSION
 ARG RELEASE_VERSION
 ARG TINI_VERSION
 ARG TARGETARCH
+ARG SHARED_STATSD_EXPORTER_VERSION
 ARG STACKABLE_USER_UID
 
 LABEL name="Apache Airflow" \
@@ -146,11 +189,14 @@ ENV PATH=$PATH:/bin:$HOME/app/bin
 ENV AIRFLOW_HOME=$HOME/airflow
 
 COPY --from=airflow-build-image --chown=${STACKABLE_USER_UID}:0 /stackable/ ${HOME}/
-COPY --from=airflow-build-image --chown=${STACKABLE_USER_UID}:0 /stackable/git-sync ${HOME}/git-sync
 
 COPY --chown=${STACKABLE_USER_UID}:0 airflow/stackable/utils/entrypoint.sh /entrypoint.sh
 COPY --chown=${STACKABLE_USER_UID}:0 airflow/stackable/utils/run-airflow.sh /run-airflow.sh
 
+COPY --from=statsd_exporter-builder --chown=${STACKABLE_USER_UID}:0 /statsd_exporter/statsd_exporter ${HOME}/statsd_exporter
+COPY --from=statsd_exporter-builder --chown=${STACKABLE_USER_UID}:0 /statsd_exporter/statsd_exporter-${SHARED_STATSD_EXPORTER_VERSION}.cdx.json ${HOME}/statsd_exporter-${SHARED_STATSD_EXPORTER_VERSION}.cdx.json
+COPY --from=gitsync-image --chown=${STACKABLE_USER_UID}:0 /git-sync ${HOME}/git-sync
+
 COPY airflow/licenses /licenses
 
 # Update image and install needed packages
@@ -185,6 +231,7 @@ curl -o /usr/bin/tini "https://repo.stackable.tech/repository/packages/tini/tini
 chmod a+x /entrypoint.sh
 chmod a+x /run-airflow.sh
 chmod +x /usr/bin/tini
+chmod g=u /stackable/statsd_exporter ${HOME}/statsd_exporter-${SHARED_STATSD_EXPORTER_VERSION}.cdx.json ${HOME}/git-sync
 EOF
 
 # ----------------------------------------
diff --git a/airflow/boil-config.toml b/airflow/boil-config.toml
index 6ec0ee8bd..a787c09ac 100644
--- a/airflow/boil-config.toml
+++ b/airflow/boil-config.toml
@@ -1,6 +1,7 @@
 [versions."2.9.3".local-images]
 "shared/statsd-exporter" = "0.28.0"
 vector = "0.49.0"
+stackable-devel = "1.0.0"
 
 [versions."2.9.3".build-arguments]
 python-version = "3.9"
@@ -11,10 +12,12 @@ tini-version = "0.19.0"
 uv-version = "0.7.8"
 airflow-extras = "async,amazon,celery,cncf.kubernetes,docker,dask,elasticsearch,ftp,grpc,hashicorp,http,ldap,google,google_auth,microsoft.azure,odbc,pandas,postgres,redis,sendgrid,sftp,slack,ssh,statsd,virtualenv,trino"
 opa-auth-manager = "airflow-2"
+nodejs-version = "20"
 
 [versions."2.10.5".local-images]
 "shared/statsd-exporter" = "0.28.0"
 vector = "0.49.0"
+stackable-devel = "1.0.0"
 
 [versions."2.10.5".build-arguments]
 python-version = "3.12"
@@ -25,10 +28,12 @@ tini-version = "0.19.0"
 uv-version = "0.7.8"
 airflow-extras = "async,amazon,celery,cncf.kubernetes,docker,dask,elasticsearch,ftp,grpc,hashicorp,http,ldap,google,google_auth,microsoft.azure,odbc,pandas,postgres,redis,sendgrid,sftp,slack,ssh,statsd,virtualenv,trino"
 opa-auth-manager = "airflow-2"
+nodejs-version = "20"
 
 [versions."3.0.1".local-images]
 "shared/statsd-exporter" = "0.28.0"
 vector = "0.49.0"
+stackable-devel = "1.0.0"
 
 [versions."3.0.1".build-arguments]
 python-version = "3.12"
@@ -39,10 +44,12 @@ tini-version = "0.19.0"
 uv-version = "0.7.8"
 airflow-extras = "async,amazon,celery,cncf-kubernetes,docker,elasticsearch,fab,ftp,grpc,hashicorp,http,ldap,google,microsoft-azure,odbc,pandas,postgres,redis,sendgrid,sftp,slack,ssh,statsd,trino"
 opa-auth-manager = "airflow-3"
+nodejs-version = "20"
 
 [versions."3.0.6".local-images]
 "shared/statsd-exporter" = "0.28.0"
 vector = "0.49.0"
+stackable-devel = "1.0.0"
 
 [versions."3.0.6".build-arguments]
 python-version = "3.12"
@@ -53,3 +60,4 @@ tini-version = "0.19.0"
 uv-version = "0.7.8"
 airflow-extras = "async,amazon,celery,cncf-kubernetes,docker,elasticsearch,fab,ftp,grpc,hashicorp,http,ldap,google,microsoft-azure,odbc,pandas,postgres,redis,sendgrid,sftp,slack,ssh,statsd,trino"
 opa-auth-manager = "airflow-3"
+nodejs-version = "20"
diff --git a/airflow/stackable/patches/2.10.5/patchable.toml b/airflow/stackable/patches/2.10.5/patchable.toml
new file mode 100644
index 000000000..ea54ef8c4
--- /dev/null
+++ b/airflow/stackable/patches/2.10.5/patchable.toml
@@ -0,0 +1,2 @@
+mirror = "https://github.com/stackabletech/airflow.git"
+base = "b93c3db6b1641b0840bd15ac7d05bc58ff2cccbf"
diff --git a/airflow/stackable/patches/2.9.3/patchable.toml b/airflow/stackable/patches/2.9.3/patchable.toml
new file mode 100644
index 000000000..8839dca71
--- /dev/null
+++ b/airflow/stackable/patches/2.9.3/patchable.toml
@@ -0,0 +1,2 @@
+mirror = "https://github.com/stackabletech/airflow.git"
+base = "81845de9d95a733b4eb7826aaabe23ba9813eba3"
diff --git a/airflow/stackable/patches/3.0.1/patchable.toml b/airflow/stackable/patches/3.0.1/patchable.toml
new file mode 100644
index 000000000..8ca63726f
--- /dev/null
+++ b/airflow/stackable/patches/3.0.1/patchable.toml
@@ -0,0 +1,2 @@
+mirror = "https://github.com/stackabletech/airflow.git"
+base = "4ecebc2973587ebaa2cb12482de82e93d15c092f"
diff --git a/airflow/stackable/patches/3.0.6/patchable.toml b/airflow/stackable/patches/3.0.6/patchable.toml
new file mode 100644
index 000000000..43cacb48d
--- /dev/null
+++ b/airflow/stackable/patches/3.0.6/patchable.toml
@@ -0,0 +1,2 @@
+mirror = "https://github.com/stackabletech/airflow.git"
+base = "e965c2e676d85ced65a485d4b2601addc2fd3e97"
diff --git a/airflow/stackable/patches/patchable.toml b/airflow/stackable/patches/patchable.toml
new file mode 100644
index 000000000..7bfe2c774
--- /dev/null
+++ b/airflow/stackable/patches/patchable.toml
@@ -0,0 +1,2 @@
+upstream = "https://github.com/apache/airflow.git"
+default-mirror = "https://github.com/stackabletech/airflow.git"
diff --git a/superset/Dockerfile b/superset/Dockerfile
index 31391ce17..7f453f9c4 100644
--- a/superset/Dockerfile
+++ b/superset/Dockerfile
@@ -3,7 +3,7 @@
 
 FROM local-image/shared/statsd-exporter AS statsd_exporter-builder
 
-FROM local-image/stackable-base AS opa-authorizer-builder
+FROM local-image/stackable-devel AS opa-authorizer-builder
 
 ARG PYTHON_VERSION
 
@@ -33,18 +33,20 @@ poetry run pytest
 poetry build
 EOF
 
-FROM local-image/vector AS builder
+FROM local-image/stackable-devel AS builder
 
 ARG PRODUCT_VERSION
-ARG SHARED_STATSD_EXPORTER_VERSION
 ARG PYTHON_VERSION
 ARG AUTHLIB_VERSION
 ARG TARGETARCH
 ARG TARGETOS
 ARG CYCLONEDX_BOM_VERSION
 ARG UV_VERSION
+ARG NODEJS_VERSION
+ARG STACKABLE_USER_UID
 
-RUN microdnf update \
+RUN microdnf module enable -y nodejs:${NODEJS_VERSION} && \
+    microdnf update \
     && microdnf install \
         cyrus-sasl-devel \
         # Needed by ./configure to work out SQLite compilation flags, see snippet [1] at the end of file
@@ -64,6 +66,9 @@ RUN microdnf update \
         python${PYTHON_VERSION}-pip \
         python${PYTHON_VERSION}-wheel \
         libpq-devel \
+        # Needed to build Superset UI assets
+        npm \
+        nodejs \
     && microdnf clean all && \
     rm -rf /var/cache/yum
 
@@ -71,62 +76,83 @@ COPY superset/stackable/constraints/${PRODUCT_VERSION}/constraints.txt /tmp/cons
 COPY superset/stackable/constraints/${PRODUCT_VERSION}/build-constraints.txt /tmp/build-constraints.txt
 COPY --from=opa-authorizer-builder /tmp/opa-authorizer/dist/opa_authorizer-0.1.0-py3-none-any.whl /tmp/
 
+COPY --chown=${STACKABLE_USER_UID}:0 superset/stackable/patches/patchable.toml /stackable/src/superset/stackable/patches/patchable.toml
+COPY --chown=${STACKABLE_USER_UID}:0 superset/stackable/patches/${PRODUCT_VERSION} /stackable/src/superset/stackable/patches/${PRODUCT_VERSION}
+
+WORKDIR /stackable
+
 # Upgrade pip to the latest version
 # Also install uv to get support for build constraints
 # DL3042 false-positive, --no-chache-dir is specified a few lines below.
 #        See https://github.com/hadolint/hadolint/issues/1042.
 # hadolint ignore=DL3042
-RUN python3 -m venv /stackable/app \
-    && source /stackable/app/bin/activate \
-    && pip install \
-        --no-cache-dir \
-        --upgrade \
-        setuptools==75.2.0 \
-        pip \
-        uv==${UV_VERSION} \
-    && uv pip install \
-        --no-cache-dir \
-        --upgrade \
-        --constraints /tmp/constraints.txt \
-        --build-constraints /tmp/build-constraints.txt \
-        apache-superset==${PRODUCT_VERSION} \
-        gevent \
-        psycopg2-binary \
-        statsd \
-        pydruid \
-        python-ldap \
-        'trino[sqlalchemy]' \
-        # Add optional dependencies for use in custom Superset configurations.
-        # Since https://github.com/stackabletech/superset-operator/pull/530
-        # admins can add custom configuration to superset_conf.py.
-        Flask_OIDC==2.2.0 \
-        Flask-OpenID==1.3.1 \
-        # Redhat has removed `tzdata` from the ubi-minimal images: see https://bugzilla.redhat.com/show_bug.cgi?id=2223028.
-        # Superset relies on ZoneInfo (https://docs.python.org/3/library/zoneinfo.html#data-sources) to resolve time zones, and this is done
-        # by searching first under `TZPATH` (which is empty due to the point above) or for the tzdata python package.
-        # That package is therefore added here (airflow has tzdata in its list of dependencies, but superset does not).
-        tzdata \
-    # We bumped this from 21.2.0 to 22.0.0 to fix CVE-2024-1135
-    # Superset 4.1.0 will contain at least 22.0.0, the bump was done in https://github.com/apache/superset/commit/4f693c6db0dc5c7286a36b8d23e90541943ff13f
-    # We only want to bump this for the 4.0.x line, as the others already have updated and we don't want to accidentially downgrade the version
-    && if [[ "$PRODUCT_VERSION" =~ ^4\.0\..* ]]; \
-        then echo "Superset 4.0.x detected, installing gunicorn 22.0.0 to fix CVE-2024-1135" \
-        && uv pip install gunicorn==22.0.0; \
-    fi \
-    && uv pip install \
-        --no-cache-dir \
-        --upgrade \
-        python-json-logger \
-        cyclonedx-bom==${CYCLONEDX_BOM_VERSION} \
-    && if [ -n "$AUTHLIB_VERSION" ]; then pip install Authlib==${AUTHLIB_VERSION}; fi && \
-    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_VERSION}.cdx.json /stackable/statsd_exporter-${SHARED_STATSD_EXPORTER_VERSION}.cdx.json
-
 RUN <<EOF
-cd /stackable
-source /stackable/app/bin/activate && cyclonedx-py environment --schema-version 1.5 --outfile app/superset-${PRODUCT_VERSION}.cdx.json
+python${PYTHON_VERSION} -m venv --system-site-packages /stackable/app
+
+source /stackable/app/bin/activate
+
+# Upgrade pip to the latest version
+# Also install uv to get support for build constraints
+pip install --no-cache-dir --upgrade pip setuptools==75.2.0 uv==${UV_VERSION}
+
+cd "$(/stackable/patchable --images-repo-root=src checkout superset ${PRODUCT_VERSION})"
+
+# Build front-end assets
+cd superset-frontend
+
+npm ci
+npm run build
+
+# Install build to properly handle pyproject.toml
+uv pip install --no-cache-dir build
+
+# Build superset wheel from superset root folder
+# This picks up the UI assets from the npm build
+cd ..
+python${PYTHON_VERSION} -m build --wheel
+
+uv pip install --no-cache-dir dist/apache_superset-${PRODUCT_VERSION}-py3-none-any.whl --constraint /tmp/constraints.txt --build-constraints /tmp/build-constraints.txt
+
+# Install additional dependencies
+# Add optional dependencies for use in custom Superset configurations.
+# Since https://github.com/stackabletech/superset-operator/pull/530
+# admins can add custom configuration to superset_conf.py.
+# Redhat has removed `tzdata` from the ubi-minimal images: see https://bugzilla.redhat.com/show_bug.cgi?id=2223028.
+# Superset relies on ZoneInfo (https://docs.python.org/3/library/zoneinfo.html#data-sources) to resolve time zones, and this is done
+# by searching first under `TZPATH` (which is empty due to the point above) or for the tzdata python package.
+# That package is therefore added here (airflow has tzdata in its list of dependencies, but superset does not).
+uv pip install --no-cache-dir \
+    gevent \
+    psycopg2-binary \
+    statsd \
+    pydruid \
+    python-ldap \
+    'trino[sqlalchemy]' \
+    Flask_OIDC==2.2.0 \
+    Flask-OpenID==1.3.1 \
+    tzdata
+
+# We bumped this from 21.2.0 to 22.0.0 to fix CVE-2024-1135
+# Superset 4.1.0 will contain at least 22.0.0, the bump was done in https://github.com/apache/superset/commit/4f693c6db0dc5c7286a36b8d23e90541943ff13f
+# We only want to bump this for the 4.0.x line, as the others already have updated and we don't want to accidentially downgrade the version
+if [[ "$PRODUCT_VERSION" =~ ^4\.0\..* ]]; then
+    echo "Superset 4.0.x detected, installing gunicorn 22.0.0 to fix CVE-2024-1135"
+    uv pip install gunicorn==22.0.0
+fi
+
+uv pip install --no-cache-dir \
+    python-json-logger \
+    cyclonedx-bom==${CYCLONEDX_BOM_VERSION}
+
+if [ -n "$AUTHLIB_VERSION" ]; then
+    pip install Authlib==${AUTHLIB_VERSION}
+fi
+
+uv pip install --no-cache-dir /tmp/opa_authorizer-0.1.0-py3-none-any.whl
+
+cyclonedx-py environment --schema-version 1.5 --outfile /stackable/app/superset-${PRODUCT_VERSION}.cdx.json
+uv pip uninstall cyclonedx-bom
+
 chmod --recursive g=u /stackable
 EOF
 
@@ -137,6 +163,7 @@ ARG PRODUCT_VERSION
 ARG PYTHON_VERSION
 ARG RELEASE_VERSION
 ARG STACKABLE_USER_UID
+ARG SHARED_STATSD_EXPORTER_VERSION
 
 LABEL name="Apache Superset" \
     maintainer="info@stackable.tech" \
@@ -157,6 +184,9 @@ COPY superset/licenses /licenses
 
 COPY --from=builder --chown=${STACKABLE_USER_UID}:0 /stackable/ ${HOME}/
 
+COPY --from=statsd_exporter-builder --chown=${STACKABLE_USER_UID}:0 /statsd_exporter/statsd_exporter /stackable/statsd_exporter
+COPY --from=statsd_exporter-builder --chown=${STACKABLE_USER_UID}:0 /statsd_exporter/statsd_exporter-${SHARED_STATSD_EXPORTER_VERSION}.cdx.json /stackable/statsd_exporter-${SHARED_STATSD_EXPORTER_VERSION}.cdx.json
+
 RUN <<EOF
 microdnf update
 microdnf install \
@@ -169,6 +199,8 @@ microdnf install \
 
 microdnf clean all
 rm -rf /var/cache/yum
+
+chmod g=u /stackable/statsd_exporter /stackable/statsd_exporter-${SHARED_STATSD_EXPORTER_VERSION}.cdx.json
 EOF
 
 # ----------------------------------------
diff --git a/superset/boil-config.toml b/superset/boil-config.toml
index 22ed90d0e..0bd257877 100644
--- a/superset/boil-config.toml
+++ b/superset/boil-config.toml
@@ -1,6 +1,6 @@
 [versions."4.0.2".local-images]
 "shared/statsd-exporter" = "0.28.0"
-stackable-base = "1.0.0"
+stackable-devel = "1.0.0"
 vector = "0.49.0"
 
 [versions."4.0.2".build-arguments]
@@ -9,10 +9,11 @@ cyclonedx-bom-version = "6.0.0"
 authlib-version = "1.2.1"
 python-version = "3.9"
 uv-version = "0.7.3"
+nodejs-version = "20"
 
 [versions."4.1.2".local-images]
 "shared/statsd-exporter" = "0.28.0"
-stackable-base = "1.0.0"
+stackable-devel = "1.0.0"
 vector = "0.49.0"
 
 [versions."4.1.2".build-arguments]
@@ -21,10 +22,11 @@ cyclonedx-bom-version = "6.0.0"
 authlib-version = "1.2.1"
 python-version = "3.9"
 uv-version = "0.7.3"
+nodejs-version = "20"
 
 [versions."4.1.4".local-images]
 "shared/statsd-exporter" = "0.28.0"
-stackable-base = "1.0.0"
+stackable-devel = "1.0.0"
 vector = "0.49.0"
 
 [versions."4.1.4".build-arguments]
@@ -33,3 +35,4 @@ cyclonedx-bom-version = "6.0.0"
 authlib-version = "1.2.1"
 python-version = "3.9"
 uv-version = "0.7.3"
+nodejs-version = "20"
diff --git a/superset/stackable/patches/4.0.2/patchable.toml b/superset/stackable/patches/4.0.2/patchable.toml
new file mode 100644
index 000000000..9a3a4f33d
--- /dev/null
+++ b/superset/stackable/patches/4.0.2/patchable.toml
@@ -0,0 +1 @@
+base = "f11fa091e261a35f4d39d8567a859fad07547d84"
diff --git a/superset/stackable/patches/4.1.2/patchable.toml b/superset/stackable/patches/4.1.2/patchable.toml
new file mode 100644
index 000000000..c1b0863e6
--- /dev/null
+++ b/superset/stackable/patches/4.1.2/patchable.toml
@@ -0,0 +1 @@
+base = "72538bda06c0deef2140e0df65bf0a13bcddb16c"
diff --git a/superset/stackable/patches/4.1.4/patchable.toml b/superset/stackable/patches/4.1.4/patchable.toml
new file mode 100644
index 000000000..3f10399e9
--- /dev/null
+++ b/superset/stackable/patches/4.1.4/patchable.toml
@@ -0,0 +1 @@
+base = "5eb5d6077e4b0b0fa77f91398ac1d59de395b4a6"
diff --git a/superset/stackable/patches/patchable.toml b/superset/stackable/patches/patchable.toml
new file mode 100644
index 000000000..2fdb2ca27
--- /dev/null
+++ b/superset/stackable/patches/patchable.toml
@@ -0,0 +1,2 @@
+upstream = "https://github.com/apache/superset.git"
+default-mirror = "https://github.com/stackabletech/superset.git"