diff --git a/templates/chartmuseum/chartmuseum-cm.yaml b/templates/chartmuseum/chartmuseum-cm.yaml
index 628cb9f88..13559bef5 100644
--- a/templates/chartmuseum/chartmuseum-cm.yaml
+++ b/templates/chartmuseum/chartmuseum-cm.yaml
@@ -99,7 +99,11 @@ data:
   STORAGE_ALIBABA_PREFIX: {{ $storage.oss.rootdirectory }}
   {{- end }}
   {{- if $storage.oss.endpoint }}
-  STORAGE_ALIBABA_ENDPOINT: {{ $storage.oss.endpoint }}
+  STORAGE_ALIBABA_ENDPOINT: {{ $storage.oss.endpoint | trimPrefix $storage.oss.bucket | trimPrefix "." }}
+  {{- else if $storage.oss.internal}}
+  STORAGE_ALIBABA_ENDPOINT: {{ $storage.oss.region }}-internal.aliyuncs.com
+  {{- else }}
+  STORAGE_ALIBABA_ENDPOINT: {{ $storage.oss.region }}.aliyuncs.com
   {{- end }}
   ALIBABA_CLOUD_ACCESS_KEY_ID: {{ $storage.oss.accesskeyid }}
 {{- end }}
diff --git a/values.yaml b/values.yaml
index aead66fe2..35b235d86 100644
--- a/values.yaml
+++ b/values.yaml
@@ -232,6 +232,7 @@ persistence:
       accesskeysecret: accesskeysecret
       region: regionname
       bucket: bucketname
+      ### endpoint format: [bucket].[region].aliyuncs.com or [bucket].[region]-internal.aliyuncs.com
       #endpoint: endpoint
       #internal: false
       #encrypt: false