diff --git a/.github/workflows/chart-preview.yml b/.github/workflows/chart-preview.yml
index 192df70..30a5748 100644
--- a/.github/workflows/chart-preview.yml
+++ b/.github/workflows/chart-preview.yml
@@ -41,6 +41,9 @@ jobs:
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
           mkdir -p helm-preview
 
+          echo "HELM_SUB_FOLDER=$(git rev-parse --short "$GITHUB_SHA")" >> "$GITHUB_ENV"
+          echo "CHART_PREFIX=$(git rev-parse --short "$GITHUB_SHA")" >> "$GITHUB_ENV"
+
       - name: Set up Helm
         uses: azure/setup-helm@v4
 
@@ -93,7 +96,6 @@ jobs:
           cp charts/${{env.CHART_REPO}}/README.md ${{ env.EXPORT_DIR }}/${{env.CHART_REPO}}/${{env.CHART_REPO}}.md
           helm repo index ${{ env.EXPORT_DIR }}/${{env.CHART_REPO}}
 
-
       - name: Publish
         if: ${{ env.BUILD_PLANE_CE == 'true' || env.BUILD_PLANE_EE == 'true' }}
         working-directory: code
@@ -108,12 +110,12 @@ jobs:
           
           if [ "${{ env.BUILD_PLANE_CE }}" == "true" ]; then
             HTML_CONTENT="$HTML_CONTENT
-            <li><a href='plane-ce/index.yaml'>Plane-CE</a></li>"
+            <li><a href='plane-ce/'>Plane-CE</a></li>"
           fi
 
           if [ "${{ env.BUILD_PLANE_EE }}" == "true" ]; then
             HTML_CONTENT="$HTML_CONTENT
-            <li><a href='plane-enterprise/index.yaml'>Plane-Enterprise</a></li>"
+            <li><a href='plane-enterprise/'>Plane-Enterprise</a></li>"
           fi
 
           HTML_CONTENT="$HTML_CONTENT
diff --git a/charts/plane-ce/questions.yml b/charts/plane-ce/questions.yml
index 12c314b..c966a3e 100644
--- a/charts/plane-ce/questions.yml
+++ b/charts/plane-ce/questions.yml
@@ -113,6 +113,20 @@ questions:
     label: "CORS Allowed Origins"
     type: string
     default: ""
+  - variable: env.sentry_dsn
+    label: "Sentry DSN"
+    type: string
+    default: ""
+  - variable: env.sentry_environment
+    label: "Sentry Environment"
+    type: string
+    default: "Development"
+  - variable: env.secret_key
+    label: "Random Secret Key"
+    type: string
+    required: true
+    default: "60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5"
+    subquestions:
 
 - variable: worker.replicas
   label: "Default Replica Count"
@@ -337,23 +351,9 @@ questions:
     type: password
     default: ""
     description: "Not required for 'http' issuer"
+    show_if: "ssl.issuer=cloudflare || ssl.issuer=digitalocean"
   - variable: ssl.generateCerts
     label: "Enable to generate certificates"
     type: boolean
     default: false
     
-- variable: env.sentry_dsn
-  label: "Sentry DSN"
-  type: string
-  default: ""
-  group: "Misc."
-  subquestions:
-  - variable: env.sentry_environment
-    label: "Sentry Environment"
-    type: string
-    default: "Development"
-  - variable: env.secret_key
-    label: "Random Secret Key"
-    type: string
-    required: true
-    default: "60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5"
diff --git a/charts/plane-enterprise/questions.yml b/charts/plane-enterprise/questions.yml
index 93228da..f39e7fa 100644
--- a/charts/plane-enterprise/questions.yml
+++ b/charts/plane-enterprise/questions.yml
@@ -16,6 +16,10 @@ questions:
   - variable: dockerRegistry.password
     label: "Password/Token"
     type: password
+  - variable: env.storageClass
+    label: "Storage Class for Persistent Volume Claims"
+    type: string
+    default: "longhorn"
 
 - variable: planeVersion
   label: Plane Version (Docker Image Tag)
@@ -124,6 +128,19 @@ questions:
     label: "CORS Allowed Origins"
     type: string
     default: ""
+  - variable: env.sentry_dsn
+    label: "Sentry DSN"
+    type: string
+    default: ""
+  - variable: env.sentry_environment
+    label: "Sentry Environment"
+    type: string
+    default: "Development"
+  - variable: env.secret_key
+    label: "Random Secret Key"
+    type: string
+    required: true
+    default: "60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5"
 
 - variable: services.worker.replicas
   label: "Default Replica Count"
@@ -333,27 +350,9 @@ questions:
     type: password
     default: ""
     description: "Not required for 'http' issuer"
+    show_if: "ssl.issuer=cloudflare || ssl.issuer=digitalocean"
   - variable: ssl.generateCerts
     label: "Enable to generate certificates"
     type: boolean
     default: false
-    
-- variable: env.sentry_dsn
-  label: "Sentry DSN"
-  type: string
-  default: ""
-  group: "Misc."
-  subquestions:
-  - variable: env.sentry_environment
-    label: "Sentry Environment"
-    type: string
-    default: "Development"
-  - variable: env.secret_key
-    label: "Random Secret Key"
-    type: string
-    required: true
-    default: "60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5"
-  - variable: env.storageClass
-    label: "Storage Class"
-    type: string
-    default: "longhorn"
+