diff --git a/control-operator/ecs-manifests/task-templates/dpl-tasktemplate.yaml b/control-operator/ecs-manifests/task-templates/dpl-tasktemplate.yaml
index 2a5adeff..6233f4d2 100644
--- a/control-operator/ecs-manifests/task-templates/dpl-tasktemplate.yaml
+++ b/control-operator/ecs-manifests/task-templates/dpl-tasktemplate.yaml
@@ -7,7 +7,6 @@ spec:
   envVars:
     - O2_DETECTOR
     - O2_PARTITION
-    - OCC_CONTROL_PORT
     - O2_SYSTEM
     - O2_ROLE
   pod:
@@ -18,7 +17,7 @@ spec:
       supplementalGroups: [10, 1105]
     containers:
       - name: dpl
-        image: gitlab-registry.cern.ch/pkonopka/dockerfiles/flp-sw:20260729-1
+        image: gitlab-registry.cern.ch/aliceo2group/dockerfiles/alma9-flp-node/o2suite:20261001-1
         command: ["bash", "-c"]
         securityContext:
           privileged: true
diff --git a/control-operator/ecs-manifests/task-templates/readout-tasktemplate.yaml b/control-operator/ecs-manifests/task-templates/readout-tasktemplate.yaml
index bafb7bb4..5aa48049 100644
--- a/control-operator/ecs-manifests/task-templates/readout-tasktemplate.yaml
+++ b/control-operator/ecs-manifests/task-templates/readout-tasktemplate.yaml
@@ -17,7 +17,7 @@ spec:
       supplementalGroups: [10, 1105]
     containers:
       - name: readout
-        image: gitlab-registry.cern.ch/aliceo2group/dockerfiles/alma9-flp-node/readout:1
+        image: gitlab-registry.cern.ch/aliceo2group/dockerfiles/alma9-flp-node/o2suite:20261001-1
         command: ["/opt/o2/bin/o2-readout-exe"]
         env:
           - name: OCC_CONTROL_PORT
diff --git a/control-operator/ecs-manifests/task-templates/stfbuilder-senderoutput-tasktemplate.yaml b/control-operator/ecs-manifests/task-templates/stfbuilder-senderoutput-tasktemplate.yaml
index 7ae6955b..978389ba 100644
--- a/control-operator/ecs-manifests/task-templates/stfbuilder-senderoutput-tasktemplate.yaml
+++ b/control-operator/ecs-manifests/task-templates/stfbuilder-senderoutput-tasktemplate.yaml
@@ -19,7 +19,7 @@ spec:
       supplementalGroups: [10, 1105]
     containers:
       - name: stfbuilder
-        image: gitlab-registry.cern.ch/aliceo2group/dockerfiles/alma9-flp-node/dd:1
+        image: gitlab-registry.cern.ch/aliceo2group/dockerfiles/alma9-flp-node/o2suite:20261001-1
         command: [/opt/o2/bin/StfBuilder]
         env:
           - name: OCC_CONTROL_PORT
diff --git a/control-operator/ecs-manifests/task-templates/stfbuilder-tasktemplate.yaml b/control-operator/ecs-manifests/task-templates/stfbuilder-tasktemplate.yaml
new file mode 100644
index 00000000..42d29762
--- /dev/null
+++ b/control-operator/ecs-manifests/task-templates/stfbuilder-tasktemplate.yaml
@@ -0,0 +1,77 @@
+apiVersion: aliecs.alice.cern/v1alpha1
+kind: TaskTemplate
+metadata:
+  name: stfbuilder
+  namespace: alice-tasks
+spec:
+  envVars:
+    - O2_DETECTOR
+    - O2_PARTITION
+    - O2_SYSTEM
+    - O2_ROLE
+    - O2_INFOLOGGER_MODE
+    - DATADIST_FEE_MASK
+  pod:
+    hostNetwork: true
+    hostIPC: true
+    securityContext:
+      fsGroup: 1100
+      supplementalGroups: [10, 1105]
+    containers:
+      - name: stfbuilder
+        image: gitlab-registry.cern.ch/aliceo2group/dockerfiles/alma9-flp-node/o2suite:20261001-1
+        command: [/opt/o2/bin/StfBuilder]
+        env:
+          - name: OCC_CONTROL_PORT
+            value: "47102"
+        securityContext:
+          privileged: true
+          runAsUser: 1100
+          runAsGroup: 1100
+        volumeMounts:
+          - name: host-shm
+            mountPath: /dev/shm
+          - name: group
+            mountPath: /etc/group
+            readOnly: true
+          - name: passwd
+            mountPath: /etc/passwd
+            readOnly: true
+          - name: tmp
+            mountPath: /tmp
+          - name: modules
+            mountPath: /lib/modules
+        imagePullPolicy: IfNotPresent
+    volumes:
+      - name: host-shm
+        hostPath:
+          path: /dev/shm
+          type: Directory
+      - name: group
+        hostPath:
+          path: /etc/group
+      - name: passwd
+        hostPath:
+          path: /etc/passwd
+      - name: tmp
+        hostPath:
+          path: /tmp
+      - name: modules
+        hostPath:
+          path: /lib/modules
+    imagePullSecrets:
+      - name: gitlab-registry-secret
+  control:
+    mode: "fairmq"
+    # port: ${OCC_CONTROL_PORT} # to be filled in automatically by TaskController
+  bind:
+    - name: dpl-chan
+      type: push
+      rateLogging: "0"
+      addressing: ipc
+      transport: shmem
+      sndBufSize: 4
+      global: ""
+      target: ""
+  connect: []
+  properties: {}
diff --git a/control-operator/ecs-manifests/task-templates/stfsender-tasktemplate.yaml b/control-operator/ecs-manifests/task-templates/stfsender-tasktemplate.yaml
index 77a3139d..62efc2c7 100644
--- a/control-operator/ecs-manifests/task-templates/stfsender-tasktemplate.yaml
+++ b/control-operator/ecs-manifests/task-templates/stfsender-tasktemplate.yaml
@@ -26,7 +26,7 @@ spec:
       supplementalGroups: [10, 1105]
     containers:
       - name: stfsender
-        image: gitlab-registry.cern.ch/aliceo2group/dockerfiles/alma9-flp-node/dd:1
+        image: gitlab-registry.cern.ch/aliceo2group/dockerfiles/alma9-flp-node/o2suite:20261001-1
         command: ["numactl"]
         env:
           - name: OCC_CONTROL_PORT