diff --git a/aether-roc-gui/Chart.yaml b/aether-roc-gui/Chart.yaml
index 579be06..ce18749 100644
--- a/aether-roc-gui/Chart.yaml
+++ b/aether-roc-gui/Chart.yaml
@@ -7,7 +7,7 @@
 description: Aether ROC Graphical User Interface
 kubeVersion: ">=1.15.0"
 type: application
-version: 2.1.16
+version: 2.1.17
 appVersion: v0.9.25
 keywords:
   - aether
diff --git a/aether-roc-gui/templates/deployment.yaml b/aether-roc-gui/templates/deployment.yaml
index 1eaa906..d4ccab9 100644
--- a/aether-roc-gui/templates/deployment.yaml
+++ b/aether-roc-gui/templates/deployment.yaml
@@ -37,7 +37,7 @@
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             - name: NAMESPACE
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index e1de47b..ee0f8b1 100644
--- a/aether-roc-umbrella/Chart.yaml
+++ b/aether-roc-umbrella/Chart.yaml
@@ -8,7 +8,7 @@
 description: Aether ROC Umbrella chart to deploy all Aether ROC
 kubeVersion: ">=1.18.0"
 type: application
-version: 2.1.30
+version: 2.1.31
 appVersion: v0.0.0
 keywords:
   - aether
@@ -41,7 +41,7 @@
   - name: aether-roc-gui
     condition: import.aether-roc-gui.v2-1.enabled
     repository: "file://../aether-roc-gui"
-    version: 2.1.16
+    version: 2.1.17
     alias: aether-roc-gui-v2-1
   - name: sdcore-adapter-v2
     condition: import.sdcore-adapter.v2-0.enabled
diff --git a/fabric-umbrella/Chart.yaml b/fabric-umbrella/Chart.yaml
index e655505..323a667 100644
--- a/fabric-umbrella/Chart.yaml
+++ b/fabric-umbrella/Chart.yaml
@@ -7,7 +7,7 @@
 description: Fabric ROC Umbrella chart to deploy all Fabric ROC
 kubeVersion: ">=1.18.0"
 type: application
-version: 0.1.15
+version: 0.1.16
 appVersion: v0.0.0
 keywords:
   - aether
@@ -37,7 +37,7 @@
   - name: aether-roc-gui
     condition: import.fabric-roc-gui.v0-1.enabled
     repository: "file://../aether-roc-gui"
-    version: 2.1.16
+    version: 2.1.17
     alias: fabric-roc-gui
   - name: fabric-adapter
     condition: import.fabric-adapter.v0-1.enabled