diff --git a/packages/add-on/google_assistant.json b/packages/add-on/google_assistant.json
new file mode 100644
index 0000000..8d6e218
--- /dev/null
+++ b/packages/add-on/google_assistant.json
@@ -0,0 +1,12 @@
+{
+  "type": "service_account",
+  "project_id": "homeassistant-8c53b",
+  "private_key_id": "9b0cee0b18c61319233bad4f174412c4fa23118b",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCy95CbG3cfdGDj\n9LHImKfkJXL3Xh+Zysh747lVIg42KrM8HeFDwl9nbSuRstEr+rOyM5k/5rbatitp\njG+fCTOH+ohnCs2LiqYm/XPtUCnDCxmv8G794vUxynYm86lzRhERJU+sC8/HI9Sb\n5h6Y1Bs/ZZ7vRQ5+if4Ugnuoc60OWJvJ1TdOeOCJrJNlQyr56+HYfYh1+/JJcx+Y\n4Za/ACFdASWSR/UBVmtfR25BZPctKG9jKO2aQn1Ui9kOzVYVmkuU5NcJugk1ji9O\ncm2ZTmyXAwI7L3y5oQqvT2/xYRZ5JAJDV6EJHZuKv5yhByymuuJqqNc7wucehHPm\nx8M3ngZvAgMBAAECggEAOZbiiJcI+S049IHMJ9G/zPGkEifOoW2YoA1CmTuROSr6\nbDDtSSGmE6EUsRjKqI1O/9wMx3xVgQG37IoNbS7Hz0z2UbovNGUUXF2YzVfLaIEM\n7gm/naFH55LP/G7SK07ztQG9po5SeTF1fAlL9T/j2L25rCMbq+p5wV3PrwAyQvgE\nLvUHKjDKcvYO21svUet6pVvqNjJkgkRb9A990IKquKDEIGk7xG5rseuPyClal39a\nF61EfibMsqAr0IjPCB4vqJJScqHzNJ3DdjQdhFoKPy9AdRdUNPWCOBwGQ/0nuDTa\nR7K5L1j9MYMgCFAMwytCJpheJy7F1T9OTMG10jlmKQKBgQDqWylGja1ArKX/1np1\ncXgPFzBc5cLXqb7CmHar9Cm1MUSQ+Gl6yDl1DtalCISS/59APO6QRoKaobFmLzBQ\nPXUA2Py22H9Q1MQK3BM4nDI2kwTYPQXs3To/wcAyHqzFiZVAk9dxgxJGIkuP6hTJ\nKTq2JETcJUOOZmEEXo1Q8UsW0wKBgQDDftmz/p66AHDz8uHHt0ykzHZpYtcMacW+\nY1IxBD/Vxt4WUQrqj87MI5unDd3FtGOYNlggnWGgt8VuQ6S/nvTAK4BGr4sVIz6/\nuslONTv71JuvNuo3hY/3UzV06OnmwFRyaTc4J1JBYnof7Odgq9wANkmz7zEx/tvV\nQabgmFIIdQKBgQCLNSVafHPKdAOS6cMKGiG3zQ10USKg2nquusPbNojD0YUqG/UD\n8wV2TB8iHuIpM2BUVx1aZBfWZG+tBCDNuQPUQhAzSHyv9gKRdNKSEO4ezsvU6sKn\nRW4BS0SwQNpd6HDY0Djse3ASavK5hNFeAHiYkwi4QAZWAuhkIQoOZ5Yz8wKBgFq/\niaNqMJg7GDPFrVUeG2/skZL+FMFoYCiuxjqGtHMx62oEmMKlmuNcLCbx4t6hjBHe\nOC57oBQQ+o7iy5k/2nFSQCuP1UosoDY0KLorL/sIiHRfU34Oe/PdJlVswRcidJDf\nkoh4iFBdvD8Ro55WaLuYd8IU6ItCuR1XanWbf4j5AoGAAtewaXhYzVR+LtvNbLFx\nb25zUzdhH7Eqs4om0/5L6h7b7sRc7EgAmDaioKVdiaDLSAuav6FXZPQ3Ql4bKHYO\nSrYt83jUHpxDfx5ojlHmL4B0QDeJypGM+lxpUZd+VB99JUr1fXndbSCcBQJrt4Ho\nxuUorH7D8T8Bxh1E3C1Zgqc=\n-----END PRIVATE KEY-----\n",
+  "client_email": "homeassistant-servicio@homeassistant-8c53b.iam.gserviceaccount.com",
+  "client_id": "111105285066803980564",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/homeassistant-servicio%40homeassistant-8c53b.iam.gserviceaccount.com"
+}
diff --git a/packages/add-on/google_assistant.yaml b/packages/add-on/google_assistant.yaml
index ef6df8c..9fb9e9e 100644
--- a/packages/add-on/google_assistant.yaml
+++ b/packages/add-on/google_assistant.yaml
@@ -1,6 +1,6 @@
 google_assistant:
   project_id: homeassistant-8c53b
