diff --git a/charts/account-service/Chart.yaml b/charts/account-service/Chart.yaml
index 0d67982822af27e0788532f4bf0f8ab41e8071c3..ae0266d540102fb87bc485b4844c8f584109eb5a 100644
--- a/charts/account-service/Chart.yaml
+++ b/charts/account-service/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.0"
 description: Deployment of the nynja account service.
 name: account-service
-version: 0.1.9
+version: 0.2.0
diff --git a/charts/account-service/templates/virtualservice.yaml b/charts/account-service/templates/virtualservice.yaml
index d3301e848515bf6ea4982394a829599327d6f38f..1eda2ba68ea19ef78b3725018b9d50d1747d30b3 100644
--- a/charts/account-service/templates/virtualservice.yaml
+++ b/charts/account-service/templates/virtualservice.yaml
@@ -39,4 +39,8 @@ spec:
       {{- range .Values.corsPolicy.allowHeaders }}
       - {{ . }}
       {{- end }}
+      exposeHeaders:
+      {{- range .Values.corsPolicy.exposeHeaders }}
+      - {{ . }}
+      {{- end }}
       maxAge: {{ .Values.corsPolicy.maxAge }}
diff --git a/charts/account-service/values.yaml b/charts/account-service/values.yaml
index 9428e11b241c85bd9f2417a6869ac99eba96dfe2..d1f4d337d3866ce1ba4bd9df9e174476979164d5 100644
--- a/charts/account-service/values.yaml
+++ b/charts/account-service/values.yaml
@@ -34,5 +34,6 @@ corsPolicy:
   allowMethods:
   allowCredentials:
   allowHeaders:
+  exposeHeaders:
   maxAge:
 
diff --git a/releases/dev/account-service.yaml b/releases/dev/account-service.yaml
index f4f5e74633233f7c0ef3b94319dd47ded87fd326..3a9eeb1b15054d7c5f6191873eef42ba009005c1 100644
--- a/releases/dev/account-service.yaml
+++ b/releases/dev/account-service.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     repository: https://nynjagroup.jfrog.io/nynjagroup/helm/
     name: account-service
-    version: 0.1.9
+    version: 0.2.0
   values:
     replicaCount: 1
 
@@ -40,6 +40,7 @@ spec:
       host: bridge-service.bridge-service.svc.cluster.local
       port: 6570
 
+    ## CORS policy needs clean up!!! This is temporary solution to allow UI team and others that depend on stable environment to work on staging. ##
     # CORS policy
     corsPolicy:
       allowOrigin:
@@ -68,4 +69,3 @@ spec:
       - grpc-status
       - status
       maxAge: "600s"
-
diff --git a/releases/prod/account-service.yaml b/releases/prod/account-service.yaml
index 866209866d1e4c07d885eca6a172e674f18693cb..b6b3325c8e69959975446bff3522700ac8d2c97c 100644
--- a/releases/prod/account-service.yaml
+++ b/releases/prod/account-service.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     repository: https://nynjagroup.jfrog.io/nynjagroup/helm/
     name: account-service
-    version: 0.1.7
+    version: 0.2.0
   values:
     replicaCount: 2
 
@@ -36,25 +36,16 @@ spec:
         grpc: 6565
 
     bridge:
-      enabled: false
+      enabled: true
       host: bridge-service.bridge-service.svc.cluster.local
       port: 6570
 
-    ## CORS policy needs clean up!!! This is temporary solution to allow UI team and others that depend on stable environment to work on staging. ##
     # CORS policy
     corsPolicy:
       allowOrigin:
-      - http://localhost:3000
-      - https://localhost
-      - https://localhost/grpc/
-      - http://10.191.224.180:3000
-      - https://localhost:8080
-      - https://127.0.0.1:8080
-      - https://web.dev-eu.nynja.net
+      - https://web.dev.nynja.net
       - https://web.staging.nynja.net
       - https://web.nynja.net
-      - http://10.191.38.1
-      - https://admin-console.dev-eu.nynja.net
       allowMethods:
       - POST
       - GET
diff --git a/releases/staging/account-service.yaml b/releases/staging/account-service.yaml
index c4341b66ac6d85faeb6a26ac44f8216369ff5318..d07d438e9e4052e4da0ba8939705d2faa53fb45c 100644
--- a/releases/staging/account-service.yaml
+++ b/releases/staging/account-service.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     repository: https://nynjagroup.jfrog.io/nynjagroup/helm/
     name: account-service
-    version: 0.1.9
+    version: 0.2.0
   values:
     replicaCount: 2
 
diff --git a/src/main/java/biz/nynja/account/healthindicators/GrpcServerHealthIndicator.java b/src/main/java/biz/nynja/account/healthindicators/GrpcServerHealthIndicator.java
index a7c9dcf94f77305ec57615c9e098a8eda74ac8a3..d8a157a27797354212e6780eaa8ba42e0815b3a7 100644
--- a/src/main/java/biz/nynja/account/healthindicators/GrpcServerHealthIndicator.java
+++ b/src/main/java/biz/nynja/account/healthindicators/GrpcServerHealthIndicator.java
@@ -47,6 +47,10 @@ public class GrpcServerHealthIndicator implements HealthIndicator {
                     AccountServiceGrpc.getServiceDescriptor().getName(), e.getMessage());
             LOGGER.debug(null, e.getCause());
             return Health.down().build();
+        } finally {
+            if (channel != null) {
+                channel.shutdown();
+            }
         }
 
         switch (servingStatus) {