diff --git a/accountant/accountant-app/pom.xml b/accountant/accountant-app/pom.xml
index 67649ff75..f56aee06a 100644
--- a/accountant/accountant-app/pom.xml
+++ b/accountant/accountant-app/pom.xml
@@ -51,6 +51,10 @@
             <groupId>co.nilin.opex.utility</groupId>
             <artifactId>error-handler</artifactId>
         </dependency>
+        <dependency>
+            <groupId>co.nilin.opex.utility</groupId>
+            <artifactId>interceptors</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-vault-config</artifactId>
diff --git a/accountant/pom.xml b/accountant/pom.xml
index 6eded39f6..edce57a88 100644
--- a/accountant/pom.xml
+++ b/accountant/pom.xml
@@ -82,6 +82,11 @@
                 <artifactId>error-handler</artifactId>
                 <version>${error-hanlder.version}</version>
             </dependency>
+            <dependency>
+                <groupId>co.nilin.opex.utility</groupId>
+                <artifactId>interceptors</artifactId>
+                <version>${interceptor.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
diff --git a/auth-gateway/auth-gateway-app/pom.xml b/auth-gateway/auth-gateway-app/pom.xml
index 0d31ffddd..0ff3a5ade 100644
--- a/auth-gateway/auth-gateway-app/pom.xml
+++ b/auth-gateway/auth-gateway-app/pom.xml
@@ -80,6 +80,10 @@
             <groupId>co.nilin.opex.utility</groupId>
             <artifactId>error-handler</artifactId>
         </dependency>
+        <dependency>
+            <groupId>co.nilin.opex.utility</groupId>
+            <artifactId>interceptors</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
diff --git a/bc-gateway/bc-gateway-app/pom.xml b/bc-gateway/bc-gateway-app/pom.xml
index 2bdccb667..0046a178b 100644
--- a/bc-gateway/bc-gateway-app/pom.xml
+++ b/bc-gateway/bc-gateway-app/pom.xml
@@ -138,6 +138,14 @@
             <artifactId>micrometer-registry-prometheus</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>co.nilin.opex.utility</groupId>
+            <artifactId>interceptors</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>co.nilin.opex.utility</groupId>
+            <artifactId>error-handler</artifactId>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>
diff --git a/device-management/device-management-app/pom.xml b/device-management/device-management-app/pom.xml
index 82e41ff4e..ff9b70048 100644
--- a/device-management/device-management-app/pom.xml
+++ b/device-management/device-management-app/pom.xml
@@ -78,6 +78,10 @@
             <groupId>co.nilin.opex.utility</groupId>
             <artifactId>error-handler</artifactId>
         </dependency>
+        <dependency>
+            <groupId>co.nilin.opex.utility</groupId>
+            <artifactId>interceptors</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
diff --git a/device-management/pom.xml b/device-management/pom.xml
index d24596637..4800bfa7c 100644
--- a/device-management/pom.xml
+++ b/device-management/pom.xml
@@ -56,6 +56,11 @@
                 <artifactId>error-handler</artifactId>
                 <version>${error-hanlder.version}</version>
             </dependency>
+            <dependency>
+                <groupId>co.nilin.opex.utility</groupId>
+                <artifactId>interceptors</artifactId>
+                <version>${interceptor.version}</version>
+            </dependency>
             <dependency>
                 <groupId>co.nilin.opex.device-management</groupId>
                 <artifactId>device-management-core</artifactId>
diff --git a/docker-compose.yml b/docker-compose.yml
index 63535e6e2..b9078536e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -546,8 +546,8 @@ services:
       - SMTP_USER=${SMTP_USER}
       - SMTP_PASS=${SMTP_PASS}
       - SMTP_FROM=${SMTP_FROM}
-      - SMTP_SOCKS_HOST=${SMTP_SOCKS_HOST}
-      - SMTP_SOCKS_PORT=${SMTP_SOCKS_PORT}
+      - SMTP_PROXY_HOST=${SMTP_PROXY_HOST}
+      - SMTP_PROXY_PORT=${SMTP_PROXY_PORT}
       - SMTP_PROXY_ENABLED=${SMTP_PROXY_ENABLED}
       - TOKEN_ISSUER_URL=${KC_ISSUER_URL}
       - OTP_CODE_RESPONSE_ENABLED=${OTP_CODE_RESPONSE_ENABLED}
diff --git a/matching-gateway/matching-gateway-app/pom.xml b/matching-gateway/matching-gateway-app/pom.xml
index 24e94ab58..86d029320 100644
--- a/matching-gateway/matching-gateway-app/pom.xml
+++ b/matching-gateway/matching-gateway-app/pom.xml
@@ -77,6 +77,10 @@
             <groupId>co.nilin.opex.utility</groupId>
             <artifactId>error-handler</artifactId>
         </dependency>
+        <dependency>
+            <groupId>co.nilin.opex.utility</groupId>
+            <artifactId>interceptors</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.mockk</groupId>
             <artifactId>mockk</artifactId>
diff --git a/otp/otp-app/pom.xml b/otp/otp-app/pom.xml
index 1d3d72124..49cb4f0c0 100644
--- a/otp/otp-app/pom.xml
+++ b/otp/otp-app/pom.xml
@@ -87,6 +87,10 @@
             <groupId>co.nilin.opex.utility</groupId>
             <artifactId>error-handler</artifactId>
         </dependency>
+        <dependency>
+            <groupId>co.nilin.opex.utility</groupId>
+            <artifactId>interceptors</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.mockk</groupId>
             <artifactId>mockk</artifactId>
diff --git a/profile/pom.xml b/profile/pom.xml
index 7ac615097..ffd3ab564 100644
--- a/profile/pom.xml
+++ b/profile/pom.xml
@@ -66,6 +66,11 @@
                 <artifactId>logging-handler</artifactId>
                 <version>${logging-handler.version}</version>
             </dependency>
+            <dependency>
+                <groupId>co.nilin.opex.utility</groupId>
+                <artifactId>error-handler</artifactId>
+                <version>${error-hanlder.version}</version>
+            </dependency>
             <dependency>
                 <groupId>co.nilin.opex.utility</groupId>
                 <artifactId>interceptors</artifactId>
diff --git a/profile/profile-app/pom.xml b/profile/profile-app/pom.xml
index 685459a22..2b2412044 100644
--- a/profile/profile-app/pom.xml
+++ b/profile/profile-app/pom.xml
@@ -98,6 +98,10 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-vault-config</artifactId>
         </dependency>
+        <dependency>
+            <groupId>co.nilin.opex.utility</groupId>
+            <artifactId>error-handler</artifactId>
+        </dependency>
         <dependency>
             <groupId>co.nilin.opex.utility</groupId>
             <artifactId>interceptors</artifactId>
diff --git a/user-management/pom.xml b/user-management/pom.xml
index 0c0b0c5a4..fbb1146c0 100644
--- a/user-management/pom.xml
+++ b/user-management/pom.xml
@@ -49,6 +49,11 @@
                 <artifactId>error-handler</artifactId>
                 <version>${error-hanlder.version}</version>
             </dependency>
+            <dependency>
+                <groupId>co.nilin.opex.utility</groupId>
+                <artifactId>interceptors</artifactId>
+                <version>${interceptor.version}</version>
+            </dependency>
             <dependency>
                 <groupId>co.nilin.opex.auth</groupId>
                 <artifactId>user-management-core</artifactId>