diff --git a/growbox.yaml b/growbox.yaml
index 7486e0e99ddfb990004a1e5376e47f433506cb6f..c6c54844a29ee57cecb33fbd3ff0289dc6b79a9c 100644
--- a/growbox.yaml
+++ b/growbox.yaml
@@ -11,8 +11,9 @@ substitutions:
 
 packages:
   base:           !include packages/base.yaml
-  esp32:          !include packages/esp32s3.yaml
+  esp32s3:        !include packages/esp32s3.yaml
   time:           !include packages/time_schedule.yaml
+  mqtt:           !include packages/mqtt.yaml
   air_bme280:     !include packages/air_bme280.yaml
   air_scd40:      !include packages/air_scd40.yaml
   control_gp8403: !include packages/control_gp8403.yaml
diff --git a/packages/esp32.yaml b/packages/esp32.yaml
index 1ae23cf41b06930171960250c865ca87e42cf784..b5d18ce4faedc9d6904ce58b9e8d71462fd554b3 100644
--- a/packages/esp32.yaml
+++ b/packages/esp32.yaml
@@ -6,7 +6,6 @@ esp32:
 i2c:
   sda: 21
   scl: 22
-  frequency: 1khz
 
 wifi:
   power_save_mode: none
diff --git a/packages/mqtt.yaml b/packages/mqtt.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..50e46787c246e9468ac62b357e221db94e89f365
--- /dev/null
+++ b/packages/mqtt.yaml
@@ -0,0 +1,8 @@
+mqtt:
+  broker: !secret mqtt_host
+  username: !secret mqtt_username
+  password: !secret mqtt_password
+  client_id: $devicename
+  discovery: false
+  topic_prefix: growsmart/$devicename
+  reboot_timeout: 0s
diff --git a/packages/secrets.yaml.dist b/packages/secrets.yaml.dist
index be65f1d8da012d170a6b74add5a863020a2a7e78..e24990fb348c2afc82c5cec96e308074787942c8 100644
--- a/packages/secrets.yaml.dist
+++ b/packages/secrets.yaml.dist
@@ -1,11 +1,13 @@
-wifi_ssid: "foo"
-wifi_password: "bar"
+wifi_ssid: foo
+wifi_password: bar
 ota_password: ""
 api_password: ""
-domain: "local"
-timezone: "Europe/Berlin"
+domain: local
+timezone: Europe/Berlin
 pump1_ml_sec: "2.15"    # millilitre per second
-pump1_dose_ml: "2"      # millilitre per dose
+pump1_dose_ml: "1"      # millilitre per dose
 pump2_ml_sec: "2.15"    # millilitre per second
-pump2_dose_ml: "5"      # millilitre per dose
-tcs34725_gaf: "1.0"
+pump2_dose_ml: "1"      # millilitre per dose
+mqtt_username: ""
+mqtt_password: ""
+mqtt_host: ""