diff --git a/charts/alfresco-connector-ms365/Chart.yaml b/charts/alfresco-connector-ms365/Chart.yaml
index 250dc44d..0c9e40d9 100644
--- a/charts/alfresco-connector-ms365/Chart.yaml
+++ b/charts/alfresco-connector-ms365/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: alfresco-connector-ms365
 description: A Helm chart for deploying Alfresco connector ms365 service
 type: application
-version: 0.3.1
+version: 0.3.2
 appVersion: "2.0.0"
 dependencies:
   - name: alfresco-common
diff --git a/charts/alfresco-connector-ms365/README.md b/charts/alfresco-connector-ms365/README.md
index 1d58bde9..09b601a8 100644
--- a/charts/alfresco-connector-ms365/README.md
+++ b/charts/alfresco-connector-ms365/README.md
@@ -1,6 +1,6 @@
 # alfresco-connector-ms365
 
-![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
+![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco connector ms365 service
 
diff --git a/charts/alfresco-connector-ms365/ci/default-values.yaml b/charts/alfresco-connector-ms365/ci/default-values.yaml
index e70889f4..ce405a64 100644
--- a/charts/alfresco-connector-ms365/ci/default-values.yaml
+++ b/charts/alfresco-connector-ms365/ci/default-values.yaml
@@ -6,3 +6,6 @@ resources:
   limits:
     cpu: "1"
     memory: "500Mi"
+repository:
+  host: acs-alfresco-cs-repository
+  port: 80
diff --git a/charts/alfresco-connector-ms365/templates/deployment-connector-ms365.yaml b/charts/alfresco-connector-ms365/templates/deployment-connector-ms365.yaml
index 8b884e4f..56b247ae 100644
--- a/charts/alfresco-connector-ms365/templates/deployment-connector-ms365.yaml
+++ b/charts/alfresco-connector-ms365/templates/deployment-connector-ms365.yaml
@@ -67,7 +67,7 @@ spec:
           env:
             {{- range $key, $value := (omit .Values.environment "JAVA_OPTS") }}
             - name: {{ $key }}
-              value: {{ $value }}
+              value: {{ $value | quote }}
             {{- end }}
             - name: JAVA_OPTS
               value: >-
diff --git a/charts/alfresco-connector-ms365/tests/deployment-connector-ms365_test.yaml b/charts/alfresco-connector-ms365/tests/deployment-connector-ms365_test.yaml
index 122e6548..6d81d96a 100644
--- a/charts/alfresco-connector-ms365/tests/deployment-connector-ms365_test.yaml
+++ b/charts/alfresco-connector-ms365/tests/deployment-connector-ms365_test.yaml
@@ -37,3 +37,15 @@ tests:
           path: spec.template.spec.containers[0].env[2].valueFrom.configMapKeyRef.name
           value: myns/mycm
         template: deployment-connector-ms365.yaml
+
+  - it: should set environment variables correctly with quotes
+    set:
+      environment:
+        test_data: 80
+    asserts:
+        - equal:
+            path: spec.template.spec.containers[0].env[0]
+            value:
+                name: test_data
+                value: "80"
+          template: deployment-connector-ms365.yaml