diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/triggers/PeriodicBatchEntityTrigger.java b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/triggers/PeriodicBatchEntityTrigger.java
index b08a58ee524..11ae7397723 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/triggers/PeriodicBatchEntityTrigger.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/triggers/PeriodicBatchEntityTrigger.java
@@ -121,12 +121,12 @@ public class PeriodicBatchEntityTrigger implements TriggerInterface {
             .build();
 
     IOParameter inputParameter = new IOParameter();
-    inputParameter.setSource(getNamespacedVariableName(GLOBAL_NAMESPACE, RELATED_ENTITY_VARIABLE));
+    inputParameter.setSource(RELATED_ENTITY_VARIABLE);
     inputParameter.setTarget(getNamespacedVariableName(GLOBAL_NAMESPACE, RELATED_ENTITY_VARIABLE));
 
     IOParameter outputParameter = new IOParameter();
     outputParameter.setSource(getNamespacedVariableName(GLOBAL_NAMESPACE, EXCEPTION_VARIABLE));
-    outputParameter.setTarget(getNamespacedVariableName(GLOBAL_NAMESPACE, EXCEPTION_VARIABLE));
+    outputParameter.setTarget(EXCEPTION_VARIABLE);
 
     workflowTrigger.setInParameters(List.of(inputParameter));
     workflowTrigger.setOutParameters(List.of(outputParameter));
diff --git a/openmetadata-service/src/main/resources/json/data/governance/workflows/GlossaryApprovalWorkflow.json b/openmetadata-service/src/main/resources/json/data/governance/workflows/GlossaryApprovalWorkflow.json
index 0cb19a9ab23..ecc066fdd3f 100644
--- a/openmetadata-service/src/main/resources/json/data/governance/workflows/GlossaryApprovalWorkflow.json
+++ b/openmetadata-service/src/main/resources/json/data/governance/workflows/GlossaryApprovalWorkflow.json
@@ -24,6 +24,12 @@
       "name": "ApprovedEnd",
       "displayName": "Glossary Term Status: Approved"
     },
+    {
+      "type": "endEvent",
+      "subType": "endEvent",
+      "name": "ApprovedEndAfterApproval",
+      "displayName": "Glossary Term Status: Approved"
+    },
     {
       "type": "endEvent",
       "subType": "endEvent",
@@ -101,7 +107,7 @@
     {
       "type": "automatedTask",
       "subType": "setGlossaryTermStatusTask",
-      "name": "SetGlossaryTermStatusToApproved",
+      "name": "SetGlossaryTermStatusToApprovedAfterApproval",
       "displayName": "Set Status to 'Approved'",
       "config": {
         "glossaryTermStatus": "Approved"
@@ -111,6 +117,18 @@
         "updatedBy": "ApproveGlossaryTerm"
       }
     },
+    {
+      "type": "automatedTask",
+      "subType": "setGlossaryTermStatusTask",
+      "name": "SetGlossaryTermStatusToApproved",
+      "displayName": "Set Status to 'Approved'",
+      "config": {
+        "glossaryTermStatus": "Approved"
+      },
+      "inputNamespaceMap": {
+        "relatedEntity": "global"
+      }
+    },
     {
       "type": "automatedTask",
       "subType": "setGlossaryTermStatusTask",
@@ -160,7 +178,7 @@
     },
     {
       "from": "ApproveGlossaryTerm",
-      "to": "SetGlossaryTermStatusToApproved",
+      "to": "SetGlossaryTermStatusToApprovedAfterApproval",
       "condition": "true"
     },
     {
@@ -168,6 +186,10 @@
       "to": "SetGlossaryTermStatusToRejected",
       "condition": "false"
     },
+    {
+      "from": "SetGlossaryTermStatusToApprovedAfterApproval",
+      "to": "ApprovedEndAfterApproval"
+    },
     {
       "from": "SetGlossaryTermStatusToApproved",
       "to": "ApprovedEnd"