diff --git a/lib/ep3/extensions/cwl-metrics/conf/telegraf.conf b/lib/ep3/extensions/cwl-metrics/conf/telegraf.conf
index fef8248..18a1498 100644
--- a/lib/ep3/extensions/cwl-metrics/conf/telegraf.conf
+++ b/lib/ep3/extensions/cwl-metrics/conf/telegraf.conf
@@ -20,8 +20,7 @@
 
   ## Containers to include and exclude. Globs accepted.
   ## Note that an empty array for both will include all containers
-  container_name_include = []
-  # container_name_include = ["ep3-$EP3_PID-*"]
+  container_name_include = ["ep3-$EP3_PID-*"]
   container_name_exclude = []
 
   ## Timeout for docker list, info, and stats commands
diff --git a/lib/ep3/extensions/cwl-metrics/extension.yml b/lib/ep3/extensions/cwl-metrics/extension.yml
index 45d0a0c..5d978c6 100644
--- a/lib/ep3/extensions/cwl-metrics/extension.yml
+++ b/lib/ep3/extensions/cwl-metrics/extension.yml
@@ -197,7 +197,7 @@ hooks:
               pattern: ~(tr.return)
             - place: cid
               pattern: ~(newfile)
-          command: executor --cidfile=~(out.cid) ~(in.CommandGeneration.command)
+          command: executor --name=ep3-${EP3_PID}-~(tag) --cidfile=~(out.cid) ~(in.CommandGeneration.command)
       - type: insert-before
         target: prepare
         in: