diff --git a/charts/clearml/templates/apiserver-deployment.yaml b/charts/clearml/templates/apiserver-deployment.yaml
index 7907bcd..b68fd11 100644
--- a/charts/clearml/templates/apiserver-deployment.yaml
+++ b/charts/clearml/templates/apiserver-deployment.yaml
@@ -35,7 +35,11 @@ spec:
       {{- end }}
       initContainers:
         - name: init-apiserver
-          image: "{{ .Values.apiserver.image.repository }}:{{ .Values.apiserver.image.tag | default .Chart.AppVersion }}"
+          {{- if .Values.enterpriseFeatures.enabled }}
+          image: "{{ .Values.apiserver.image.repository }}:{{ .Values.enterpriseFeatures.apiserverImageTagOverride }}"
+          {{- else }}
+          image: "{{ .Values.apiserver.image.repository }}:{{ .Values.apiserver.image.tag }}"
+          {{- end }}
           command:
             - /bin/sh
             - -c
@@ -47,7 +51,11 @@ spec:
               done
       containers:
         - name: clearml-apiserver
-          image: "{{ .Values.apiserver.image.repository }}:{{ .Values.apiserver.image.tag | default .Chart.AppVersion }}"
+          {{- if .Values.enterpriseFeatures.enabled }}
+          image: "{{ .Values.apiserver.image.repository }}:{{ .Values.enterpriseFeatures.apiserverImageTagOverride }}"
+          {{- else }}
+          image: "{{ .Values.apiserver.image.repository }}:{{ .Values.apiserver.image.tag }}"
+          {{- end }}
           imagePullPolicy: {{ .Values.apiserver.image.pullPolicy }}
           ports:
             - name: http
diff --git a/charts/clearml/templates/fileserver-deployment.yaml b/charts/clearml/templates/fileserver-deployment.yaml
index 3c4f50d..9e7993e 100644
--- a/charts/clearml/templates/fileserver-deployment.yaml
+++ b/charts/clearml/templates/fileserver-deployment.yaml
@@ -33,7 +33,11 @@ spec:
             claimName: {{ include "fileserver.referenceName" . }}-data
       initContainers:
           - name: init-fileserver
-            image: "{{ .Values.fileserver.image.repository }}:{{ .Values.fileserver.image.tag | default .Chart.AppVersion }}"
+            {{- if .Values.enterpriseFeatures.enabled }}
+            image: "{{ .Values.fileserver.image.repository }}:{{ .Values.enterpriseFeatures.fileserverImageTagOverride }}"
+            {{- else }}
+            image: "{{ .Values.fileserver.image.repository }}:{{ .Values.fileserver.image.tag }}"
+            {{- end }}
             command:
               - /bin/sh
               - -c
@@ -45,7 +49,11 @@ spec:
                 done
       containers:
         - name: clearml-fileserver
-          image: "{{ .Values.fileserver.image.repository }}:{{ .Values.fileserver.image.tag | default .Chart.AppVersion }}"
+          {{- if .Values.enterpriseFeatures.enabled }}
+          image: "{{ .Values.fileserver.image.repository }}:{{ .Values.enterpriseFeatures.fileserverImageTagOverride }}"
+          {{- else }}
+          image: "{{ .Values.fileserver.image.repository }}:{{ .Values.fileserver.image.tag }}"
+          {{- end }}
           imagePullPolicy: {{ .Values.fileserver.image.pullPolicy }}
           ports:
             - name: http
diff --git a/charts/clearml/templates/webserver-deployment.yaml b/charts/clearml/templates/webserver-deployment.yaml
index 0abb1e4..72fa6ee 100644
--- a/charts/clearml/templates/webserver-deployment.yaml
+++ b/charts/clearml/templates/webserver-deployment.yaml
@@ -52,7 +52,11 @@ spec:
             {{- end }}
         {{- end }}
         - name: init-webserver
-          image: "{{ .Values.webserver.image.repository }}:{{ .Values.webserver.image.tag | default .Chart.AppVersion }}"
+          {{- if .Values.enterpriseFeatures.enabled }}
+          image: "{{ .Values.webserver.image.repository }}:{{ .Values.enterpriseFeatures.webserverImageTagOverride }}"
+          {{- else }}
+          image: "{{ .Values.webserver.image.repository }}:{{ .Values.webserver.image.tag }}"
+          {{- end }}
           command:
             - /bin/sh
             - -c
@@ -64,7 +68,11 @@ spec:
               done
       containers:
         - name: clearml-webserver
-          image: "{{ .Values.webserver.image.repository }}:{{ .Values.webserver.image.tag | default .Chart.AppVersion }}"
+          {{- if .Values.enterpriseFeatures.enabled }}
+          image: "{{ .Values.webserver.image.repository }}:{{ .Values.enterpriseFeatures.webserverImageTagOverride }}"
+          {{- else }}
+          image: "{{ .Values.webserver.image.repository }}:{{ .Values.webserver.image.tag }}"
+          {{- end }}
           imagePullPolicy: {{ .Values.webserver.image.pullPolicy }}
           ports:
             - name: http
diff --git a/charts/clearml/values.yaml b/charts/clearml/values.yaml
index 0cc6fbf..e8910e1 100644
--- a/charts/clearml/values.yaml
+++ b/charts/clearml/values.yaml
@@ -357,6 +357,12 @@ enterpriseFeatures:
   enabled: false
   # -- Company ID
   defaultCompanyGuid: "d1bd92a3b039400cbafc60a7a5b1e52b"
+  # -- Image tag override for apiserver enterprise version
+  apiserverImageTagOverride: "3.15.2-902"
+  # -- Image tag override for fileserver enterprise version
+  fileserverImageTagOverride: "3.15.2-902"
+  # -- Image tag override for webserver enterprise version
+  webserverImageTagOverride: "3.15.2-787"
   # -- Air gapped documentation  configurations
   airGappedDocumentation:
     # -- Enable/Disable air gapped documentation deployment
@@ -364,7 +370,7 @@ enterpriseFeatures:
     # -- Air gapped documentation image configuration
     image:
       repository: ""
-      tag: ""
+      tag: "4"
   # -- set this value AND overrideReferenceFileUrl if external endpoint exposure is in place (like a LoadBalancer)
   # example: "https://api.clearml.local"
   overrideReferenceApiUrl: ""
@@ -389,11 +395,11 @@ enterpriseFeatures:
     image:
       repository: ""
       pullPolicy: IfNotPresent
-      tag: ""
+      tag: "1.24-57"
     # -- APPS base spawning pods image
     basePodImage:
       repository: ""
-      tag: ""
+      tag: "app-1.1.1-47"
     # -- APPS number of pods
     replicaCount: 1
     # -- APPS extra envrinoment variables