diff --git a/charts/plex-exporter/Chart.yaml b/charts/plex-exporter/Chart.yaml
index 859ab90..30d3fd1 100644
--- a/charts/plex-exporter/Chart.yaml
+++ b/charts/plex-exporter/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 0.2.2
 description: A prometheus exporter for Plex Media Server
 name: plex-exporter
-version: 0.0.2
+version: 0.0.3
 kubeVersion: ">=1.16.0-0"
 keywords:
   - plex-exporter
diff --git a/charts/plex-exporter/README.md b/charts/plex-exporter/README.md
index 5201aca..2b6c49b 100644
--- a/charts/plex-exporter/README.md
+++ b/charts/plex-exporter/README.md
@@ -1,6 +1,6 @@
 # plex-exporter
 
-![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![AppVersion: 0.2.2](https://img.shields.io/badge/AppVersion-0.2.2-informational?style=flat-square)
+![Version: 0.0.3](https://img.shields.io/badge/Version-0.0.3-informational?style=flat-square) ![AppVersion: 0.2.2](https://img.shields.io/badge/AppVersion-0.2.2-informational?style=flat-square)
 
 A prometheus exporter for Plex Media Server
 
@@ -98,6 +98,34 @@ 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).
 
+### [0.0.3]
+
+#### Added
+
+- N/A
+
+#### Changed
+
+- Fixed autodiscovery configuration issues when using `envFrom`
+
+#### Removed
+
+- N/A
+
+### [0.0.2]
+
+#### Added
+
+- Support for auto discovery
+
+#### Changed
+
+- N/A
+
+#### Removed
+
+- N/A
+
 ### [0.0.1]
 
 #### Added
diff --git a/charts/plex-exporter/README_CHANGELOG.md.gotmpl b/charts/plex-exporter/README_CHANGELOG.md.gotmpl
index af44a85..bf98961 100644
--- a/charts/plex-exporter/README_CHANGELOG.md.gotmpl
+++ b/charts/plex-exporter/README_CHANGELOG.md.gotmpl
@@ -9,6 +9,20 @@ 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).
 
+### [0.0.3]
+
+#### Added
+
+- N/A
+
+#### Changed
+
+- Fixed autodiscovery configuration issues when using `envFrom`
+
+#### Removed
+
+- N/A
+
 ### [0.0.2]
 
 #### Added
diff --git a/charts/plex-exporter/ci/autodiscovery-env.yml b/charts/plex-exporter/ci/autodiscovery-env.yml
new file mode 100644
index 0000000..5812071
--- /dev/null
+++ b/charts/plex-exporter/ci/autodiscovery-env.yml
@@ -0,0 +1,5 @@
+---
+env:
+  PLEX_TOKEN: a0a0a0a0a
+plex:
+  autodiscover: true
diff --git a/charts/plex-exporter/ci/autodiscovery.yml b/charts/plex-exporter/ci/autodiscovery.yml
index 42c7531..2416af6 100644
--- a/charts/plex-exporter/ci/autodiscovery.yml
+++ b/charts/plex-exporter/ci/autodiscovery.yml
@@ -1,4 +1,4 @@
 ---
 plex:
-  server: test
+  autodiscover: true
   token: a0a0a0a0a0
diff --git a/charts/plex-exporter/templates/common.yaml b/charts/plex-exporter/templates/common.yaml
index 5744596..a676e85 100644
--- a/charts/plex-exporter/templates/common.yaml
+++ b/charts/plex-exporter/templates/common.yaml
@@ -4,16 +4,16 @@
 {{/* Append the hardcoded settings */}}
 {{- define "plex-exporter.harcodedValues" -}}
 args:
-  {{- if .Values.plex.autodiscover -}}
-  - "--auto-discover"
-  {{- else -}}
+  {{ if .Values.plex.server }}
   - "--plex-server"
   - "{{ .Values.plex.server }}"
-  {{- end -}}
-  {{- if .Values.plex.token -}}
+  {{ else }}
+  - "--auto-discover"
+  {{ end }}
+  {{ if .Values.plex.token }}
   - "--token"
   - "{{ .Values.plex.token }}"
-  {{- end -}}
+  {{ end }}
 {{- end -}}
 {{- $_ := mergeOverwrite .Values (include "plex-exporter.harcodedValues" . | fromYaml) -}}