diff --git a/helm/chart/Chart.yaml b/helm/chart/Chart.yaml
index 3d9cf4f..2644d97 100644
--- a/helm/chart/Chart.yaml
+++ b/helm/chart/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: flink-kube-operator
 description: Helm chart for flink kube operator
 type: application
-version: 1.2.2
+version: 1.2.3
 appVersion: "0.1.1"
diff --git a/helm/chart/templates/flink/config.yaml b/helm/chart/templates/flink/config.yaml
index df1e8d6..ca72088 100644
--- a/helm/chart/templates/flink/config.yaml
+++ b/helm/chart/templates/flink/config.yaml
@@ -28,14 +28,16 @@
     state.backend.rocksdb.localdir: /opt/flink/rocksdb
     high-availability.storageDir: /opt/flink/ha
     {{- if eq .Values.flink.state.savepoint.storageType "filesystem" }}
-    state.savepoints.dir: file:///opt/flink/checkpoints/
+    state.savepoints.dir: file:///opt/flink/savepoints/
     {{- else if eq .Values.flink.state.savepoint.storageType "s3" }}
     state.savepoints.dir: s3://flink/savepoints/
     {{- end }}
     state.backend.incremental: {{ .Values.flink.state.incremental }}
     rest.profiling.enabled: true
+    {{- if or (eq .Values.flink.state.checkpoint.storageType "s3") (eq .Values.flink.state.savepoint.storageType "s3") }}
     s3.endpoint: http://{{ .Release.Name }}-minio:9000
     s3.path.style.access: true
+    {{- end }}
     {{- toYaml .Values.flink.properties | default "" | nindent 4 }}
     
 {{- end }}
diff --git a/helm/chart/templates/flink/job-manager-deploy.yaml b/helm/chart/templates/flink/job-manager-deploy.yaml
index f8d1bf0..5fcb51d 100644
--- a/helm/chart/templates/flink/job-manager-deploy.yaml
+++ b/helm/chart/templates/flink/job-manager-deploy.yaml
@@ -49,6 +49,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: status.podIP
+            {{- if or (eq .Values.flink.state.checkpoint.storageType "s3") (eq .Values.flink.state.savepoint.storageType "s3") }}
             - name: S3_ENDPOINT
               value: "http://minio-service:9000"
             - name: AWS_ACCESS_KEY_ID
@@ -61,6 +62,7 @@ spec:
                 secretKeyRef:
                   name: {{ .Release.Name }}-flink-secrets
                   key: minio_secret_key
+            {{- end }}
           volumeMounts:
             - name: flink-ha
               mountPath: {{ .Values.flink.state.ha.dir }}
@@ -70,7 +72,7 @@ spec:
             {{- end }}
             {{- if eq .Values.flink.state.savepoint.storageType "filesystem" }}
             - name: flink-savepoint
-              mountPath: /opt/flink/savepoint
+              mountPath: /opt/flink/savepoints
             {{- end }}
       volumes:
         - name: flink-ha
diff --git a/helm/chart/templates/flink/task-manager-statefulset.yaml b/helm/chart/templates/flink/task-manager-statefulset.yaml
index e404c27..cad2862 100644
--- a/helm/chart/templates/flink/task-manager-statefulset.yaml
+++ b/helm/chart/templates/flink/task-manager-statefulset.yaml
@@ -31,6 +31,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
+        {{- if or (eq .Values.flink.state.checkpoint.storageType "s3") (eq .Values.flink.state.savepoint.storageType "s3") }}
         - name: S3_ENDPOINT
           value: "http://minio-service:9000"
         - name: AWS_ACCESS_KEY_ID
@@ -43,6 +44,7 @@ spec:
             secretKeyRef:
               name: {{ .Release.Name }}-flink-secrets
               key: minio_secret_key
+        {{- end }}
         volumeMounts:
         - name: rocksdb-storage
           mountPath: /opt/flink/rocksdb
@@ -52,7 +54,7 @@ spec:
         {{- end }}
         {{- if eq .Values.flink.state.savepoint.storageType "filesystem" }}
         - name: flink-savepoint
-          mountPath: /opt/flink/savepoint
+          mountPath: /opt/flink/savepoints
         {{- end }}
         resources:
           {{- toYaml .Values.flink.taskManager.resources | nindent 10 }}
diff --git a/helm/chart/templates/operator/statefulset.yaml b/helm/chart/templates/operator/statefulset.yaml
index c50f097..9ea5a66 100644
--- a/helm/chart/templates/operator/statefulset.yaml
+++ b/helm/chart/templates/operator/statefulset.yaml
@@ -46,10 +46,11 @@ spec:
           env:
             - name: FLINK_API_URL
               value: {{ .Release.Name }}-flink-job-manager:8081
-            - name: SAVEPOINT_PATH
-              value: s3://flink/savepoints/
             - name: NAMESPACE
               value: "{{ .Release.Namespace }}"
+            {{- if eq .Values.flink.state.savepoint.storageType "s3" }}
+            - name: SAVEPOINT_PATH
+              value: s3://flink/savepoints/
             - name: S3_ENDPOINT
               value: "http://{{ .Release.Name }}-minio:9000"
             - name: AWS_ACCESS_KEY_ID
@@ -62,5 +63,8 @@ spec:
                 secretKeyRef:
                   name: {{ .Release.Name }}-minio
                   key: root-password
-
+            {{- else }}
+            - name: SAVEPOINT_PATH
+              value: /opt/flink/savepoints/
+            {{- end }}
 
diff --git a/helm/flink-kube-operator-1.2.3.tgz b/helm/flink-kube-operator-1.2.3.tgz
new file mode 100644
index 0000000..eb93caa
Binary files /dev/null and b/helm/flink-kube-operator-1.2.3.tgz differ
diff --git a/helm/index.yaml b/helm/index.yaml
index ea53c6c..d7ffd1c 100644
--- a/helm/index.yaml
+++ b/helm/index.yaml
@@ -1,6 +1,16 @@
 apiVersion: v1
 entries:
   flink-kube-operator:
+  - apiVersion: v2
+    appVersion: 0.1.1
+    created: "2025-07-18T18:09:46.27166563+03:30"
+    description: Helm chart for flink kube operator
+    digest: 597f2c07884bb5411dcc6e1a9cdf7672977858efe30273a46fb6525eb6013091
+    name: flink-kube-operator
+    type: application
+    urls:
+    - flink-kube-operator-1.2.3.tgz
+    version: 1.2.3
   - apiVersion: v2
     appVersion: 0.1.1
     created: "2025-05-17T14:34:55.317942453+03:30"
@@ -227,4 +237,4 @@ entries:
     urls:
     - flink-kube-operator-0.1.0.tgz
     version: 0.1.0
-generated: "2025-05-17T14:34:55.317942453+03:30"
+generated: "2025-07-18T18:09:46.244672127+03:30"