diff --git a/mbadmin.jps b/mbadmin.jps
index 9c8de72..c1df73c 100644
--- a/mbadmin.jps
+++ b/mbadmin.jps
@@ -587,24 +587,16 @@ actions:
     - cmd[cp]:
         user: root
         commands:
-          - |
-            OUTPUT=$(bash /home/litespeed/mbmanager/ssl-manager/ssl_manager.sh --domain="${settings.domain}" --remove-cert=yes --confirm=yes 2>&1)
-            echo "$OUTPUT"
-            # Check if certificate was actually removed regardless of script exit code
-            if echo "$OUTPUT" | grep -q "Certificate for.*successfully revoked and removed"; then
-              exit 0
-            else
-              exit 1
-            fi
+          - bash /home/litespeed/mbmanager/ssl-manager/ssl_manager.sh --domain="${settings.domain}" --remove-cert=yes --confirm=yes || true
   
-    - if: ${response.exitcode} == 0
-      return:
-        type: success
-        message: "SSL certificate for '${settings.domain}' has been successfully removed."
-    - else:
-      return:
-        type: error
-        message: "Failed to remove SSL certificate: ${response.out}"
+  - if: ${response.out} =~ "successfully revoked and removed"
+    return:
+      type: success
+      message: "SSL certificate for '${settings.domain}' has been successfully removed."
+  - else:
+    return:
+      type: error
+      message: "Failed to remove SSL certificate: ${response.out}"
 
 responses:
   enableSuccess: