diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/ReleaseBranchCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/ReleaseBranchCheckFixture.cs
index 0cbb0a832..391089967 100644
--- a/src/NzbDrone.Core.Test/HealthCheck/Checks/ReleaseBranchCheckFixture.cs
+++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/ReleaseBranchCheckFixture.cs
@@ -34,7 +34,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
         }
 
         [TestCase("develop")]
-        [TestCase("nightly")]
+        [TestCase("v0.2")]
         public void should_return_error_when_branch_is_v1(string branch)
         {
             GivenValidBranch(branch);
@@ -42,8 +42,8 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
             Subject.Check().ShouldBeError();
         }
 
-        [TestCase("aphrodite")]
-        [TestCase("Aphrodite")]
+        [TestCase("nightly")]
+        [TestCase("Nightly")]
         public void should_return_no_warning_when_branch_valid(string branch)
         {
             GivenValidBranch(branch);
diff --git a/src/NzbDrone.Core/HealthCheck/Checks/ReleaseBranchCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/ReleaseBranchCheck.cs
index b1de1b4d7..d4b57787f 100644
--- a/src/NzbDrone.Core/HealthCheck/Checks/ReleaseBranchCheck.cs
+++ b/src/NzbDrone.Core/HealthCheck/Checks/ReleaseBranchCheck.cs
@@ -23,11 +23,16 @@ namespace NzbDrone.Core.HealthCheck.Checks
 
             if (!Enum.GetNames(typeof(ReleaseBranches)).Any(x => x.ToLower() == currentBranch))
             {
-                if (currentBranch == "develop" || currentBranch == "nightly")
+                if (currentBranch == "develop" || currentBranch == "v0.2")
                 {
                     return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format(_localizationService.GetLocalizedString("ReleaseBranchCheckPreviousVersionMessage"), _configFileService.Branch), "#branch-is-for-a-previous-version");
                 }
 
+                if (currentBranch == "aphrodite")
+                {
+                    return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format("Branch 'aphrodite' has been merged, switch to 'nightly' for further V3 development", _configFileService.Branch), "#branch-is-for-a-previous-version");
+                }
+
                 return new HealthCheck(GetType(), HealthCheckResult.Warning, string.Format(_localizationService.GetLocalizedString("ReleaseBranchCheckOfficialBranchMessage"), _configFileService.Branch), "#branch-is-not-a-valid-release-branch");
             }
 
@@ -36,7 +41,7 @@ namespace NzbDrone.Core.HealthCheck.Checks
 
         public enum ReleaseBranches
         {
-            Aphrodite
+            Nightly
         }
     }
 }
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index 77544fe49..19e8a3dcb 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -564,7 +564,7 @@
   "RejectionCount": "Rejection Count",
   "RelativePath": "Relative Path",
   "ReleaseBranchCheckOfficialBranchMessage": "Branch {0} is not a valid Radarr release branch, you will not receive updates",
-  "ReleaseBranchCheckPreviousVersionMessage": "Branch {0} is for a previous version of Radarr, set branch to 'Aphrodite' for further updates",
+  "ReleaseBranchCheckPreviousVersionMessage": "Branch {0} is for a previous version of Radarr, set branch to 'Nightly' for further updates",
   "ReleaseDates": "Release Dates",
   "ReleaseGroup": "Release Group",
   "ReleaseRejected": "Release Rejected",