diff --git a/charts/stable/focalboard/Chart.yaml b/charts/stable/focalboard/Chart.yaml
index 733b4e53..e7043e11 100644
--- a/charts/stable/focalboard/Chart.yaml
+++ b/charts/stable/focalboard/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 0.6.7
+appVersion: 0.9.0
 description: Focalboard is an open source, self-hosted alternative to Trello, Notion, and Asana.
 name: focalboard
-version: 3.0.1
+version: 4.0.0
 kubeVersion: ">=1.16.0-0"
 keywords:
 - focalboard
diff --git a/charts/stable/focalboard/README.md b/charts/stable/focalboard/README.md
index 5ade9954..3fed09a9 100644
--- a/charts/stable/focalboard/README.md
+++ b/charts/stable/focalboard/README.md
@@ -1,6 +1,6 @@
 # focalboard
 
-![Version: 3.0.1](https://img.shields.io/badge/Version-3.0.1-informational?style=flat-square) ![AppVersion: 0.6.7](https://img.shields.io/badge/AppVersion-0.6.7-informational?style=flat-square)
+![Version: 4.0.0](https://img.shields.io/badge/Version-4.0.0-informational?style=flat-square) ![AppVersion: 0.9.0](https://img.shields.io/badge/AppVersion-0.9.0-informational?style=flat-square)
 
 Focalboard is an open source, self-hosted alternative to Trello, Notion, and Asana.
 
@@ -77,10 +77,11 @@ N/A
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| env | object | See below | environment variables. See more environment variables in the [image entrypoint script](https://github.com/FlipEnergy/container-images/blob/main/focalboard/entrypoint.sh) |
+| config | string | `"{\n  \"serverRoot\": \"http://localhost:8000\",\n  \"port\": 8000,\n  \"dbtype\": \"sqlite3\",\n  \"dbconfig\": \"/data/focalboard.db\",\n  \"postgres_dbconfig\": \"dbname=focalboard sslmode=disable\",\n  \"useSSL\": false,\n  \"webpath\": \"./pack\",\n  \"filespath\": \"/data/files\",\n  \"telemetry\": true,\n  \"session_expire_time\": 2592000,\n  \"session_refresh_time\": 18000,\n  \"localOnly\": false,\n  \"enableLocalMode\": true,\n  \"localModeSocketLocation\": \"/var/tmp/focalboard_local.socket\"\n}\n"` |  |
+| env | object | See below | environment variables. |
 | image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
-| image.repository | string | `"flipenergy/focalboard"` | image repository |
-| image.tag | string | `"0.6.7"` | image tag |
+| image.repository | string | `"mattermost/focalboard"` | image repository |
+| image.tag | string | `"0.9.0"` | image tag |
 | ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
 | persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |
 | service | object | See values.yaml | Configures service settings for the chart. |
@@ -91,6 +92,14 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [4.0.0]
+
+#### Changed
+
+- Changed image to official mattermost/focalboard image
+- Removes unsupported environment variables
+- add configmap for config
+
 ### [3.0.0]
 
 #### Changed
diff --git a/charts/stable/focalboard/README_CHANGELOG.md.gotmpl b/charts/stable/focalboard/README_CHANGELOG.md.gotmpl
index 952f83f0..960110d9 100644
--- a/charts/stable/focalboard/README_CHANGELOG.md.gotmpl
+++ b/charts/stable/focalboard/README_CHANGELOG.md.gotmpl
@@ -9,6 +9,15 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [4.0.0]
+
+#### Changed
+
+- Changed image to official mattermost/focalboard image
+- Removes unsupported environment variables
+- add configmap for config
+
+
 ### [3.0.0]
 
 #### Changed
diff --git a/charts/stable/focalboard/templates/common.yaml b/charts/stable/focalboard/templates/common.yaml
index a6613c2c..bc1b6d94 100644
--- a/charts/stable/focalboard/templates/common.yaml
+++ b/charts/stable/focalboard/templates/common.yaml
@@ -1 +1,19 @@
+{{- include "common.values.setup" . }}
+
+
+{{/* Append the hardcoded settings */}}
+{{- define "focalboard.harcodedValues" -}}
+persistence:
+  focal-config:
+    enabled: "true"
+    mountPath: "/opt/focalboard/config.json"
+    subPath: config.json
+    type: "custom"
+    volumeSpec:
+      configMap:
+        name: {{ printf "%v-config" (include "common.names.fullname" .) }}
+{{- end -}}
+{{- $_ := mergeOverwrite .Values (include "focalboard.harcodedValues" . | fromYaml) -}}
+
+{{/* Render the templates */}}
 {{ include "common.all" . }}
diff --git a/charts/stable/focalboard/templates/configmap.yaml b/charts/stable/focalboard/templates/configmap.yaml
new file mode 100644
index 00000000..9f520196
--- /dev/null
+++ b/charts/stable/focalboard/templates/configmap.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.names.fullname" . }}-config
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+data:
+  config.json: |
+    {{- .Values.config | nindent 4 }}
diff --git a/charts/stable/focalboard/values.yaml b/charts/stable/focalboard/values.yaml
index 32f1add1..7fe8c835 100644
--- a/charts/stable/focalboard/values.yaml
+++ b/charts/stable/focalboard/values.yaml
@@ -7,18 +7,35 @@
 
 image:
   # -- image repository
-  repository: flipenergy/focalboard
+  repository: mattermost/focalboard
   # -- image pull policy
   pullPolicy: IfNotPresent
   # -- image tag
-  tag: 0.6.7
+  tag: 0.9.0
 
-# -- environment variables. See more environment variables in the [image entrypoint script](https://github.com/FlipEnergy/container-images/blob/main/focalboard/entrypoint.sh)
+# -- environment variables.
 # @default -- See below
 env: {}
-  # SERVER_ROOT:
-  # DBTYPE:
-  # DBCONFIG:
+
+# See the Administrator's Guide for config reference: https://www.focalboard.com/guide/admin/
+config: |
+  {
+    "serverRoot": "http://localhost:8000",
+    "port": 8000,
+    "dbtype": "sqlite3",
+    "dbconfig": "/data/focalboard.db",
+    "postgres_dbconfig": "dbname=focalboard sslmode=disable",
+    "useSSL": false,
+    "webpath": "./pack",
+    "filespath": "/data/files",
+    "telemetry": true,
+    "session_expire_time": 2592000,
+    "session_refresh_time": 18000,
+    "localOnly": false,
+    "enableLocalMode": true,
+    "localModeSocketLocation": "/var/tmp/focalboard_local.socket"
+  }
+
 
 # -- Configures service settings for the chart.
 # @default -- See values.yaml