diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 20fdc4f..300d99f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     uses: ApolloAutomation/Workflows/.github/workflows/label-check.yml@main
     
   ci:
-    name: Building ${{ matrix.file }}
+    name: Building ${{ matrix.file }} / ESPHome ${{ matrix.esphome-version }} / ESPHome ${{ matrix.esphome-version }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
index f8aae11..9eff38d 100644
--- a/.github/workflows/weekly.yml
+++ b/.github/workflows/weekly.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   build:
-    name: Building ${{ matrix.file }}
+    name: Building ${{ matrix.file }} / ESPHome ${{ matrix.esphome-version }} / ESPHome ${{ matrix.esphome-version }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
diff --git a/Integrations/ESPHome/AIR-1.yaml b/Integrations/ESPHome/AIR-1.yaml
index c02a728..60ffefa 100644
--- a/Integrations/ESPHome/AIR-1.yaml
+++ b/Integrations/ESPHome/AIR-1.yaml
@@ -3,9 +3,6 @@ esphome:
   friendly_name: Apollo AIR-1
   comment: Apollo AIR-1
   name_add_mac_suffix: true
-  platformio_options:
-    board_build.flash_mode: dio
-
   project:
     name: "ApolloAutomation.AIR-1"
     version: "${version}"
@@ -14,6 +11,9 @@ esphome:
   on_boot:
     priority: 500
     then:
+      - text_sensor.template.publish:
+          id: apollo_firmware_version
+          state: "${version}"
       - lambda: |-
           id(deep_sleep_1).set_sleep_duration(id(deep_sleep_sleep_duration).state * 60 * 1000);
       - if:
diff --git a/Integrations/ESPHome/AIR-1_BLE.yaml b/Integrations/ESPHome/AIR-1_BLE.yaml
index e4e8109..5ec6d3c 100644
--- a/Integrations/ESPHome/AIR-1_BLE.yaml
+++ b/Integrations/ESPHome/AIR-1_BLE.yaml
@@ -3,9 +3,6 @@ esphome:
   friendly_name: Apollo AIR-1
   comment: Apollo AIR-1
   name_add_mac_suffix: true
-  platformio_options:
-    board_build.flash_mode: dio
-
   project:
     name: "ApolloAutomation.AIR-1"
     version: "${version}"
diff --git a/Integrations/ESPHome/AIR-1_Factory.yaml b/Integrations/ESPHome/AIR-1_Factory.yaml
index 05f140c..0133d5c 100644
--- a/Integrations/ESPHome/AIR-1_Factory.yaml
+++ b/Integrations/ESPHome/AIR-1_Factory.yaml
@@ -3,9 +3,6 @@ esphome:
   friendly_name: Apollo AIR-1
   comment: Apollo AIR-1 Factory
   name_add_mac_suffix: true
-  platformio_options:
-    board_build.flash_mode: dio
-
   project:
     name: "ApolloAutomation.AIR-1"
     version: "${version}"
@@ -52,11 +49,6 @@ esp32_improv:
   authorizer: none
 
 wifi:
-  on_connect:
-    - delay: 5s
-    - ble.disable:
-  on_disconnect:
-    - ble.enable:
   ap:
     ssid: "Apollo AIR1 Hotspot"
 
diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml
index e33b5cc..64a2eba 100644
--- a/Integrations/ESPHome/Core.yaml
+++ b/Integrations/ESPHome/Core.yaml
@@ -1,10 +1,11 @@
 substitutions:
   name: apollo-air-1
-  version: "25.8.6.1"
+  version: "26.3.2.1"
   device_description: ${name} made by Apollo Automation - version ${version}.
 
 esp32:
-  board: esp32-c3-devkitm-1
+  variant: esp32c3
+  flash_size: 4MB
   framework:
     type: esp-idf
 
@@ -25,16 +26,16 @@ api:
               id(reportAllValues).execute();
           - deep_sleep.enter:
               id: deep_sleep_1
-  services:
-    #Co2 Calibration Service
-    - service: calibrate_co2_value
+  actions:
+    #Co2 Calibration Action
+    - action: calibrate_co2_value
       variables:
         co2_ppm: float
       then:
         - scd4x.perform_forced_calibration:
             value: !lambda "return co2_ppm;"
             id: scd40
-    - service: sen55_clean
+    - action: sen55_clean
       then:
         - sen5x.start_fan_autoclean: sen55
   reboot_timeout: 0s
@@ -43,6 +44,7 @@ captive_portal:
 
 web_server:
   port: 80
+  version: 3
 
 globals:
   - id: cycleCounter
@@ -104,7 +106,21 @@ number:
     update_interval: never
     step: 0.1
     mode: box
-  
+  - platform: template
+    name: "DPS310 Pressure Offset"
+    id: dps310_pressure_offset
+    disabled_by_default: true
+    restore_value: true
+    initial_value: 0.0
+    min_value: -100.0
+    max_value: 100.0
+    entity_category: "CONFIG"
+    unit_of_measurement: "hPa"
+    optimistic: true
+    update_interval: never
+    step: 0.1
+    mode: box
+
   - platform: template
     name: "Sleep Duration"
     id: deep_sleep_sleep_duration
@@ -212,6 +228,10 @@ sensor:
     pressure:
       name: "DPS310 Pressure"
       id: dps310pressure
+      filters:
+        - lambda: |-
+            float offset = id(dps310_pressure_offset).state;
+            return isnan(offset) ? x : x + offset;
     temperature:
       id: dps310temperature
     update_interval: 30s
@@ -237,11 +257,13 @@ sensor:
       accuracy_decimals: 1
     temperature:
       name: "SEN55 Temperature"
-      accuracy_decimals: 1
+      id: sen55_temperature
       filters:
         - lambda: return x - id(sen55_temperature_offset).state;
+      accuracy_decimals: 1
     humidity:
       name: "SEN55 Humidity"
+      id: sen55_humidity
       filters:
         - lambda: return x - id(sen55_humidity_offset).state;
       accuracy_decimals: 1
@@ -305,21 +327,35 @@ sensor:
     icon: mdi:air-filter
     update_interval: 10s
 
+  - platform: aqi
+    name: "NowCast AQI"
+    id: nowcast_aqi
+    pm_2_5: pm_2_5
+    pm_10_0: pm_10_0
+    calculation_type: AQI
+    device_class: aqi
+
   - platform: mics_4514
     id: mics4514
     nitrogen_dioxide:
       name: Nitrogen Dioxide
+      id: nitrogen_dioxide
     carbon_monoxide:
       name: Carbon Monoxide
+      id: carbon_monoxide
     hydrogen:
       name: Hydrogen
+      id: hydrogen
     ethanol:
       name: Ethanol
+      id: ethanol
     methane:
       name: Methane
+      id: methane
     ammonia:
       name: Ammonia
-    update_interval: 10s
+      id: ammonia
+    update_interval: 60s
 
 light:
   - platform: esp32_rmt_led_strip
@@ -390,6 +426,21 @@ text_sensor:
       else {
         return std::string("Unknown");}
 
+  - platform: wifi_info
+    ip_address:
+      name: "IP Address"
+      id: wifi_ip
+      entity_category: "diagnostic"
+  - platform: version
+    name: "ESPHome Version"
+    hide_timestamp: true
+    entity_category: "diagnostic"
+  - platform: template
+    name: "Apollo Firmware Version"
+    id: apollo_firmware_version
+    update_interval: never
+    entity_category: "diagnostic"
+
 switch:
   - platform: factory_reset
     id: factory_reset_switch