From 65f523e0ef8fdd8ba2c76365ce51091f70ce36ac Mon Sep 17 00:00:00 2001
From: Sychevskyi Henadii <sych74@gmail.com>
Date: Tue, 25 Mar 2025 08:46:09 +0100
Subject: [PATCH 1/2] JE-71239

---
 scripts/ssl-manager.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/scripts/ssl-manager.js b/scripts/ssl-manager.js
index d4c972be..df54df11 100644
--- a/scripts/ssl-manager.js
+++ b/scripts/ssl-manager.js
@@ -1613,7 +1613,8 @@ function SSLManager(config) {
 
     me.removeSSLCert = function removeSSLCert() {
         var resp,
-            sslCerts;
+            sslCerts,
+            certToRemove;
 
         resp = jelastic.env.binder.GetSSLCerts(config.envName, session);
         if (resp.result != 0) return resp;
@@ -1621,8 +1622,19 @@ function SSLManager(config) {
         sslCerts = resp.responses;
 
         if (sslCerts.length > 0) {
-            resp = jelastic.env.binder.RemoveSSLCerts(config.envName, session, sslCerts[sslCerts.length - 1].id);
-            if (resp.result != 0) return resp;
+            // Find the LE certificate by checking domains
+            for (var i = 0; i < sslCerts.length; i++) {
+                var cert = sslCerts[i];
+                if (cert.domains && cert.domains.indexOf(config.envDomain) !== -1) {
+                    certToRemove = cert;
+                    break;
+                }
+            }
+
+            if (certToRemove) {
+                resp = jelastic.env.binder.RemoveSSLCerts(config.envName, session, certToRemove.id);
+                if (resp.result != 0) return resp;
+            }
         }
         
         if (config.withIntSSL && nodeManager.checkCustomSSL()) {

From 43916b31b446b37694196b8836db7dd063787fe4 Mon Sep 17 00:00:00 2001
From: Sychevskyi Henadii <henadii.sychevskyi@virtuozzo.com>
Date: Tue, 7 Apr 2026 14:01:27 +0200
Subject: [PATCH 2/2] JE-75835

---
 manifest.jps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.jps b/manifest.jps
index f72f70b7..2768bf6d 100644
--- a/manifest.jps
+++ b/manifest.jps
@@ -47,7 +47,7 @@ globals:
 
 mixins:
   - configs/vers.yaml
-  - https://cdn.jsdelivr.net/gh/jelastic-jps/common@main/clustered-addon-utils.yml
+  - https://raw.githubusercontent.com/sych74/common/refs/heads/main/clustered-addon-utils.yml
 
 settings:
   fields: