diff --git a/metadata/ca.farrelltonsolar.classic.yml b/metadata/ca.farrelltonsolar.classic.yml
index 4985899b17..80d6c54341 100644
--- a/metadata/ca.farrelltonsolar.classic.yml
+++ b/metadata/ca.farrelltonsolar.classic.yml
@@ -3,8 +3,8 @@ Categories:
 License: Apache-2.0
 AuthorName: graham22
 AuthorEmail: graham.a.ross@gmail.com
-SourceCode: https://github.com/graham22/Classic
-IssueTracker: https://github.com/graham22/Classic/issues
+SourceCode: https://github.com/ClassicDIY/ClassicMonitor
+IssueTracker: https://github.com/ClassicDIY/ClassicMonitor/issues
 
 Name: MidniteSolar Classic Monitor
 AutoName: Classic
@@ -18,7 +18,7 @@ Description: |-
     MPPT charge controller from Morningstar is also included.
 
 RepoType: git
-Repo: https://github.com/graham22/Classic
+Repo: https://github.com/ClassicDIY/ClassicMonitor
 
 Builds:
   - versionName: 2.0.3