diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fffa5a9..4ea2fa0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - ratgdo32
+      - main
   pull_request:
   schedule:
     - cron: '0 4 * * 1'
@@ -97,7 +97,7 @@ jobs:
 
 
   consolidate:
-    if: github.event_name != 'pull_request' && github.ref == 'refs/heads/ratgdo32'
+    if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
     name: Consolidate firmwares
     runs-on: ubuntu-latest
     needs: build
@@ -119,7 +119,7 @@ jobs:
           path: output
 
   deploy:
-    if: github.event_name != 'pull_request' && github.ref == 'refs/heads/ratgdo32'
+    if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
     name: Deploy to GitHub Pages
     runs-on: ubuntu-latest
     needs: consolidate
diff --git a/base.yaml b/base.yaml
index 895610d..3999d65 100644
--- a/base.yaml
+++ b/base.yaml
@@ -3,7 +3,7 @@ external_components:
   - source:
       type: git
       url: https://github.com/ratgdo/esphome-ratgdo
-      ref: ratgdo32
+      ref: main
     refresh: 1s
   # - source:
   #     type: local
diff --git a/base_drycontact.yaml b/base_drycontact.yaml
index 8265070..d3cd777 100644
--- a/base_drycontact.yaml
+++ b/base_drycontact.yaml
@@ -4,7 +4,7 @@ external_components:
   - source:
       type: git
       url: https://github.com/ratgdo/esphome-ratgdo
-      ref: ratgdo32
+      ref: main
     refresh: 1s
   # - source:
   #     type: local
diff --git a/base_secplusv1.yaml b/base_secplusv1.yaml
index 5266d0f..d217d7c 100644
--- a/base_secplusv1.yaml
+++ b/base_secplusv1.yaml
@@ -4,7 +4,7 @@ external_components:
   - source:
       type: git
       url: https://github.com/ratgdo/esphome-ratgdo
-      ref: ratgdo32
+      ref: main
     refresh: 1s
   # - source:
   #     type: local
diff --git a/static/v32board.yaml b/static/v32board.yaml
index b606582..2c05328 100644
--- a/static/v32board.yaml
+++ b/static/v32board.yaml
@@ -30,7 +30,7 @@ dashboard_import:
 packages:
   remote_package:
     url: https://github.com/ratgdo/esphome-ratgdo
-    ref: ratgdo32
+    ref: main
     files: [base.yaml]
     refresh: 1s
   # remote_package: !include
diff --git a/static/v32board_drycontact.yaml b/static/v32board_drycontact.yaml
index 746e1ed..cba705b 100644
--- a/static/v32board_drycontact.yaml
+++ b/static/v32board_drycontact.yaml
@@ -29,7 +29,7 @@ dashboard_import:
 packages:
   remote_package:
     url: https://github.com/ratgdo/esphome-ratgdo
-    ref: ratgdo32
+    ref: main
     files: [base_drycontact.yaml]
     refresh: 1s
   # remote_package: !include
diff --git a/static/v32board_secplusv1.yaml b/static/v32board_secplusv1.yaml
index 87da7a2..2cb2d6a 100644
--- a/static/v32board_secplusv1.yaml
+++ b/static/v32board_secplusv1.yaml
@@ -30,7 +30,7 @@ dashboard_import:
 packages:
   remote_package:
     url: https://github.com/ratgdo/esphome-ratgdo
-    ref: ratgdo32
+    ref: main
     files: [base_secplusv1.yaml]
     refresh: 1s
   # remote_package: !include
diff --git a/static/v32disco.yaml b/static/v32disco.yaml
index 05f6dd1..edb287a 100644
--- a/static/v32disco.yaml
+++ b/static/v32disco.yaml
@@ -30,7 +30,7 @@ dashboard_import:
 packages:
   remote_package:
     url: https://github.com/ratgdo/esphome-ratgdo
-    ref: ratgdo32
+    ref: main
     files: [base.yaml]
     refresh: 1s
   # remote_package: !include
diff --git a/static/v32disco_drycontact.yaml b/static/v32disco_drycontact.yaml
index 9e5b558..4e45116 100644
--- a/static/v32disco_drycontact.yaml
+++ b/static/v32disco_drycontact.yaml
@@ -29,7 +29,7 @@ dashboard_import:
 packages:
   remote_package:
     url: https://github.com/ratgdo/esphome-ratgdo
-    ref: ratgdo32
+    ref: main
     files: [base_drycontact.yaml]
     refresh: 1s
   # remote_package: !include
diff --git a/static/v32disco_secplusv1.yaml b/static/v32disco_secplusv1.yaml
index dde13c5..f9b3955 100644
--- a/static/v32disco_secplusv1.yaml
+++ b/static/v32disco_secplusv1.yaml
@@ -30,7 +30,7 @@ dashboard_import:
 packages:
   remote_package:
     url: https://github.com/ratgdo/esphome-ratgdo
-    ref: ratgdo32
+    ref: main
     files: [base_secplusv1.yaml]
     refresh: 1s
   # remote_package: !include