-  api_key: AIzaSyDhRdUJU0pHmxxVP0IYu-BKNKDrf1_ivlM
+  service_account: !include google_assistant.json
   expose_by_default: true
   exposed_domains:
     - switch
@@ -9,15 +9,16 @@ google_assistant:
     - cover
     - fan
     - vacuum
+    - input_boolean
   entity_config:
 # switch
-    switch.sonoffuv1:
+    switch.varios_1:
       expose: false
-    switch.sonoffuv2:
+    switch.varios_2:
       expose: false
     switch.coche_electrico:
       expose: false
-    switch.everspring_an158_plug_in_meter_appliance_module_switch:
+    switch.campana_extractora:
       name: Campana Extractora
       aliases:
         - Campana Extractora
@@ -46,7 +47,7 @@ google_assistant:
       room: General
     switch.light_led_cabecero:
       expose: false
-    switch.philio_technology_corporation_pan03_switch_module_with_meter_3_kw_x1_switch:
+    switch.television_principal:
       name: Televisión Principal
       aliases:
         - Televisión Principal
@@ -59,13 +60,13 @@ google_assistant:
         - Alarma Humos
         - Alarma
       room: Cocina
-    switch.sonoffhorno:
+    switch.horno:
       name: Horno
       aliases:
         - Horno
         - Interruptor Horno
       room: Cocina
-    switch.sonoffhumedos:
+    switch.humedos:
       name: General Húmedos
       aliases:
         - General Húmedos
@@ -73,20 +74,18 @@ google_assistant:
         - Interruptor Húmedos
         - Interruptor General Húmedos
       room: General
-    switch.sonofflavavajillas:
+    switch.lavavajillas:
       name: Lavavajillas
       aliases:
         - Lavavajillas
         - Interruptor Lavavajillas
       room: Cocina
-    switch.vacuum:
-      expose: false
     switch.wake_up_television_salon:
       expose: false
     switch.xiaomi_miio_switch:
-      name: Regleta Noha
+      name: Regleta Noa
       aliases:
-        - Enchufes Noha
+        - Enchufes Noa
       room: Noha
     switch.xiaomi_strip_2:
       name: Regleta Mia
@@ -132,10 +131,10 @@ google_assistant:
         - Luz Habitación Mia
       room: Mia
     light.luz_habitacion_Noha:
-      name: Luz Noha
+      name: Luz Noa
       aliases:
-        - Luz Noha
-        - Luz Habitación Noha
+        - Luz Noa
+        - Luz Habitación Noa
       room: Noha
     light.luz_habitacion_principal_principal:
       name: Luz Principal
@@ -183,7 +182,7 @@ google_assistant:
     media_player.grupo_altavoces:
       name: Grupo Altavoces
       room: General
-    media_player.living_room_ue46f6400:
+    media_player.television_samsung:
       name: Televisión Salón
       room: Salón
       aliases:
@@ -192,38 +191,32 @@ google_assistant:
     cover.persina_habitacion_estudio:
       name: Persiana Estudio
       aliases:
-        - Persiana Estudio
-        - Persiana Habitación Estudio
+        - Estudio Persiana
       room: Estudio
     cover.persina_habitacion_mia:                                                                                                                
       name: Persiana Mia                                                                                                                    
       aliases:
-        - Persiana Mia
-        - Persiana Habitación Mia
+        - Mia Persiana
       room: Mia
     cover.persina_habitacion_noha:
-      name: Persiana Noha
+      name: Persiana Noa
       aliases:
-        - Persiana Noha
-        - Persiana Habitación Noha
+        - Noa Persiana
       room: Noha
     cover.persina_habitacion_principal:
       name: Persiana Principal                                                                                                              
       aliases:
-        - Persiana Principal
-        - Persiana Habitación Principal
+        - Principal Persiana
       room: Principal
     cover.persina_salon_fase_dos:
       name: Persiana Fase Dos
       aliases:
-        - Persiana Fase Dos
-        - Persiana Salón Fase Dos
+        - Fase Dos Persiana
       room: Salón
     cover.persina_salon_piscina:
       name: Persiana Piscina
-      aliases: 
-        - Persiana Piscina
-        - Persiana Salón Piscina
+      aliases:
+        - Piscina Persiana
       room: Salón
 # fan
     fan.xiaomi_miio_device_2:
@@ -234,15 +227,20 @@ google_assistant:
         - Purificador
         - Purificador Salón
       room: Salón
+# input_boolean
+    input_boolean.siesta_habitacion_principal:
+      name: Siesta Principal
+      room: Principal
+    input_boolean.reunion_salon:
+      name: Reunión Salón
+      room: Salón
 # vacuum
-    vacuum.xiaomi_vacuum:
+    vacuum.xiaomi_vacuum_cleaner:
       name: Aspiradora
       aliases:
         - Aspiradora
         - Copito
       room: General
-    vacuum.rockrobo:
-      expose: false
 # groups
     group.all_covers:
       name: Persianas