diff --git a/charts/incubator/fireshare/Chart.yaml b/charts/incubator/fireshare/Chart.yaml
index 9a2d71801ad..5218fa67cdc 100644
--- a/charts/incubator/fireshare/Chart.yaml
+++ b/charts/incubator/fireshare/Chart.yaml
@@ -1,26 +1,17 @@
-annotations:
-  truecharts.org/SCALE-support: "true"
-  truecharts.org/catagories: |
-    - Other
-    - MediaServer-Video
 apiVersion: v2
 appVersion: "latest"
+kubeVersion: ">=1.16.0-0"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
     version: 10.4.8
+description: "Share your game clips, videos, or other media via unique links."
+version: 0.0.15
 deprecated: false
-description:
-  "Fireshare allows you to easily share your media whether that be game\
-  \ clips, screen records, or movies through a unique publically accessible link.\
-  \ \r\n"
 home: https://github.com/truecharts/charts/tree/master/charts/incubator/fireshare
-icon: https://truecharts.org/img/chart-icons/fireshare.png
+icon: https://truecharts.org/img/chart-icons/test.png
 keywords:
   - fireshare
-  - Other
-  - MediaServer-Video
-kubeVersion: ">=1.16.0-0"
 maintainers:
   - email: info@truecharts.org
     name: TrueCharts
@@ -30,4 +21,7 @@ sources:
   - https://github.com/ShaneIsrael/fireshare
   - https://hub.docker.com/r/shaneisrael/fireshare
 type: application
-version: 0.0.14
+annotations:
+  truecharts.org/SCALE-support: "true"
+  truecharts.org/catagories: |
+    - media
diff --git a/charts/incubator/fireshare/questions.yaml b/charts/incubator/fireshare/questions.yaml
index 96e0ba68a5c..fb81f596703 100644
--- a/charts/incubator/fireshare/questions.yaml
+++ b/charts/incubator/fireshare/questions.yaml
@@ -24,7 +24,6 @@ questions:
             type: boolean
             default: true
 # Include{global}
-
   - variable: controller
     group: "Controller"
     label: ""
@@ -75,7 +74,19 @@ questions:
                     - value: "OnDelete"
                       description: "(Legacy) OnDelete: ignore .spec.template changes"
 # Include{controllerExpert}
-
+  - variable: secretEnv
+    group: "Container Configuration"
+    label: "Image Secrets"
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: ADMIN_PASSWORD
+          label: 'ADMIN_PASSWORD'
+          description: "The admin account password"
+          schema:
+            type: string
+            default: ""
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
@@ -83,22 +94,13 @@ questions:
       additional_attrs: true
       type: dict
       attrs:
-
-        - variable: ADMIN_PASSWORD
-          label: 'ADMIN_PASSWORD'
-          description: "The admin account password"
-          schema:
-            type: string
-            default: "admin"
         - variable: MINUTES_BETWEEN_VIDEO_SCANS
           label: 'MINUTES_BETWEEN_VIDEO_SCANS'
           description: "How often in minutes Fireshare will scan for new videos"
           schema:
-            type: string
-            default: "5"
-
+            type: int
+            default: 5
 # Include{containerConfig}
-
   - variable: service
     group: "Networking and Services"
     label: "Configure Service(s)"
@@ -125,7 +127,7 @@ questions:
                             description: "This port exposes the container port on the service"
                             schema:
                               type: int
-                              default: 8080
+                              default: 10287
                               required: true
                           - variable: advanced
                             label: "Show Advanced settings"
@@ -138,7 +140,7 @@ questions:
                                   label: "Port Type"
                                   schema:
                                     type: string
-                                    default: TCP
+                                    default: HTTP
                                     enum:
                                       - value: HTTP
                                         description: "HTTP"
@@ -161,9 +163,6 @@ questions:
                                   schema:
                                     type: int
                                     default: 80
-
-
-
   - variable: serviceexpert
     group: "Networking and Services"
     label: "Show Expert Config"
@@ -178,11 +177,8 @@ questions:
           schema:
             type: boolean
             default: false
-
 # Include{serviceExpert}
-
 # Include{serviceList}
-
   - variable: persistence
     label: "Integrated Persistent Storage"
     description: "Integrated Persistent Storage"
@@ -191,7 +187,6 @@ questions:
       additional_attrs: true
       type: dict
       attrs:
-
         - variable: data
           label: "data Storage"
           description: "Container Path data"
@@ -219,11 +214,7 @@ questions:
             attrs:
 # Include{persistenceBasic}
 # Include{persistenceAdvanced}
-
-
 # Include{persistenceList}
-
-
   - variable: ingress
     label: ""
     group: "Ingress"
