diff --git a/app/server/appsmith-interfaces/pom.xml b/app/server/appsmith-interfaces/pom.xml
index c596831b7f..4f664bdaac 100644
--- a/app/server/appsmith-interfaces/pom.xml
+++ b/app/server/appsmith-interfaces/pom.xml
@@ -195,11 +195,20 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver3</artifactId>
-            <version>5.0.0-alpha.10</version>
+            <version>${mockwebserver.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.squareup.okhttp3</groupId>
+                    <artifactId>okhttp</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>${okhttp3.version}</version>
         </dependency>
-
-
         <dependency>
             <groupId>com.squareup.okio</groupId>
             <artifactId>okio</artifactId>
diff --git a/app/server/appsmith-plugins/pom.xml b/app/server/appsmith-plugins/pom.xml
index 272e9fab78..15680f1460 100644
--- a/app/server/appsmith-plugins/pom.xml
+++ b/app/server/appsmith-plugins/pom.xml
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver3</artifactId>
-            <version>5.0.0-alpha.10</version>
+            <version>${mockwebserver.version}</version>
             <scope>test</scope>
         </dependency>
         <!-- We need this dependency only to ensure TestContainers work with JUnit5 -->
diff --git a/app/server/appsmith-server/pom.xml b/app/server/appsmith-server/pom.xml
index 435ccda222..def110fbdf 100644
--- a/app/server/appsmith-server/pom.xml
+++ b/app/server/appsmith-server/pom.xml
@@ -276,8 +276,21 @@
         <dependency>
             <groupId>com.segment.analytics.java</groupId>
             <artifactId>analytics</artifactId>
-            <version>2.1.1</version>
+            <version>3.3.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.squareup.okhttp3</groupId>
+                    <artifactId>okhttp</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/com.squareup.okio/okio-jvm -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.sentry</groupId>
             <artifactId>sentry-spring-boot-starter</artifactId>
@@ -341,8 +354,14 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver3</artifactId>
-            <version>5.0.0-alpha.10</version>
+            <version>${mockwebserver.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.squareup.okhttp3</groupId>
+                    <artifactId>okhttp</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
diff --git a/app/server/pom.xml b/app/server/pom.xml
index 1fc95b480e..41f1134f3d 100644
--- a/app/server/pom.xml
+++ b/app/server/pom.xml
@@ -28,6 +28,8 @@
         <h2.version>2.1.210</h2.version>
         <testcontainers.version>1.17.3</testcontainers.version>
         <mockito.version>4.4.0</mockito.version>
+        <mockwebserver.version>5.0.0-alpha.2</mockwebserver.version>
+        <okhttp3.version>4.10.0</okhttp3.version>
     </properties>
 
     <build>