diff --git a/Makefile b/Makefile
index 5e8a16e..ddabdf8 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ lint:
 
 update_secrets_sample:
 	@echo "Masking passwords..."
+	#hass
 	@cat hass/settings/secrets.yaml | sed "s/\:.*/\: xxxxxxxxx/g" > hass/settings/secrets.yaml.sample #mask passwords
 	@sed -i "s/latitude:.*/latitude: 1.0/g" hass/settings/secrets.yaml.sample #must be a number
 	@sed -i "s/longitude:.*/longitude: 1.0/g" hass/settings/secrets.yaml.sample #must be a number
@@ -17,6 +18,9 @@ update_secrets_sample:
 	@sed -i "s/powerstrip_key:.*/powerstrip_key: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/g" hass/settings/secrets.yaml.sample #len 32
 	@sed -i "s/telegram_chat:.*/telegram_chat: 0/g" hass/settings/secrets.yaml.sample #must be a number
 	@sed -i "s/timezone:.*/timezone: Europe\/London/g" hass/settings/secrets.yaml.sample #must be valid
+	#broadlink
+	@find . -name *.env | xargs -I{} cp {} {}.sample
+	@find . -name *.env.sample | xargs -I{} sed -i "s/\=.*/\=xxxxxxxxx/g" {}
 
 commit: update_secrets_sample
 	git add .
diff --git a/broadlink/broadlink.env.sample b/broadlink/broadlink.env.sample
new file mode 100644
index 0000000..d767fbe
--- /dev/null
+++ b/broadlink/broadlink.env.sample
@@ -0,0 +1,3 @@
+MQTT_SERVER=xxxxxxxxx
+MQTT_USER=xxxxxxxxx
+MQTT_PASS=xxxxxxxxx
\ No newline at end of file
diff --git a/mosquitto/mqtt.env.sample b/mosquitto/mqtt.env.sample
new file mode 100644
index 0000000..5af0a6c
--- /dev/null
+++ b/mosquitto/mqtt.env.sample
@@ -0,0 +1,2 @@
+USERNAME=xxxxxxxxx
+PASS=xxxxxxxxx
diff --git a/mysql/mysql.env.sample b/mysql/mysql.env.sample
new file mode 100644
index 0000000..64524d5
--- /dev/null
+++ b/mysql/mysql.env.sample
@@ -0,0 +1,4 @@
+MYSQL_DATABASE=xxxxxxxxx
+MYSQL_USER=xxxxxxxxx
+MYSQL_PASSWORD=xxxxxxxxx
+MYSQL_ROOT_PASSWORD=xxxxxxxxx