diff --git a/base.yaml b/base.yaml
index c823a8f066ffd713e868a8c39db5a647c9a7d87f..4ba4068fd74b89d93686c7cc4b3d55a5a7acc844 100644
--- a/base.yaml
+++ b/base.yaml
@@ -2,14 +2,17 @@ esphome:
   name: $devicename
   comment: $comment
   project:
-    name: $project_name
-    version: $project_version
+    name: "groovy.industries"
+    version: "1.0"
   on_boot:
     priority: -100
     then:
       - lambda: |-
           id(sntp_time).update();
 
+substitutions:
+  domain: !secret domain
+
 preferences:
   flash_write_interval: 0s
 
diff --git a/propbox-fan.yaml b/propbox-fan.yaml
index e54a885a479464af62c6cef5b8509cb5c5f70721..067d45777c9a99b8cefb1602a4cbdd087dec92ae 100644
--- a/propbox-fan.yaml
+++ b/propbox-fan.yaml
@@ -1,9 +1,6 @@
 substitutions:
   devicename: "propbox-fan"
-  domain: !secret domain
   comment: "Propagator Fan Control"
-  project_name: "groovy.propbox-fan"
-  project_version: "1.0"
   
   current_res: "0.00280" # Higher value gives lower watt readout
   voltage_div: "775" # Lower value gives lower voltage readout
diff --git a/propbox-light.yaml b/propbox-light.yaml
index b8f1cc867d22cbb9132669bb3bf52c30bdea07df..7d7f34463a0b7fce78e5376fe8c2b4d10fe50f7c 100644
--- a/propbox-light.yaml
+++ b/propbox-light.yaml
@@ -1,9 +1,6 @@
 substitutions:
   devicename: "propbox-light"
-  domain: !secret domain
   comment: "Propagator Light Control"
-  project_name: "groovy.propbox-light"
-  project_version: "1.0"
   
   current_res: "0.00280" # Higher value gives lower watt readout
   voltage_div: "775" # Lower value gives lower voltage readout
diff --git a/propbox.yaml b/propbox.yaml
index 027017aa28710a640eb5ef5ca81cade3838b2322..cf02964c4f4ed68c61cacc0248067c35be505733 100644
--- a/propbox.yaml
+++ b/propbox.yaml
@@ -1,9 +1,6 @@
 substitutions:
   devicename: "propbox"
-  domain: !secret domain
   comment: "Propagator Monitor"
-  project_name: "groovy.propbox"
-  project_version: "1.0"
 
   # Propbox Nodes
   hostname_light: "propbox-light.${domain}"