diff --git a/base.yaml b/base.yaml
index 5042f8a..c3c232d 100644
--- a/base.yaml
+++ b/base.yaml
@@ -3,7 +3,7 @@
 external_components:
   - source:
       type: git
-      url: https://github.com/esphome-ratgdo/esphome-ratgdo
+      url: https://github.com/ratgdo/esphome-ratgdo
     refresh: 1s
 
 preferences:
diff --git a/library.json b/library.json
index d26b2fa..cc9a6d3 100644
--- a/library.json
+++ b/library.json
@@ -5,7 +5,7 @@
     "keywords": "ratgdo, esphome",
     "repository": {
         "type": "git",
-        "url": "https://github.com/esphome-ratgdo/esphome-ratgdo"
+        "url": "https://github.com/ratgdo/esphome-ratgdo"
     },
     "authors": [],
     "license": "GPLv3",
diff --git a/static/v2board_esp32_d1_mini.yaml b/static/v2board_esp32_d1_mini.yaml
index 70199b0..d615309 100644
--- a/static/v2board_esp32_d1_mini.yaml
+++ b/static/v2board_esp32_d1_mini.yaml
@@ -25,11 +25,11 @@ esp32:
   board: wemos_d1_mini32
 
 dashboard_import:
-  package_import_url: github://esphome-ratgdo/esphome-ratgdo/v2board_esp32_d1_mini.yaml@main
+  package_import_url: github://ratgdo/esphome-ratgdo/v2board_esp32_d1_mini.yaml@main
 
 packages:
   remote_package:
-    url: https://github.com/esphome-ratgdo/esphome-ratgdo
+    url: https://github.com/ratgdo/esphome-ratgdo
     files: [base.yaml]
     refresh: 1s
 
diff --git a/static/v2board_esp8266_d1_mini_lite.yaml b/static/v2board_esp8266_d1_mini_lite.yaml
index 939c174..75f0c12 100644
--- a/static/v2board_esp8266_d1_mini_lite.yaml
+++ b/static/v2board_esp8266_d1_mini_lite.yaml
@@ -26,11 +26,11 @@ esp8266:
   restore_from_flash: true
 
 dashboard_import:
-  package_import_url: github://esphome-ratgdo/esphome-ratgdo/v2board_esp8266_d1_mini_lite.yaml@main
+  package_import_url: github://ratgdo/esphome-ratgdo/v2board_esp8266_d1_mini_lite.yaml@main
 
 packages:
   remote_package:
-    url: https://github.com/esphome-ratgdo/esphome-ratgdo
+    url: https://github.com/ratgdo/esphome-ratgdo
     files: [base.yaml]
     refresh: 1s