diff --git a/charts/common/CHANGELOG.md b/charts/common/CHANGELOG.md
index b6927e97..566628a2 100644
--- a/charts/common/CHANGELOG.md
+++ b/charts/common/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 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).
 
+## [2.1.0]
+
+### Added
+
+- Allow for additional arguments to be added to code-server runtime via `addons.codeserver.args`
+
 ## [2.0.4]
 
 ### Fixed
diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml
index a9ab0420..f3476274 100644
--- a/charts/common/Chart.yaml
+++ b/charts/common/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: common
 description: Function library for k8s-at-home charts
 type: library
-version: 2.0.4
+version: 2.1.0
 keywords:
   - k8s-at-home
   - common
diff --git a/charts/common/templates/addons/code-server/_container.tpl b/charts/common/templates/addons/code-server/_container.tpl
index 4d0f727c..5d099a80 100644
--- a/charts/common/templates/addons/code-server/_container.tpl
+++ b/charts/common/templates/addons/code-server/_container.tpl
@@ -24,10 +24,11 @@ ports:
   containerPort: {{ .Values.addons.codeserver.service.port.port }}
   protocol: TCP
 args:
+{{- range .Values.addons.codeserver.args }}
+- {{ . | quote }}
+{{- end }}
 - "--port"
 - "{{ .Values.addons.codeserver.service.port.port }}"
-- "--auth"
-- "none"
 - {{ .Values.addons.codeserver.workingDir | default (first .Values.addons.codeserver.volumeMounts).mountPath }}
 {{- with .Values.addons.codeserver.volumeMounts }}
 volumeMounts:
diff --git a/charts/common/values.yaml b/charts/common/values.yaml
index 35e95aa8..a8914d23 100644
--- a/charts/common/values.yaml
+++ b/charts/common/values.yaml
@@ -314,6 +314,14 @@ addons:
       pullPolicy: IfNotPresent
       tag: 3.7.4
 
+    # Set codeserver command line arguments
+    # consider setting --user-data-dir to a persistent location to preserve code-server setting changes
+    args:
+      - --auth
+      - none
+      # - --user-data-dir
+      # - "/config/.vscode"
+
     # Specify a list of volumes that get mounted in the code-server container.
     # At least 1 volumeMount is required!
     volumeMounts: []