diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54b614046..f69e9e3e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,7 +33,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]).
+- nifi: Add [nifi-iceberg-bundle](https://github.com/stackabletech/nifi-iceberg-bundle) for NiFi `2.2.0` ([#1060], [#1106]).
 - java: Add JDK 24 ([#1097]).
 - ci: Add golang image to mirror workflow ([#1103]).
 
@@ -101,6 +101,7 @@ All notable changes to this project will be documented in this file.
 [#1098]: https://github.com/stackabletech/docker-images/pull/1098
 [#1102]: https://github.com/stackabletech/docker-images/pull/1102
 [#1103]: https://github.com/stackabletech/docker-images/pull/1103
+[#1106]: https://github.com/stackabletech/docker-images/pull/1106
 
 ## [25.3.0] - 2025-03-21
 
diff --git a/nifi/Dockerfile b/nifi/Dockerfile
index 94b3899be..b05e6ea88 100644
--- a/nifi/Dockerfile
+++ b/nifi/Dockerfile
@@ -96,7 +96,7 @@ if [[ "${PRODUCT}" != 1.* ]] ; then
 
     cd ..
     # Save disk space, even for intermediate images
-    rm -rf nifi-iceberg-bundle-main
+    rm -rf nifi-iceberg-bundle-${NIFI_ICEBERG_BUNDLE}
 
 # Set correct groups
 chmod g=u /stackable/*.nar