@@ -238,17 +229,11 @@ questions:
             type: dict
             attrs:
 # Include{ingressDefault}
-
 # Include{ingressTLS}
-
 # Include{ingressTraefik}
-
 # Include{ingressExpert}
-
 # Include{ingressList}
-
 # Include{security}
-
   - variable: advancedSecurity
     label: "Show Advanced Security Settings"
     group: "Security and Permissions"
@@ -284,7 +269,6 @@ questions:
                   type: boolean
                   default: false
 # Include{securityContextAdvanced}
-
   - variable: podSecurityContext
     group: "Security and Permissions"
     label: "Pod Security Context"
@@ -311,10 +295,6 @@ questions:
             type: int
             default: 568
 # Include{podSecurityContextAdvanced}
-
-
 # Include{resources}
-
 # Include{advanced}
-
 # Include{addons}
diff --git a/charts/incubator/fireshare/templates/_secrets.tpl b/charts/incubator/fireshare/templates/_secrets.tpl
new file mode 100644
index 00000000000..c65f141571e
--- /dev/null
+++ b/charts/incubator/fireshare/templates/_secrets.tpl
@@ -0,0 +1,20 @@
+{{/* Define the secrets */}}
+{{- define "fireshare.secrets" -}}
+---
+
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: fireshare-secrets
+{{- $fireshareprevious := lookup "v1" "Secret" .Release.Namespace "fireshare-secrets" }}
+{{- $secret_key := "" }}
+data:
+  {{- if $fireshareprevious}}
+  SECRET_KEY: {{ index $fireshareprevious.data "SECRET_KEY" }}
+  {{- else }}
+  {{- $secret_key := randAlphaNum 32 }}
+  SECRET_KEY: {{ $secret_key | b64enc }}
+  {{- end }}
+
+{{- end -}}
diff --git a/charts/incubator/fireshare/templates/common.yaml b/charts/incubator/fireshare/templates/common.yaml
index cbf66c20818..b5635570fd1 100644
--- a/charts/incubator/fireshare/templates/common.yaml
+++ b/charts/incubator/fireshare/templates/common.yaml
@@ -1,2 +1,7 @@
+{{- include "tc.common.loader.init" . }}
+
+{{/* Render secrets for fireshare */}}
+{{- include "fireshare.secrets" . }}
+
 {{/* Render the templates */}}
-{{ include "tc.common.loader.all" . }}
+{{ include "tc.common.loader.apply" . }}
diff --git a/charts/incubator/fireshare/values.yaml b/charts/incubator/fireshare/values.yaml
index e5e80b08f71..319aec79710 100644
--- a/charts/incubator/fireshare/values.yaml
+++ b/charts/incubator/fireshare/values.yaml
@@ -1,10 +1,34 @@
-env:
-  ADMIN_PASSWORD: admin
-  MINUTES_BETWEEN_VIDEO_SCANS: "5"
 image:
   pullPolicy: IfNotPresent
   repository: tccr.io/truecharts/fireshare
-  tag: latest@sha256:01a7fe0eb8c31b2c74158912921c15fbe44eec5b67788f77c1182461137dfaa7
+  tag: v1.2.0@sha256:bf9e837e359c4720caf8260674010e5eaab848dc94311e52cb5cae132e7e05a8
+
+podSecurityContext:
+  runAsGroup: 0
+  runAsUser: 0
+
+securityContext:
+  readOnlyRootFilesystem: false
+  runAsNonRoot: false
+
+secretEnv:
+  ADMIN_PASSWORD: "changeme"
+
+env:
+  SECRET_KEY:
+    secretKeyRef:
+      name: fireshare-secrets
+      key: SECRET_KEY
+  MINUTES_BETWEEN_VIDEO_SCANS: 5
+
+service:
+  main:
+    ports:
+      main:
+        port: 10287
+        protocol: HTTP
+        targetPort: 80
+
 persistence:
   data:
     enabled: true
@@ -15,18 +39,3 @@ persistence:
   videos:
     enabled: true
     mountPath: /videos
-podSecurityContext:
-  runAsGroup: 0
-  runAsUser: 0
-securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
-service:
-  main:
-    enabled: true
-    ports:
-      main:
-        enabled: true
-        port: 8080
-        protocol: TCP
-        targetPort: 80
diff --git a/cspell.config.yaml b/cspell.config.yaml
index 334e89f3954..817d9ef7f3b 100644
--- a/cspell.config.yaml
+++ b/cspell.config.yaml
@@ -19,6 +19,7 @@ words:
   - duplicati
   - dynmap
   - eptgmk
+  - Fireshare
   - gibibyte
   - gluster
   - healthcheck