diff --git a/build.xml b/build.xml
index aff9fa7c..9971c56f 100644
--- a/build.xml
+++ b/build.xml
@@ -2045,8 +2045,13 @@
             <concat>${retUUID.txt}</concat>
             <filterchain>
                 <tokenfilter>
-                    <replaceregex
-                         pattern="Processing complete\s*([0-9a-fA-F\-]+)$"
+                    <linetokenizer />
+                    <containsregex pattern="^\s*id:\s*([0-9a-fA-F\-]+)\s*$" />
+                </tokenfilter>
+                <tokenfilter>
+                    <stringtokenizer delims=":- \r\n" suppressdelims="true" />
+                    <containsregex
+                         pattern="^\s*id:\s*([0-9a-fA-F\-]+)\s*$"
                          replace="\1" />
                 </tokenfilter>
                 <striplinebreaks/>
@@ -2114,8 +2119,13 @@
             <concat>${zipUUID.txt}</concat>
             <filterchain>
                 <tokenfilter>
-                    <replaceregex
-                        pattern="Processing complete\s*([0-9a-fA-F\-]+)$"
+                    <linetokenizer />
+                    <containsregex pattern="^\s*id:\s*([0-9a-fA-F\-]+)\s*$" />
+                </tokenfilter>
+                <tokenfilter>
+                    <stringtokenizer delims=":- \r\n" suppressdelims="true" />
+                    <containsregex
+                         pattern="^\s*id:\s*([0-9a-fA-F\-]+)\s*$"
                          replace="\1" />
                 </tokenfilter>
                 <striplinebreaks/>