diff --git a/plugins/core-plugin/src/main/resources/Dockerfile-template-yaml b/plugins/core-plugin/src/main/resources/Dockerfile-template-yaml
index d766c5a647..da52412981 100644
--- a/plugins/core-plugin/src/main/resources/Dockerfile-template-yaml
+++ b/plugins/core-plugin/src/main/resources/Dockerfile-template-yaml
@@ -81,6 +81,9 @@ COPY --from=python-base /root/.apache_beam/cache /root/.apache_beam/cache
 # Copy licenses
 COPY --from=python-base /usr/licenses/ /usr/licenses/
 
+# Test jsonschema
+RUN python -c "import jsonschema"
+
 WORKDIR /template
 
 ENTRYPOINT ${entryPoint}
diff --git a/plugins/templates-maven-plugin/src/main/java/com/google/cloud/teleport/plugin/maven/TemplatesStageMojo.java b/plugins/templates-maven-plugin/src/main/java/com/google/cloud/teleport/plugin/maven/TemplatesStageMojo.java
index 973ca0cbdf..dceb55ea9c 100644
--- a/plugins/templates-maven-plugin/src/main/java/com/google/cloud/teleport/plugin/maven/TemplatesStageMojo.java
+++ b/plugins/templates-maven-plugin/src/main/java/com/google/cloud/teleport/plugin/maven/TemplatesStageMojo.java
@@ -1085,7 +1085,7 @@ private void stageYamlUsingDockerfile(
 
     File cloudbuildFile = File.createTempFile("cloudbuild", ".yaml");
     try (FileWriter writer = new FileWriter(cloudbuildFile)) {
-      String cacheFolder = imagePathTag.substring(0, imagePathTag.lastIndexOf('/')) + "/cache";
+      // String cacheFolder = imagePathTag.substring(0, imagePathTag.lastIndexOf('/')) + "/cache";
       String tarPath = "/workspace/" + yamlTemplateName + ".tar\n";
       writer.write(
           "steps:\n"
@@ -1097,12 +1097,12 @@ private void stageYamlUsingDockerfile(
               + "  - --dockerfile="
               + dockerfile
               + "\n"
-              + "  - --cache=true\n"
-              + "  - --cache-ttl=6h\n"
-              + "  - --compressed-caching=false\n"
-              + "  - --cache-copy-layers=true\n"
-              + "  - --cache-repo="
-              + cacheFolder
+              // + "  - --cache=true\n"
+              // + "  - --cache-ttl=6h\n"
+              // + "  - --compressed-caching=false\n"
+              // + "  - --cache-copy-layers=true\n"
+              // + "  - --cache-repo="
+              // + cacheFolder
               + (generateSBOM
                   ? "\n"
                       + "  - --no-push\n"
@@ -1159,7 +1159,7 @@ private void stagePythonUsingDockerfile(
 
     File cloudbuildFile = File.createTempFile("cloudbuild", ".yaml");
     try (FileWriter writer = new FileWriter(cloudbuildFile)) {
-      String cacheFolder = imagePathTag.substring(0, imagePathTag.lastIndexOf('/')) + "/cache";
+      // String cacheFolder = imagePathTag.substring(0, imagePathTag.lastIndexOf('/')) + "/cache";
       String tarPath = "/workspace/" + containerName + ".tar\n";
       writer.write(
           "steps:\n"
@@ -1168,12 +1168,12 @@ private void stagePythonUsingDockerfile(
               + "  - --destination="
               + imagePathTag
               + "\n"
-              + "  - --cache=true\n"
-              + "  - --cache-ttl=6h\n"
-              + "  - --compressed-caching=false\n"
-              + "  - --cache-copy-layers=true\n"
-              + "  - --cache-repo="
-              + cacheFolder
+              // + "  - --cache=true\n"
+              // + "  - --cache-ttl=6h\n"
+              // + "  - --compressed-caching=false\n"
+              // + "  - --cache-copy-layers=true\n"
+              // + "  - --cache-repo="
+              // + cacheFolder
               + (generateSBOM
                   ? "\n"
                       + "  - --no-push\n"
@@ -1310,7 +1310,7 @@ private void stageXlangUsingDockerfile(
     File cloudbuildFile = File.createTempFile("cloudbuild", ".yaml");
     String tarPath = "/workspace/" + containerName + ".tar\n";
     try (FileWriter writer = new FileWriter(cloudbuildFile)) {
-      String cacheFolder = imagePathTag.substring(0, imagePathTag.lastIndexOf('/')) + "/cache";
+      // String cacheFolder = imagePathTag.substring(0, imagePathTag.lastIndexOf('/')) + "/cache";
       writer.write(
           "steps:\n"
               + "- name: gcr.io/kaniko-project/executor\n"
@@ -1321,12 +1321,12 @@ private void stageXlangUsingDockerfile(
               + "  - --dockerfile="
               + dockerfile
               + "\n"
-              + "  - --cache=true\n"
-              + "  - --cache-ttl=6h\n"
-              + "  - --compressed-caching=false\n"
-              + "  - --cache-copy-layers=true\n"
-              + "  - --cache-repo="
-              + cacheFolder
+              // + "  - --cache=true\n"
+              // + "  - --cache-ttl=6h\n"
+              // + "  - --compressed-caching=false\n"
+              // + "  - --cache-copy-layers=true\n"
+              // + "  - --cache-repo="
+              // + cacheFolder
               + (generateSBOM
                   ? "\n"
                       + "  - --no-push\n"
diff --git a/pom.xml b/pom.xml
index e2d1ed4f78..58415f6714 100644
--- a/pom.xml
+++ b/pom.xml
@@ -531,7 +531,7 @@
                <executable>bash</executable>
                <arguments>
                  <argument>-c</argument>
-                 <argument>find . -name "TEST-*.xml" -path "*/target/surefire-reports/*" -exec sed -i.bak 's/time="\([0-9]*\),\([0-9]*\.*[0-9]*\)"/time="\1\2"/g' {} \;</argument>
+                 <argument>find . -name "TEST-*.xml" -path "*/target/surefire-reports/*" -exec sed -E -i.bak -e ':a' -e 's/(time="[^\"]*),/\1/g' -e 'ta' {} \; || true</argument>
                </arguments>
              </configuration>
           </execution>
@@ -559,6 +559,10 @@
             <goals>
               <goal>report-only</goal>
             </goals>
+            <configuration>
+              <!-- If report generation encounters parsing issues, skip to avoid failing the build -->
+              <skipSurefireReport>true</skipSurefireReport>
+            </configuration>
           </execution>
         </executions>
       </plugin>