diff --git a/charts/confluence-server/Chart.yaml b/charts/confluence-server/Chart.yaml
index 3c012adb..9de7c460 100644
--- a/charts/confluence-server/Chart.yaml
+++ b/charts/confluence-server/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: confluence-server
-version: 2.2.1
+version: 2.2.2
 appVersion: 7.5.0
 description: Atlassian Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence - where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
 keywords:
diff --git a/charts/confluence-server/README.md b/charts/confluence-server/README.md
index eb5930b6..15ad310a 100644
--- a/charts/confluence-server/README.md
+++ b/charts/confluence-server/README.md
@@ -63,6 +63,7 @@ The following table lists the configurable parameters of the _Confluence Server_
 | `envVars.jvmMaxMemory`       | JVM maximum memory                                                                                 | `768M`                                                  |
 | `envVars.jvmMemoryOptions`   | JVM memory options                                                                                 | `-XX:MaxMetaspaceSize=512m -XX:MaxDirectMemorySize=10m` |
 | `envVars.synchronyMaxMemory` | Synchrony maximum memory                                                                           | `0m`                                                    |
+| `envVars.opts`               | Additional options, this can be used to set _CATALINA_OPTS_                                        | `""`                                                    |
 | `env`                        | List of environmental variable to apply to the deployment                                          | `nil`                                                   |
 | `persistence.enabled`        | Create a volume (PVC) for storage                                                                  | `false`                                                 |
 | `persistence.existingClaim`  | An existing PVC to use instead of creating a new one                                               | `nil`                                                   |
diff --git a/charts/confluence-server/templates/deployment.yaml b/charts/confluence-server/templates/deployment.yaml
index 4dd1d6f1..e4757dbf 100644
--- a/charts/confluence-server/templates/deployment.yaml
+++ b/charts/confluence-server/templates/deployment.yaml
@@ -79,9 +79,9 @@ spec:
               value: {{ .Values.envVars.jvmMaxMemory | quote }}
             - name: JVM_SUPPORT_RECOMMENDED_ARGS
             {{- if .Values.caCerts }}
-              value: {{ printf "-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts %s -Dsynchrony.memory.max=%s" .Values.envVars.jvmMemoryOptions .Values.envVars.synchronyMaxMemory | quote }}
+              value: {{ printf "-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts %s -Dsynchrony.memory.max=%s %s" .Values.envVars.jvmMemoryOptions .Values.envVars.synchronyMaxMemory .Values.envVars.opts | trim | quote }}
             {{- else }}
-              value: {{ printf "%s -Dsynchrony.memory.max=%s" .Values.envVars.jvmMemoryOptions .Values.envVars.synchronyMaxMemory | quote }}
+              value: {{ printf "%s -Dsynchrony.memory.max=%s %s" .Values.envVars.jvmMemoryOptions .Values.envVars.synchronyMaxMemory .Values.envVars.opts | trim | quote }}
             {{- end }}
             {{- if .Values.ingress.enabled }}
             - name: ATL_PROXY_NAME
diff --git a/charts/confluence-server/values.yaml b/charts/confluence-server/values.yaml
index 8a0afe06..4a04569d 100644
--- a/charts/confluence-server/values.yaml
+++ b/charts/confluence-server/values.yaml
@@ -32,6 +32,7 @@ envVars:
   jvmMaxMemory: 768M
   jvmMemoryOptions: "-XX:MaxMetaspaceSize=512m -XX:MaxDirectMemorySize=10m"
   synchronyMaxMemory: "0m"
+  opts: ""
 
 # env:
 #   - name: VARIABLE
diff --git a/charts/jira-software/Chart.yaml b/charts/jira-software/Chart.yaml
index 45ce3032..e209896f 100644
--- a/charts/jira-software/Chart.yaml
+++ b/charts/jira-software/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: jira-software
-version: 2.1.0
+version: 2.1.1
 appVersion: 8.9.0
 description: Atlassian Jira Software is built for every member of your software team to plan, track, and release great software.
 keywords:
diff --git a/charts/jira-software/README.md b/charts/jira-software/README.md
index ac866379..dac50f34 100644
--- a/charts/jira-software/README.md
+++ b/charts/jira-software/README.md
@@ -61,6 +61,7 @@ The following table lists the configurable parameters of the _Jira Software_ cha
 | `envVars.jvmMinMemory`      | JVM minimum memory                                                                             | `384M`                                                  |
 | `envVars.jvmMaxMemory`      | JVM maximum memory                                                                             | `768M`                                                  |
 | `envVars.jvmMemoryOptions`  | JVM memory options                                                                             | `-XX:MaxMetaspaceSize=512m -XX:MaxDirectMemorySize=10m` |
+| `envVars.opts`              | Additional options                                                                             | `""`                                                    |
 | `env`                       | List of environmental variable to apply to the deployment                                      | `nil`                                                   |
 | `persistence.enabled`       | Create a volume (PVC) for storage                                                              | `false`                                                 |
 | `persistence.existingClaim` | An existing PVC to use instead of creating a new one                                           | `nil`                                                   |
diff --git a/charts/jira-software/templates/deployment.yaml b/charts/jira-software/templates/deployment.yaml
index 87bf8718..7bab4ccd 100644
--- a/charts/jira-software/templates/deployment.yaml
+++ b/charts/jira-software/templates/deployment.yaml
@@ -76,9 +76,9 @@ spec:
               value: {{ .Values.envVars.jvmMaxMemory | quote }}
             - name: JVM_SUPPORT_RECOMMENDED_ARGS
             {{- if .Values.caCerts }}
-              value: {{ printf "-Djavax.net.ssl.trustStore=/var/atlassian/application-data/jira/cacerts %s" .Values.envVars.jvmMemoryOptions | quote }}
+              value: {{ printf "-Djavax.net.ssl.trustStore=/var/atlassian/application-data/jira/cacerts %s %s" .Values.envVars.jvmMemoryOptions .Values.envVars.opts | trim | quote }}
             {{- else }}
-              value: {{ .Values.envVars.jvmMemoryOptions | quote }}
+              value: {{ printf "%s %s" .Values.envVars.jvmMemoryOptions .Values.envVars.opts | trim | quote }}
             {{- end }}
             {{- if .Values.ingress.enabled }}
             - name: ATL_PROXY_NAME
diff --git a/charts/jira-software/values.yaml b/charts/jira-software/values.yaml
index 03a95c91..0cc01d3c 100644
--- a/charts/jira-software/values.yaml
+++ b/charts/jira-software/values.yaml
@@ -28,6 +28,7 @@ envVars:
   jvmMinMemory: 384M
   jvmMaxMemory: 768M
   jvmMemoryOptions: "-XX:MaxMetaspaceSize=512m -XX:MaxDirectMemorySize=10m"
+  opts: ""
 
 # env:
 #   - name: VARIABLE