diff --git a/src/main/java/zw/qantra/tm/domain/workflows/handlers/CleanupHandler.java b/src/main/java/zw/qantra/tm/domain/workflows/handlers/CleanupHandler.java
index 0955e62..ddf3949 100644
--- a/src/main/java/zw/qantra/tm/domain/workflows/handlers/CleanupHandler.java
+++ b/src/main/java/zw/qantra/tm/domain/workflows/handlers/CleanupHandler.java
@@ -9,6 +9,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import zw.qantra.tm.domain.enums.RequestType;
+import zw.qantra.tm.domain.enums.Status;
 import zw.qantra.tm.domain.models.Provider;
 import zw.qantra.tm.domain.models.Transaction;
 import zw.qantra.tm.domain.services.ProviderService;
@@ -32,6 +33,9 @@ public class CleanupHandler implements HandlerInterface {
         if(transaction.getType().equals(RequestType.CONFIRM)) {
             transaction.setTrace(Utils.getUid());
             transaction.setReference(UUID.randomUUID().toString());
+            transaction.setConfirmationStatus(Status.PENDING);
+            transaction.setPaymentStatus(Status.PENDING);
+            transaction.setIntegrationStatus(Status.PENDING);
         }
 
         // UPDATE TRAN WITH CONFIRMATION HANDLER
diff --git a/src/main/java/zw/qantra/tm/domain/workflows/handlers/ConfirmHandler.java b/src/main/java/zw/qantra/tm/domain/workflows/handlers/ConfirmHandler.java
index 0ceb137..89a39d2 100644
--- a/src/main/java/zw/qantra/tm/domain/workflows/handlers/ConfirmHandler.java
+++ b/src/main/java/zw/qantra/tm/domain/workflows/handlers/ConfirmHandler.java
@@ -41,6 +41,9 @@ public class ConfirmHandler implements HandlerInterface {
         }catch (Exception e){
             e.printStackTrace();
             transaction.setStatus(Status.FAILED);
+            transaction.setConfirmationStatus(Status.FAILED);
+            transaction.setPaymentStatus(Status.FAILED);
+            transaction.setIntegrationStatus(Status.FAILED);
             transaction.setResponseCode("01");
             transaction.setErrorMessage(e.getMessage());
             transactionService.save(transaction);
diff --git a/src/main/java/zw/qantra/tm/domain/workflows/handlers/IntegrationHandler.java b/src/main/java/zw/qantra/tm/domain/workflows/handlers/IntegrationHandler.java
index afa84b4..dd4f416 100644
--- a/src/main/java/zw/qantra/tm/domain/workflows/handlers/IntegrationHandler.java
+++ b/src/main/java/zw/qantra/tm/domain/workflows/handlers/IntegrationHandler.java
@@ -57,6 +57,7 @@ public class IntegrationHandler implements HandlerInterface {
         }catch (Exception e){
             e.getCause().printStackTrace();
             transaction.setStatus(Status.FAILED);
+            transaction.setIntegrationStatus(Status.FAILED);
             transaction.setResponseCode("01");
             transaction.setErrorMessage(e.getMessage());
         }
diff --git a/src/main/java/zw/qantra/tm/domain/workflows/handlers/PaymentHandler.java b/src/main/java/zw/qantra/tm/domain/workflows/handlers/PaymentHandler.java
index b423faa..a7eea4a 100644
--- a/src/main/java/zw/qantra/tm/domain/workflows/handlers/PaymentHandler.java
+++ b/src/main/java/zw/qantra/tm/domain/workflows/handlers/PaymentHandler.java
@@ -56,6 +56,8 @@ public class PaymentHandler implements HandlerInterface {
         }catch (Exception e){
             e.printStackTrace();
             transaction.setStatus(Status.FAILED);
+            transaction.setPaymentStatus(Status.FAILED);
+            transaction.setIntegrationStatus(Status.FAILED);
             transaction.setResponseCode("01");
             transaction.setErrorMessage(e.getMessage());
             transactionService.save(transaction);