diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5cf347fea..f2c92be14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ All notable changes to this project will be documented in this file.
   `check-permissions-ownership.sh` provided in stackable-base image ([#1025]).
 - zookeeper: check for correct permissions and ownerships in /stackable folder via
   `check-permissions-ownership.sh` provided in stackable-base image ([#1043]).
+- nifi: Add [nifi-iceberg-bundle](https://github.com/stackabletech/nifi-iceberg-bundle) for NiFi `2.2.0` ([#1060]).
 - java: Add JDK 24 ([#1097]).
 
 ### Changed
@@ -85,6 +86,7 @@ All notable changes to this project will be documented in this file.
 [#1054]: https://github.com/stackabletech/docker-images/pull/1054
 [#1055]: https://github.com/stackabletech/docker-images/pull/1055
 [#1056]: https://github.com/stackabletech/docker-images/pull/1056
+[#1060]: https://github.com/stackabletech/docker-images/pull/1060
 [#1090]: https://github.com/stackabletech/docker-images/pull/1090
 [#1091]: https://github.com/stackabletech/docker-images/pull/1091
 [#1093]: https://github.com/stackabletech/docker-images/pull/1093
diff --git a/nifi/Dockerfile b/nifi/Dockerfile
index 98d5eea42..94b3899be 100644
--- a/nifi/Dockerfile
+++ b/nifi/Dockerfile
@@ -63,6 +63,47 @@ rm -rf /stackable/nifi-${PRODUCT}/docs
 chmod -R g=u /stackable
 EOF
 
+FROM stackable/image/java-devel AS nifi-iceberg-bundle-builder
+
+ARG NIFI_ICEBERG_BUNDLE
+ARG PRODUCT
+ARG STACKABLE_USER_UID
+
+USER ${STACKABLE_USER_UID}
+WORKDIR /build
+
+RUN <<EOF
+mkdir -p /stackable
+
+# NiFI 1.x natively supports Iceberg, no need to build an iceberg-bundle for it
+if [[ "${PRODUCT}" != 1.* ]] ; then
+    curl "https://github.com/stackabletech/nifi-iceberg-bundle/archive/refs/tags/${NIFI_ICEBERG_BUNDLE}.tar.gz" | tar -xzC .
+    cd nifi-iceberg-bundle-${NIFI_ICEBERG_BUNDLE} || exit
+
+    mvn \
+        --batch-mode \
+        --no-transfer-progress\
+        clean package \
+        -D nifi.version=${PRODUCT} \
+        -Dmaven.javadoc.skip=true \
+        -Denforcer.skip=true
+    # We need "-Denforcer.skip=true", as the Maven version is too old
+
+    cp ./nifi-iceberg-services-api-nar/target/nifi-iceberg-services-api-nar-${NIFI_ICEBERG_BUNDLE}.nar /stackable
+    cp ./nifi-iceberg-services-nar/target/nifi-iceberg-services-nar-${NIFI_ICEBERG_BUNDLE}.nar /stackable
+    cp ./nifi-iceberg-processors-nar/target/nifi-iceberg-processors-nar-${NIFI_ICEBERG_BUNDLE}.nar /stackable
+    cp ./target/bom.json /stackable/nifi-iceberg-bundle.sbom.json
+
+    cd ..
+    # Save disk space, even for intermediate images
+    rm -rf nifi-iceberg-bundle-main
+
+# Set correct groups
+chmod g=u /stackable/*.nar
+chmod g=u /stackable/*.sbom.json
+fi
+EOF
+
 FROM stackable/image/java-base AS final
 
 ARG PRODUCT
@@ -79,6 +120,8 @@ LABEL name="Apache NiFi" \
 
 COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-builder /stackable/nifi-${PRODUCT} /stackable/nifi-${PRODUCT}/
 COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-builder /stackable/stackable-bcrypt.jar /stackable/stackable-bcrypt.jar
+COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-iceberg-bundle-builder /stackable/*.nar /stackable/nifi-${PRODUCT}/lib/
+COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-iceberg-bundle-builder /stackable/*.sbom.json /stackable/nifi-${PRODUCT}/lib/
 
 COPY --chown=${STACKABLE_USER_UID}:0 nifi/stackable/bin /stackable/bin
 COPY --chown=${STACKABLE_USER_UID}:0 nifi/licenses /licenses
diff --git a/nifi/versions.py b/nifi/versions.py
index d4f63a92e..9f7ae285c 100644
--- a/nifi/versions.py
+++ b/nifi/versions.py
@@ -13,5 +13,6 @@
         "product": "2.2.0",
         "java-base": "21",
         "java-devel": "21",
+        "nifi_iceberg_bundle": "0.0.3",
     },
 ]