diff --git a/.github/ISSUE_TEMPLATE/10-bug-report.yml b/.github/ISSUE_TEMPLATE/10-bug-report.yml
index 3f443af..1d7c189 100644
--- a/.github/ISSUE_TEMPLATE/10-bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/10-bug-report.yml
@@ -11,7 +11,7 @@ body:
         Please, before submitting, make sure that:
 
         - There is not an [existing issue](https://github.com/JuliaAstro/SolarPosition.jl/issues) with the same question
-        - You have read the [contributing guide](https://JuliaAstro.github.io/SolarPosition.jl/dev/contributing/)
+        - You have read the [contributing guide](https://juliaastro.org/SolarPosition.jl/dev/contributing/)
         The form below should help you in filling out this issue.
   - type: textarea
     id: description
diff --git a/.github/ISSUE_TEMPLATE/20-feature-request.yml b/.github/ISSUE_TEMPLATE/20-feature-request.yml
index 4d4c29f..a7b0106 100644
--- a/.github/ISSUE_TEMPLATE/20-feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/20-feature-request.yml
@@ -9,7 +9,7 @@ body:
         Please, before submitting, make sure that:
 
         - There is not an [existing issue](https://github.com/JuliaAstro/SolarPosition.jl/issues) with the same question
-        - You have read the [contributing guide](https://JuliaAstro.github.io/SolarPosition.jl/dev/contributing/)
+        - You have read the [contributing guide](https://juliaastro.org/SolarPosition.jl/dev/contributing/)
         The form below should help you in filling out this issue.
   - type: textarea
     id: description
diff --git a/.github/ISSUE_TEMPLATE/30-usage.yml b/.github/ISSUE_TEMPLATE/30-usage.yml
index 6b80f6f..f8c6457 100644
--- a/.github/ISSUE_TEMPLATE/30-usage.yml
+++ b/.github/ISSUE_TEMPLATE/30-usage.yml
@@ -9,9 +9,9 @@ body:
 
         Please, before submitting, make sure that:
 
-        - You have checked the [documentation](https://JuliaAstro.github.io/SolarPosition.jl) and haven't found enough information
+        - You have checked the [documentation](https://juliaastro.org/SolarPosition.jl/dev/) and haven't found enough information
         - There is not an [existing issue](https://github.com/JuliaAstro/SolarPosition.jl/issues) with the same question
-        - You have read the [contributing guide](https://JuliaAstro.github.io/SolarPosition.jl/dev/contributing/)
+        - You have read the [contributing guide](https://juliaastro.org/SolarPosition.jl/dev/contributing/)
         The form below should help you in filling out this issue.
   - type: textarea
     id: description
diff --git a/.github/ISSUE_TEMPLATE/99-general.yml b/.github/ISSUE_TEMPLATE/99-general.yml
index 387157d..d475860 100644
--- a/.github/ISSUE_TEMPLATE/99-general.yml
+++ b/.github/ISSUE_TEMPLATE/99-general.yml
@@ -9,7 +9,7 @@ body:
         Please, before submitting, make sure that:
 
         - There is not an [existing issue](https://github.com/JuliaAstro/SolarPosition.jl/issues) with the same question
-        - You have read the [contributing guide](https://JuliaAstro.github.io/SolarPosition.jl/dev/contributing/)
+        - You have read the [contributing guide](https://juliaastro.org/SolarPosition.jl/dev/contributing/)
         The form below should help you in filling out this issue.
   - type: textarea
     id: description
diff --git a/README.md b/README.md
index 65f23e9..07de3da 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 # SolarPosition.jl
 
-[![Stable](https://img.shields.io/badge/docs-stable-blue.svg)](https://JuliaAstro.github.io/SolarPosition.jl/stable)
-[![Development documentation](https://img.shields.io/badge/docs-dev-blue.svg)](https://JuliaAstro.github.io/SolarPosition.jl/dev)
+[![Stable](https://img.shields.io/badge/docs-stable-blue.svg)](https://juliaastro.org/SolarPosition/stable/)
+[![Development documentation](https://img.shields.io/badge/docs-dev-blue.svg)](https://juliaastro.org/SolarPosition.jl/dev/)
+
 [![Test workflow status](https://github.com/JuliaAstro/SolarPosition.jl/actions/workflows/Test.yml/badge.svg?branch=main)](https://github.com/JuliaAstro/SolarPosition.jl/actions/workflows/Test.yml?query=branch%3Amain)
 [![Coverage](https://codecov.io/gh/JuliaAstro/SolarPosition.jl/branch/main/graph/badge.svg)](https://codecov.io/gh/JuliaAstro/SolarPosition.jl)
 [![Lint workflow Status](https://github.com/JuliaAstro/SolarPosition.jl/actions/workflows/Lint.yml/badge.svg?branch=main)](https://github.com/JuliaAstro/SolarPosition.jl/actions/workflows/Lint.yml?query=branch%3Amain)
@@ -85,4 +86,4 @@ If you use SolarPosition.jl in your work, please cite using the reference given
 
 ## Contributing
 
-If you want to make contributions of any kind, please first that a look into our [contributing guide directly on GitHub](docs/src/contributing.md) or the [contributing page on the website](https://JuliaAstro.github.io/SolarPosition.jl/dev/contributing/)
+If you want to make contributions of any kind, please first that a look into our [contributing guide directly on GitHub](docs/src/contributing.md) or the [contributing page on the website](https://juliaastro.org/SolarPosition/stable/contributing/)
diff --git a/docs/make.jl b/docs/make.jl
index 8651162..d88a76a 100644
--- a/docs/make.jl
+++ b/docs/make.jl
@@ -28,7 +28,7 @@ makedocs(;
     repo = Documenter.Remotes.GitHub("JuliaAstro", "SolarPosition.jl"),
     sitename = "SolarPosition.jl",
     format = Documenter.HTML(;
-        canonical = "https://JuliaAstro.github.io/SolarPosition.jl",
+        canonical = "https://juliaastro.org/SolarPosition/stable/",
         size_threshold = 2^20, # 1 MB
     ),
     plugins = [bib],
@@ -46,6 +46,6 @@ makedocs(;
 
 deploydocs(;
     repo = "github.com/JuliaAstro/SolarPosition.jl",
-    versions = ["stable" => "v^", "v#.#", "dev" => "dev"],
+    versions = ["stable" => "v^", "v#.#"], # Restrict to minor releases
     push_preview = true,
 )
diff --git a/docs/src/index.md b/docs/src/index.md
index 91c8f3c..777a402 100644
--- a/docs/src/index.md
+++ b/docs/src/index.md
@@ -6,6 +6,7 @@ CurrentModule = SolarPosition
 
 ## SolarPosition.jl
 
+[![Development documentation](https://img.shields.io/badge/docs-dev-blue.svg)](https://juliaastro.org/SolarPosition.jl/dev/)
 [![Test workflow status](https://github.com/JuliaAstro/SolarPosition.jl/actions/workflows/Test.yml/badge.svg?branch=main)](https://github.com/JuliaAstro/SolarPosition.jl/actions/workflows/Test.yml?query=branch%3Amain)
 [![Coverage](https://codecov.io/gh/JuliaAstro/SolarPosition.jl/branch/main/graph/badge.svg)](https://codecov.io/gh/JuliaAstro/SolarPosition.jl)
 [![Lint workflow Status](https://github.com/JuliaAstro/SolarPosition.jl/actions/workflows/Lint.yml/badge.svg?branch=main)](https://github.com/JuliaAstro/SolarPosition.jl/actions/workflows/Lint.yml?query=branch%3Amain)
@@ -81,4 +82,4 @@ If you use SolarPosition.jl in your work, please cite using the reference given
 
 ## Contributing
 
-If you want to make contributions of any kind, please first that a look into our [contributing guide directly on GitHub](https://github.com/JuliaAstro/SolarPosition.jl/blob/main/docs/src/contributing.md) or the [contributing page on the website](https://JuliaAstro.github.io/SolarPosition.jl/dev/contributing/)
+If you want to make contributions of any kind, please first that a look into our [contributing guide directly on GitHub](https://github.com/JuliaAstro/SolarPosition.jl/blob/main/docs/src/contributing.md) or the [contributing page on the website](https://juliaastro.org/SolarPosition/stable/contributing/)