diff --git a/litmus-portal/frontend/src/views/CreateWorkflow/TuneWorkflow/WorkflowTable.tsx b/litmus-portal/frontend/src/views/CreateWorkflow/TuneWorkflow/WorkflowTable.tsx
index bd62e69f4..cbc6faf6b 100644
--- a/litmus-portal/frontend/src/views/CreateWorkflow/TuneWorkflow/WorkflowTable.tsx
+++ b/litmus-portal/frontend/src/views/CreateWorkflow/TuneWorkflow/WorkflowTable.tsx
@@ -123,6 +123,9 @@ const WorkflowTable = forwardRef(
       // Else if Revert Chaos is set to true and it is not already set in the manifest
       // For Workflows
       if (revertChaos && parsedYAML.kind === 'Workflow') {
+        parsedYAML.spec.podGC = {
+          strategy: 'OnWorkflowCompletion',
+        };
         parsedYAML.spec.templates[0].steps.push([
           {
             name: 'revert-chaos',
@@ -153,6 +156,9 @@ const WorkflowTable = forwardRef(
       // Else if Revert Chaos is set to True and it is not already set in the manifest
       // For Cron Workflow
       else if (revertChaos && parsedYAML.kind === 'CronWorkflow') {
+        parsedYAML.spec.workflowSpec.podGC = {
+          strategy: 'OnWorkflowCompletion',
+        };
         parsedYAML.spec.workflowSpec.templates[0].steps.push([
           {
             name: 'revert-chaos',
diff --git a/litmus-portal/frontend/src/views/CreateWorkflow/TuneWorkflow/index.tsx b/litmus-portal/frontend/src/views/CreateWorkflow/TuneWorkflow/index.tsx
index dcc543d2f..a40335051 100644
--- a/litmus-portal/frontend/src/views/CreateWorkflow/TuneWorkflow/index.tsx
+++ b/litmus-portal/frontend/src/views/CreateWorkflow/TuneWorkflow/index.tsx
@@ -534,8 +534,11 @@ const TuneWorkflow = forwardRef((_, ref) => {
       parsedManifest.kind === 'Workflow' &&
       parsedManifest.spec.templates[0].steps[
         parsedManifest.spec.templates[0].steps.length - 1
-      ][0].name === 'revert-chaos'
+      ][0].name === 'revert-chaos' &&
+      parsedManifest.spec.podGC
     ) {
+      delete parsedManifest.spec.podGC;
+
       parsedManifest.spec.templates[0].steps.pop(); // Remove the last step -> Revert Chaos
 
       parsedManifest.spec.templates.pop(); // Remove the last template -> Revert Chaos Template
@@ -547,8 +550,10 @@ const TuneWorkflow = forwardRef((_, ref) => {
       parsedManifest.kind === 'CronWorkflow' &&
       parsedManifest.spec.workflowSpec.templates[0].steps[
         parsedManifest.spec.workflowSpec.templates[0].steps.length - 1
-      ][0].name === 'revert-chaos'
+      ][0].name === 'revert-chaos' &&
+      parsedManifest.spec.workflowSpec.podGC
     ) {
+      delete parsedManifest.workflowSpec.spec.podGC;
       parsedManifest.spec.workflowSpec.templates[0].steps.pop(); // Remove the last step -> Revert Chaos
 
       parsedManifest.spec.workflowSpec.templates.pop(); // Remove the last template -> Revert Chaos Template