diff --git a/charts/alfresco-repository/Chart.yaml b/charts/alfresco-repository/Chart.yaml
index 57dbae89..5cae806e 100644
--- a/charts/alfresco-repository/Chart.yaml
+++ b/charts/alfresco-repository/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: alfresco-repository
 description: Alfresco content repository Helm chart
 type: application
-version: 0.1.0-alpha.15
+version: 0.1.0-alpha.16
 appVersion: 23.1.0-A21
 dependencies:
   - name: alfresco-common
diff --git a/charts/alfresco-repository/README.md b/charts/alfresco-repository/README.md
index 748b1ad6..e0539d0b 100644
--- a/charts/alfresco-repository/README.md
+++ b/charts/alfresco-repository/README.md
@@ -1,6 +1,6 @@
 # alfresco-repository
 
-![Version: 0.1.0-alpha.15](https://img.shields.io/badge/Version-0.1.0--alpha.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 23.1.0-A21](https://img.shields.io/badge/AppVersion-23.1.0--A21-informational?style=flat-square)
+![Version: 0.1.0-alpha.16](https://img.shields.io/badge/Version-0.1.0--alpha.16-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 23.1.0-A21](https://img.shields.io/badge/AppVersion-23.1.0--A21-informational?style=flat-square)
 
 Alfresco content repository Helm chart
 
diff --git a/charts/alfresco-repository/templates/configmap-repository.yaml b/charts/alfresco-repository/templates/configmap-repository.yaml
index 23650d5a..2394cca7 100644
--- a/charts/alfresco-repository/templates/configmap-repository.yaml
+++ b/charts/alfresco-repository/templates/configmap-repository.yaml
@@ -7,6 +7,9 @@ metadata:
   labels:
     {{- include "alfresco-repository.labels" . | nindent 4 }}
 data:
+  {{- range $key, $val := (omit .Values.environment "CATALINA_OPTS" "JAVA_OPTS") }}
+  {{ $key }}: {{ $val | quote }}
+  {{- end }}
   CATALINA_OPTS: >-
     {{- with .Values.configuration }}
     -Ddeployment.method=HELM_CHART
diff --git a/charts/alfresco-repository/tests/configmap_test.yaml b/charts/alfresco-repository/tests/configmap_test.yaml
index 4c6bacb2..38e8a77f 100644
--- a/charts/alfresco-repository/tests/configmap_test.yaml
+++ b/charts/alfresco-repository/tests/configmap_test.yaml
@@ -30,6 +30,7 @@ tests:
     template: configmap-repository.yaml
     set:
       environment:
+        SOMEOTHERVAR: somothervalue
         CATALINA_OPTS: >-
           -Dserver.allowWrite=false
           -Dcatalina.base="/opt/tomcat/alternate"
@@ -48,6 +49,9 @@ tests:
           path: data.JAVA_OPTS
           pattern: |-
             (^\s*|[^\s]\s+)-Xmx32G($|\s)
+      - equal:
+          path: data.SOMEOTHERVAR
+          value: somothervalue
 
   - it: should render MySQL properties
     template: configmap-database.yaml