diff --git a/DATA/testing/detectors/TPC/tpc-laser-raw-filter.sh b/DATA/testing/detectors/TPC/tpc-laser-raw-filter.sh
index cfdaa0ffc..69555f316 100755
--- a/DATA/testing/detectors/TPC/tpc-laser-raw-filter.sh
+++ b/DATA/testing/detectors/TPC/tpc-laser-raw-filter.sh
@@ -6,43 +6,58 @@ source common/getCommonArgs.sh
 
 source common/gen_topo_helper_functions.sh
 
-export SHMSIZE=$(( 128 << 30 )) #  GB for the global SHMEM # for kr cluster finder
-
 if [ $NUMAGPUIDS != 0 ]; then
   ARGS_ALL+=" --child-driver 'numactl --membind $NUMAID --cpunodebind $NUMAID'"
 fi
 
-PROXY_INSPEC="A:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0;eos:***/INFORMATION"
-CALIB_INSPEC="A:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0;eos:***/INFORMATION"
+PROXY_INSPEC="A:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0"
+CALIB_INSPEC="A:TPC/RAWDATA;dd:FLP/DISTSUBTIMEFRAME/0"
 
 NLANES=36
 SESSION="default"
 PIPEADD="0"
-ARGS_FILES="keyval.output_dir=/dev/null"
 
 HOST=localhost
-
 QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-raw-qcmn"
-
+QC_CONFIG_CONSUL=/o2/components/qc/ANY/any/tpc-raw-qcmn
 # TODO use add_W function from gen_topo_helper_functions.sh to assemble workflow
 # as done for example in https://github.com/AliceO2Group/O2DPG/blob/master/DATA/production/calib/its-threshold-processing.sh
-o2-dpl-raw-proxy $ARGS_ALL \
-    --dataspec "$PROXY_INSPEC" --inject-missing-data \
-    --readout-proxy '--channel-config "name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1"' \
-    | o2-tpc-raw-to-digits-workflow $ARGS_ALL \
-    --input-spec "$CALIB_INSPEC"  \
-    --configKeyValues "$ARGS_FILES" \
-    --remove-duplicates \
-    --pipeline tpc-raw-to-digits-0:24 \
-    | o2-tpc-krypton-raw-filter $ARGS_ALL \
-    --configKeyValues "$ARGS_FILES" \
-    --lanes $NLANES \
-    --writer-type EPN \
-    --meta-output-dir $EPN2EOS_METAFILES_DIR \
-    --output-dir $CALIB_DIR \
-    --threshold-max 20 \
-    --max-tf-per-file 8000 \
-    --time-bins-before 20 \
-    --max-time-bins 650 \
-    | o2-qc $ARGS_ALL --config ${QC_CONFIG} --local --host $HOST \
-    | o2-dpl-run $ARGS_ALL --dds ${WORKFLOWMODE_FILE} ${GLOBALDPLOPT}
+
+WORKFLOW=
+add_W o2-dpl-raw-proxy "--dataspec \"$PROXY_INSPEC\" --inject-missing-data --channel-config \"name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1\"" "" 0
+add_W o2-tpc-raw-to-digits-workflow "--ignore-grp --input-spec \"$CALIB_INSPEC\" --remove-duplicates --pipeline tpc-raw-to-digits-0:20"
+add_W o2-tpc-krypton-raw-filter "tpc-raw-to-digits-0:24  --lanes $NLANES --writer-type EPN --meta-output-dir $EPN2EOS_METAFILES_DIR --output-dir $CALIB_DIR --threshold-max 20 --max-tf-per-file 8000 --time-bins-before 20 --max-time-bins 650"
+add_QC_from_consul "${QC_CONFIG_CONSUL}" "--local --host lcoalhost"
+
+
+
+WORKFLOW+="o2-dpl-run ${ARGS_ALL} ${GLOBALDPLOPT}"
+if [ $WORKFLOWMODE == "print" ]; then
+  echo Workflow command:
+  echo $WORKFLOW | sed "s/| */|\n/g"
+else
+  # Execute the command we have assembled
+  WORKFLOW+=" --$WORKFLOWMODE ${WORKFLOWMODE_FILE}"
+  eval $WORKFLOW
+fi
+
+#o2-dpl-raw-proxy $ARGS_ALL \
+#    --dataspec "$PROXY_INSPEC" --inject-missing-data \
+#    --readout-proxy '--channel-config "name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1"' \
+#    | o2-tpc-raw-to-digits-workflow $ARGS_ALL \
+#    --input-spec "$CALIB_INSPEC"  \
+#    --configKeyValues "$ARGS_FILES;$ARGS_ALL_CONFIG" \
+#    --remove-duplicates \
+#    --pipeline tpc-raw-to-digits-0:24 \
+#    | o2-tpc-krypton-raw-filter $ARGS_ALL \
+#    --configKeyValues "$ARGS_FILES" \
+#   --lanes $NLANES \
+#    --writer-type EPN \
+#    --meta-output-dir $EPN2EOS_METAFILES_DIR \
+#    --output-dir $CALIB_DIR \
+#    --threshold-max 20 \
+#    --max-tf-per-file 8000 \
+#    --time-bins-before 20 \
+#    --max-time-bins 650 \
+#    | o2-qc $ARGS_ALL --config ${QC_CONFIG} --local --host $HOST \
+#    | o2-dpl-run $ARGS_ALL --dds ${WORKFLOWMODE_FILE} ${GLOBALDPLOPT}
diff --git a/DATA/testing/detectors/TPC/workflows.desc b/DATA/testing/detectors/TPC/workflows.desc
index ccb65f2bf..4007a87b1 100644
--- a/DATA/testing/detectors/TPC/workflows.desc
+++ b/DATA/testing/detectors/TPC/workflows.desc
@@ -1,4 +1,4 @@
 TPC-krypton: "O2PDPSuite" reco,60,60,"SHMSIZE=128000000000 testing/detectors/TPC/tpc-krypton.sh"
 TPC-krypton-raw: "O2PDPSuite" reco,60,60,"SHMSIZE=128000000000 testing/detectors/TPC/tpc-krypton-raw.sh"
-TPC-laser-raw-filter: "O2PDPSuite" reco,80,80,"SHMSIZE=128000000000 testing/detectors/TPC/tpc-laser-raw-filter.sh"
-TPC-pattern-generator:  "O2PDPSuite" reco,1,1,"SHMSIZE=$((112 << 30)) GPUTYPE=HIP GPUMEMSIZE=$(( 24 << 30 )) HOSTMEMSIZE=$(( 5 << 30 ))   testing/detectors/TPC/tpc-pattern-generator.sh"
+TPC-laser-raw-filter: "O2PDPSuite" reco,80,80,"SHMSIZE=$((128 << 30)) GPUTYPE=HIP GPUMEMSIZE=$(( 24 << 30 )) HOSTMEMSIZE=$(( 5 << 30 )) testing/detectors/TPC/tpc-laser-raw-filter.sh"
+TPC-pattern-generator:  "O2PDPSuite" reco,1,1,"SHMSIZE=$((112 << 30)) GPUTYPE=HIP GPUMEMSIZE=$(( 24 << 30 )) HOSTMEMSIZE=$(( 5 << 30 )) testing/detectors/TPC/tpc-pattern-generator.sh"