diff --git a/.github/workflows/dev_nifi.yaml b/.github/workflows/dev_nifi.yaml
index f0598c86..d2a10b95 100644
--- a/.github/workflows/dev_nifi.yaml
+++ b/.github/workflows/dev_nifi.yaml
@@ -6,7 +6,9 @@ on:
   push:
     branches:
       - main
-      # TODO (@NickLarsenNZ): Also build on release branches, but with a stackable0.0.0-dev or stackableXX.X.X tag.
+      # TODO (@NickLarsenNZ): Also build on release branches, but with a stackable0.0.0-dev or stackableYY.M.X tag.
+      # The current problem is that we don't know the patch level, so do we always build for `.0`, or just drop that
+      # (eg: stackableYY.M), but then do we do the same for main (eg: 0.0-dev)?
       # - release-*
     paths:
       - demos/signal-processing/Dockerfile-nifi
@@ -23,5 +25,5 @@ jobs:
       image-name: nifi
       # TODO (@NickLarsenNZ): Use a versioned image with stackable0.0.0-dev or stackableXX.X.X so that
       # the demo is reproducable for the release and it will be automatically replaced for the release branch.
-      image-version: 2.2.0-postgresql
+      image-version: 2.4.0-postgresql
       containerfile-path: demos/signal-processing/Dockerfile-nifi
diff --git a/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml b/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml
index bae55688..bdf4f721 100644
--- a/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml
+++ b/stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml
@@ -5,7 +5,7 @@ metadata:
   name: nifi
 spec:
   image:
-    productVersion: 2.2.0
+    productVersion: 2.4.0
   clusterConfig:
     authentication:
       - authenticationClass: nifi-admin-credentials
diff --git a/stacks/nifi-kafka-druid-superset-s3/nifi.yaml b/stacks/nifi-kafka-druid-superset-s3/nifi.yaml
index 225fce94..0be60c2a 100644
--- a/stacks/nifi-kafka-druid-superset-s3/nifi.yaml
+++ b/stacks/nifi-kafka-druid-superset-s3/nifi.yaml
@@ -5,7 +5,7 @@ metadata:
   name: nifi
 spec:
   image:
-    productVersion: 2.2.0
+    productVersion: 2.4.0
   clusterConfig:
     authentication:
       - authenticationClass: nifi-admin-credentials
diff --git a/stacks/signal-processing/nifi.yaml b/stacks/signal-processing/nifi.yaml
index 6ceda2b0..6f8bd2f0 100644
--- a/stacks/signal-processing/nifi.yaml
+++ b/stacks/signal-processing/nifi.yaml
@@ -5,10 +5,10 @@ metadata:
   name: nifi
 spec:
   image:
-    productVersion: 2.2.0
+    productVersion: 2.4.0
     # TODO (@NickLarsenNZ): Use a versioned image with stackable0.0.0-dev or stackableXX.X.X so that
     # the demo is reproducable for the release and it will be automatically replaced for the release branch.
-    custom: oci.stackable.tech/demos/nifi:2.2.0-postgresql
+    custom: oci.stackable.tech/demos/nifi:2.4.0-postgresql
     # pullPolicy: IfNotPresent
   clusterConfig:
     listenerClass: external-unstable