diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md
index 5ff4e91..a42068e 100644
--- a/src/CHANGELOG.md
+++ b/src/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v1.8.4
+### 🚀 Features:
+
+- Optimize Addon configuration #90
+
 ## v1.8.3
 ### 🚀 Features:
 
diff --git a/src/config.yaml b/src/config.yaml
index a6616ce..31f790e 100644
--- a/src/config.yaml
+++ b/src/config.yaml
@@ -1,6 +1,6 @@
 name: "Volvo2Mqtt"
 description: "Volvo AAOS MQTT bridge"
-version: "1.8.3"
+version: "1.8.4"
 slug: "volvo2mqtt"
 init: false
 url: "https://github.com/Dielee/volvo2mqtt"
@@ -24,14 +24,15 @@ options:
     username: null
     password: null
     vin: ""
-    vccapikey: null
+    vccapikey:
+        - null
     odometerMultiplier: 1
     averageSpeedDivider: 1
     averageFuelConsumptionMultiplier: 1
 schema:
   updateInterval: int(60,)
   babelLocale: str
-  TZ: str
+  TZ: match(^.+/.+$)
   debug: bool
   mqtt:
     broker: str
@@ -39,11 +40,11 @@ schema:
     username: str?
     password: str?
   volvoData:
-    username: str
+    username: match(^[\w+\.]+@([\w-]+\.)+[\w-]{2,4}$)
     password: str
     vin: str?
     vccapikey:
-        - str
+        - match(^\b\w{32}\b$)
     odometerMultiplier: int(1,)
     averageSpeedDivider: int(1,)
     averageFuelConsumptionMultiplier: int(1,)
diff --git a/src/const.py b/src/const.py
index 9c1145c..938a67e 100644
--- a/src/const.py
+++ b/src/const.py
@@ -1,6 +1,6 @@
 from config import settings
 
-VERSION = "v1.8.3"
+VERSION = "v1.8.4"
 
 OAUTH_URL = "https://volvoid.eu.volvocars.com/as/token.oauth2"
 VEHICLES_URL = "https://api.volvocars.com/connected-vehicle/v1/vehicles"