diff --git a/build.gradle b/build.gradle
index d096dd9c..a8f540ad 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,7 +45,7 @@ repositories {
     }
 }
 
-def buildInfoVersion = '2.41.1'
+def buildInfoVersion = '2.41.4'
 dependencies {
     implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.15.2'
     implementation group: 'org.jfrog.buildinfo', name: 'build-info-extractor', version: buildInfoVersion
@@ -56,7 +56,7 @@ dependencies {
     implementation group: 'com.jfrog.xray.client', name: 'xray-client-java', version: '0.14.1'
     implementation group: 'org.apache.commons', name: 'commons-collections4', version: '4.4'
     implementation group: 'org.jfrog.filespecs', name: 'file-specs-java', version: '1.1.2'
-    implementation group: 'com.jfrog.ide', name: 'ide-plugins-common', version: '2.2.1'
+    implementation group: 'com.jfrog.ide', name: 'ide-plugins-common', version: '2.2.x-20230801.111526-1'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.11'
     implementation group: 'com.google.guava', name: 'guava', version: '32.0.1-jre'
     testImplementation group: 'org.mockito', name: 'mockito-inline', version: '4.2.0'
diff --git a/src/main/java/com/jfrog/ide/idea/ui/configuration/JFrogGlobalConfiguration.java b/src/main/java/com/jfrog/ide/idea/ui/configuration/JFrogGlobalConfiguration.java
index 73ee71cf..755a9aec 100644
--- a/src/main/java/com/jfrog/ide/idea/ui/configuration/JFrogGlobalConfiguration.java
+++ b/src/main/java/com/jfrog/ide/idea/ui/configuration/JFrogGlobalConfiguration.java
@@ -20,8 +20,6 @@
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.commons.lang3.tuple.Pair;
-import org.apache.http.conn.ssl.TrustAllStrategy;
-import org.apache.http.ssl.SSLContextBuilder;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.Nullable;
 import org.jfrog.build.extractor.clientConfiguration.ArtifactoryManagerBuilder;
@@ -38,6 +36,7 @@
 import java.util.List;
 
 import static com.jfrog.ide.common.ci.Utils.createAqlForBuildArtifacts;
+import static com.jfrog.ide.common.utils.Utils.createSSLContext;
 import static com.jfrog.ide.common.utils.XrayConnectionUtils.*;
 import static com.jfrog.ide.idea.ui.configuration.ConfigVerificationUtils.DEFAULT_EXCLUSIONS;
 import static com.jfrog.ide.idea.ui.configuration.Utils.clearText;
@@ -312,7 +311,6 @@ private void initLinks() {
         initHyperlink(watchInstructions, "Create a <hyperlink>Watch</hyperlink> on JFrog Xray and assign your Policy and Project as resources to it.", "https://www.jfrog.com/confluence/display/JFROG/Configuring+Xray+Watches");
     }
 
-    @SuppressWarnings("UnstableApiUsage")
     private void initHyperlink(HyperlinkLabel label, String text, String link) {
         label.setTextWithHyperlink("    " + text);
         label.addHyperlinkListener(l -> BrowserUtil.browse(link));
@@ -403,9 +401,7 @@ private ArtifactoryManagerBuilder createArtifactoryManagerBuilder() throws KeySt
                 .setAccessToken(serverConfig.getAccessToken())
                 .setProxyConfiguration(serverConfig.getProxyConfForTargetUrl(urlStr))
                 .setLog(Logger.getInstance())
-                .setSslContext(serverConfig.isInsecureTls() ?
-                        SSLContextBuilder.create().loadTrustMaterial(TrustAllStrategy.INSTANCE).build() :
-                        serverConfig.getSslContext());
+                .setSslContext(createSSLContext(serverConfig));
     }
 
     private void loadConfig() {
@@ -462,18 +458,19 @@ private void updateConnectionDetailsTextFields() {
 
     private void updatePolicyTextFields() {
         switch (ObjectUtils.defaultIfNull(serverConfig.getPolicyType(), ServerConfig.PolicyType.VULNERABILITIES)) {
-            case WATCHES:
+            case WATCHES -> {
                 accordingToWatchesRadioButton.setSelected(true);
                 watches.setEnabled(true);
                 watches.setText(serverConfig.getWatches());
-                return;
-            case PROJECT:
+            }
+            case PROJECT -> {
                 accordingToProjectRadioButton.setSelected(true);
                 watches.setEnabled(false);
-                return;
-            case VULNERABILITIES:
+            }
+            case VULNERABILITIES -> {
                 allVulnerabilitiesRadioButton.setSelected(true);
                 watches.setEnabled(false);
+            }
         }
     }
 }
diff --git a/src/main/java/com/jfrog/ide/idea/utils/Utils.java b/src/main/java/com/jfrog/ide/idea/utils/Utils.java
index 67a89cf1..6eaa3ef4 100644
--- a/src/main/java/com/jfrog/ide/idea/utils/Utils.java
+++ b/src/main/java/com/jfrog/ide/idea/utils/Utils.java
@@ -23,8 +23,13 @@
 import java.net.URL;
 import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
 import java.util.Collections;
 
+import static com.jfrog.ide.common.utils.Utils.createSSLContext;
+
 /**
  * Created by romang on 5/8/17.
  */
@@ -70,8 +75,9 @@ public static void sendUsageReport(String techName) {
         String pluginVersion = jfrogPlugin.getVersion();
         UsageReporter usageReporter = new ClientIdUsageReporter(PRODUCT_ID + pluginVersion, featureIdArray, log);
         try {
-            usageReporter.reportUsage(serverConfig.getArtifactoryUrl(), serverConfig.getUsername(), serverConfig.getPassword(), serverConfig.getAccessToken(), serverConfig.getProxyConfForTargetUrl(serverConfig.getArtifactoryUrl()), log);
-        } catch (IOException | RuntimeException e) {
+            usageReporter.reportUsage(serverConfig.getArtifactoryUrl(), serverConfig.getUsername(), serverConfig.getPassword(), serverConfig.getAccessToken(), serverConfig.getProxyConfForTargetUrl(serverConfig.getArtifactoryUrl()), createSSLContext(serverConfig), log);
+        } catch (IOException | RuntimeException | NoSuchAlgorithmException | KeyStoreException |
+                 KeyManagementException e) {
             log.debug("Usage report failed: " + ExceptionUtils.getRootCauseMessage(e));
         }
         log.debug("Usage report sent successfully.");