diff --git a/CHANGELOG.md b/CHANGELOG.md
index bdd16327..5ef0549d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,71 +7,71 @@
 ### Added
 
 - Added and create a schema for fortls configuration files
-  ([#204](https://github.com/gnikit/fortls/issues/204))
+  ([#204](https://github.com/fortran-lang/fortls/issues/204))
 - Added dependabot alers for PyPi
-  ([#222](https://github.com/gnikit/fortls/issues/222))
+  ([#222](https://github.com/fortran-lang/fortls/issues/222))
 - Added `CITATION.cff` file to project roots
 
 ### Changed
 
 - Changed the completion signature to include the full Markdown documentation
   for the completion item.
-  ([#219](https://github.com/gnikit/fortls/issues/219))
+  ([#219](https://github.com/fortran-lang/fortls/issues/219))
 - Changed hover messages and signature help to use Markdown
-  ([#45](https://github.com/gnikit/fortls/issues/45))
+  ([#45](https://github.com/fortran-lang/fortls/issues/45))
 
 ### Fixed
 
 - Fixed debug interface parser not loading all configuration files
-  ([#221](https://github.com/gnikit/fortls/issues/221))
+  ([#221](https://github.com/fortran-lang/fortls/issues/221))
 - Fixed name mangling of type-bound procedure pointers while hovering
-  ([#214](https://github.com/gnikit/fortls/issues/214))
+  ([#214](https://github.com/fortran-lang/fortls/issues/214))
 - Fixed parsing start of multilines into AST
-  ([#217](https://github.com/gnikit/fortls/issues/217))
+  ([#217](https://github.com/fortran-lang/fortls/issues/217))
 
 ## 2.13.0
 
 ### Added
 
 - Added additional default configuration file names `.fortlsrc`, `.fortls.json`
-  ([#184](https://github.com/gnikit/fortls/issues/184))
+  ([#184](https://github.com/fortran-lang/fortls/issues/184))
 - Added coverage testing for multiple Python versions
-  ([#168](https://github.com/gnikit/fortls/pull/178))
+  ([#168](https://github.com/fortran-lang/fortls/pull/178))
 - Added pre-commit.ci to `fortls`
-  ([#168](https://github.com/gnikit/fortls/issues/168))
+  ([#168](https://github.com/fortran-lang/fortls/issues/168))
 
 ### Fixed
 
 - Fixed `intent(in out)` not being parsed correctly
-  ([#160](https://github.com/gnikit/fortls/issues/160))
+  ([#160](https://github.com/fortran-lang/fortls/issues/160))
 
 ## 2.12.0
 
 ### Fixed
 
 - Fixed issue where `pip` would install without `--user` and fail
-  ([#163](https://github.com/gnikit/fortls/issues/163))
+  ([#163](https://github.com/fortran-lang/fortls/issues/163))
 
 ## 2.11.0
 
 ### Fixed
 
 - Fixed bug thorowing diagnostic errors if arguments were named `pure`, `elemental`, etc.
-  ([#157](https://github.com/gnikit/fortls/issues/157))
+  ([#157](https://github.com/fortran-lang/fortls/issues/157))
 
 ## 2.10.0
 
 ### Fixed
 
 - Fixed `workspace/didChangeConfiguration` requests that caused errors in VS Code logs
-  ([#114](https://github.com/gnikit/fortls/issues/114))
+  ([#114](https://github.com/fortran-lang/fortls/issues/114))
 
 ## 2.9.0
 
 ### Fixed
 
 - Fixed glob pattern resolution for command line arguments
-  ([#142](https://github.com/gnikit/fortls/issues/142))
+  ([#142](https://github.com/fortran-lang/fortls/issues/142))
 
 ### Changed
 
@@ -79,63 +79,63 @@
   interface and the `json` interface are used. Instead of having the `json` interface
   default the values to an empty set it now defaults to the values of the
   command line: `excl_paths`, `source_dirs`, `incl_suffixes`, `excl_suffixes`, `include_dirs`
-  ([#143](https://github.com/gnikit/fortls/issues/143))
+  ([#143](https://github.com/fortran-lang/fortls/issues/143))
 
 ## 2.8.0
 
 ### Added
 
 - Added support for comments in the `json` configuration files
-  ([#137](https://github.com/gnikit/fortls/issues/137))
+  ([#137](https://github.com/fortran-lang/fortls/issues/137))
 - Added `sitemap.xml` to documentation webpage
-  ([#134](https://github.com/gnikit/fortls/pull/134))
+  ([#134](https://github.com/fortran-lang/fortls/pull/134))
 
 ### Fixed
 
 - Fixed bug where error messages did not post correctly
-  ([#135](https://github.com/gnikit/fortls/issues/135))
+  ([#135](https://github.com/fortran-lang/fortls/issues/135))
 
 ## 2.7.0
 
 ### Added
 
 - Added doctests in the pytest test suite
-  ([#131](https://github.com/gnikit/fortls/issues/131))
+  ([#131](https://github.com/fortran-lang/fortls/issues/131))
 
 ### Changed
 
 - Renamed variables to simplify parser
-  ([#133](https://github.com/gnikit/fortls/pull/133))
+  ([#133](https://github.com/fortran-lang/fortls/pull/133))
 - Redesigned parsing functions for short-hand declarations of array dimensions,
   character length and parsing of kind
-  ([#130](https://github.com/gnikit/fortls/pull/130))
+  ([#130](https://github.com/fortran-lang/fortls/pull/130))
 
 ## 2.6.0
 
 ### Changed
 
 - Redesigned the `fortls` website to be more aesthetically pleasing and user-friendly
-  ([#112](https://github.com/gnikit/fortls/issues/112))
+  ([#112](https://github.com/fortran-lang/fortls/issues/112))
 
 ### Fixed
 
 - Fixed bug where submodule procedure scopes would terminate early if keyword modifiers were used
-  ([#119](https://github.com/gnikit/fortls/issues/119))
+  ([#119](https://github.com/fortran-lang/fortls/issues/119))
 
 ## 2.5.0
 
 ### Added
 
 - Added `textDocument/documentHighlight` request for Vim and EMACS
-  ([#43](https://github.com/gnikit/fortls/issues/43))
+  ([#43](https://github.com/fortran-lang/fortls/issues/43))
 - Added `pre-commit` hook with `flake`, `black`, `isort` and `pyupgrade`
-  ([#106](https://github.com/gnikit/fortls/issues/106))
+  ([#106](https://github.com/fortran-lang/fortls/issues/106))
 - Added test support for diagnostic messages
 
 ### Changed
 
 - Changed code structure, reformatted files and changed name conventions
-  ([#109](https://github.com/gnikit/fortls/issues/109))
+  ([#109](https://github.com/fortran-lang/fortls/issues/109))
 - Updated CONTRIBUTING instructions
 
 ## 2.4.0
@@ -144,15 +144,15 @@
 
 - Added multiple unittests for diagnostic messages
 - Added `pre-commit` hook to the project
-  ([#106](https://github.com/gnikit/fortls/issues/106))
+  ([#106](https://github.com/fortran-lang/fortls/issues/106))
 - Added Code of Conduct
 - Added basic support for hovering over `ASSOCIATE` blocks
-  ([#62](https://github.com/gnikit/fortls/issues/62))
+  ([#62](https://github.com/fortran-lang/fortls/issues/62))
 
 ### Changed
 
 - Changed the naming convention for Fortran Objects
-  ([#109](https://github.com/gnikit/fortls/issues/109))
+  ([#109](https://github.com/fortran-lang/fortls/issues/109))
 - Formatted all files with `pre-commit`
 
 ## 2.3.1
@@ -160,14 +160,14 @@
 ### Fixed
 
 - Fixed remote coverage report line diff
-  ([#101](https://github.com/gnikit/fortls/issues/101))
+  ([#101](https://github.com/fortran-lang/fortls/issues/101))
 
 ## 2.3.0
 
 ### Added
 
 - Added keywords to the PyPi manifest
-  ([#99](https://github.com/gnikit/fortls/issues/99))
+  ([#99](https://github.com/fortran-lang/fortls/issues/99))
 
 ### Changed
 
@@ -201,14 +201,14 @@
 ### Added
 
 - Improved autocompletion for Fortran statements F2018 compliant
-  ([#63](https://github.com/gnikit/fortls/issues/63))
+  ([#63](https://github.com/fortran-lang/fortls/issues/63))
 
 ## 2.2.10
 
 ### Fixed
 
 - Fixes GoTo Implementation error for intrinsics
-  ([#80](https://github.com/gnikit/fortls/issues/80))
+  ([#80](https://github.com/fortran-lang/fortls/issues/80))
 
 ## 2.2.9
 
@@ -234,7 +234,7 @@
 ### Fixed
 
 - Fixed missing dependency from `setup.cfg`
-  ([#78](https://github.com/gnikit/fortls/issues/78))
+  ([#78](https://github.com/fortran-lang/fortls/issues/78))
 - Updated configuration file variables in documentation
 
 ## 2.2.6
@@ -242,12 +242,12 @@
 ### Added
 
 - Added the capability for `fortls` to auto-update use `--disable_autoupdate` to disable
-  ([#76](https://github.com/gnikit/fortls/issues/76))
+  ([#76](https://github.com/fortran-lang/fortls/issues/76))
 
 ## Deprecated
 
 - Deprecated `--variable_hover` option and now is always enabled
-  ([#46](https://github.com/gnikit/fortls/issues/46))
+  ([#46](https://github.com/fortran-lang/fortls/issues/46))
 
 ## 2.2.5
 
@@ -259,41 +259,41 @@
 ### Fixed
 
 - Fixed parsing of `defined` without by parenthesis surrounding the definition
-  ([#67](https://github.com/gnikit/fortls/pull/67))
+  ([#67](https://github.com/fortran-lang/fortls/pull/67))
 
 ## 2.2.4
 
 ### Fixed
 
 - Fixed hovering value of literal and constant strings not displaying
-  ([#54](https://github.com/gnikit/fortls/issues/54))
+  ([#54](https://github.com/fortran-lang/fortls/issues/54))
 - Fixed hovering string length size is now matching the string
-  ([#55](https://github.com/gnikit/fortls/issues/55))
+  ([#55](https://github.com/fortran-lang/fortls/issues/55))
 - Fixed space separated keywords not being displayed upon hover
-  ([#60](https://github.com/gnikit/fortls/issues/60))
+  ([#60](https://github.com/fortran-lang/fortls/issues/60))
 
 ## 2.2.3
 
 ### Changed
 
 - Changed reading in `json` files to be encoded as UTF-8
-  ([#51](https://github.com/gnikit/fortls/pull/51))
+  ([#51](https://github.com/fortran-lang/fortls/pull/51))
 
 ## 2.2.2
 
 ### Changed
 
 - Changed the way function hover messages are displayed, now signatures are standardised
-  ([gnikit/fortls#47](https://github.com/gnikit/fortls/issues/47))
+  ([#47](https://github.com/fortran-lang/fortls/issues/47))
 
 ### Fixed
 
 - Fixed hovering over functions displaying as theire result types
-  ([gnikit/fortls#22](https://github.com/gnikit/fortls/issues/22))
+  ([#22](https://github.com/fortran-lang/fortls/issues/22))
 - Fixed function modifiers not displaying upon hover
-  ([gnikit/fortls#48](https://github.com/gnikit/fortls/issues/48))
+  ([#48](https://github.com/fortran-lang/fortls/issues/48))
 - Fixed function hover when returning arrays
-  ([gnikit/fortls#50](https://github.com/gnikit/fortls/issues/50))
+  ([#50](https://github.com/fortran-lang/fortls/issues/50))
 
 ## 2.2.1
 
@@ -306,12 +306,12 @@
 ### Added
 
 - Added semantic versioning with `setuptools_scm`
-  ([gnikit/fortls#34](https://github.com/gnikit/fortls/issues/34))
+  ([#34](https://github.com/fortran-lang/fortls/issues/34))
 
 ### Changed
 
 - Changes from `setup.py` to `setup.toml` and `pyproject.toml`
-  ([gnikit/fortls#33](https://github.com/gnikit/fortls/issues/33))
+  ([#33](https://github.com/fortran-lang/fortls/issues/33))
 - Changed documentation CI to up to date action
 - Formatted Python imports with `isort`
 
@@ -339,9 +339,9 @@
 ### Fixed
 
 - Fixed global `sort_keywords` option not propagating during parsing on Windows
-  ([gnikit/fortls#36](https://github.com/gnikit/fortls/issues/36))
+  ([#36](https://github.com/fortran-lang/fortls/issues/36))
 - Fixed unittests not propagating debugger state
-  ([gnikit/fortls#35](https://github.com/gnikit/fortls/issues/35))
+  ([#35](https://github.com/fortran-lang/fortls/issues/35))
 
 ## 2.0.1
 
@@ -360,7 +360,7 @@
 - Fixed some mutable default argument warnings in methods and classes
 - Fixed private variables showing in autocomplete
   ([#191](https://github.com/hansec/fortran-language-server/issues/191))
-  ([gnikit/fortls#3](https://github.com/gnikit/fortls/issues/3))
+  ([#3](https://github.com/fortran-lang/fortls/issues/3))
 
 ## 2.0.0
 
@@ -380,7 +380,7 @@
 - Format json files with `prettier`
 - Initialises the log channel and adds `$/setTrace` to override client's (i.e. VS Code) loglevel
 - Unified the interfaces from the command line and the configuration options file
-  ([gnikit/fortls#17](https://github.com/gnikit/fortls/issues/17))
+  ([#17](https://github.com/fortran-lang/fortls/issues/17))
 - Updated the documentation and simplified the README.md
 
 ### Deprecated
@@ -395,17 +395,17 @@
 - Fixes objects marked `EXTERNAL` across multiple lines
   ([#169](https://github.com/hansec/fortran-language-server/issues/169))
 - Fixes include with external files
-  ([gnikit/fortls#13](https://github.com/gnikit/fortls/issues/13))
+  ([#13](https://github.com/fortran-lang/fortls/issues/13))
 - `POINTER` attribute now displays upon hover
-  ([gnikit/fortls#16](https://github.com/gnikit/fortls/issues/16))
+  ([#16](https://github.com/fortran-lang/fortls/issues/16))
 - Fixes `END FORALL` end of scope error
-  ([gnikit/fortls#18](https://github.com/gnikit/fortls/issues/18))
+  ([#18](https://github.com/fortran-lang/fortls/issues/18))
 - Fixes Fortran line continuation definitions intermingled with preprocessor directives
   ([#203](https://github.com/hansec/fortran-language-server/issues/203))
-  ([gnikit/fortls#4](https://github.com/gnikit/fortls/issues/4))
+  ([#4](https://github.com/fortran-lang/fortls/issues/4))
 - Fixes `USE` directive ordering issues
   ([#184](https://github.com/hansec/fortran-language-server/issues/184))
-  ([gnikit/fortls#7](https://github.com/gnikit/fortls/issues/7))
+  ([#7](https://github.com/fortran-lang/fortls/issues/7))
 
 ## 1.16.0
 
@@ -413,7 +413,7 @@
 
 - Adds value for `PARAMETER` variables on hover
   ([#116](https://github.com/hansec/fortran-language-server/issues/116))
-  ([gnikit/fortls#1](https://github.com/gnikit/fortls/issues/1))
+  ([#1](https://github.com/fortran-lang/fortls/issues/1))
 
 ## 1.15.2
 
@@ -426,7 +426,7 @@
 ### Fixed
 
 - Fixes premature end of scope with variables named `end`
-  ([gnikit/fortls#9](https://github.com/gnikit/fortls/issues/9))
+  ([#9](https://github.com/fortran-lang/fortls/issues/9))
 
 ## 1.15.0
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8e2bde23..26544940 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,15 +4,15 @@
 
 In this file you will find all the steps necessary to guide you through your first contribution to the project.
 
-Please note our [Code of Conduct](https://github.com/gnikit/fortls/blob/master/CODE_OF_CONDUCT.md) and adhere to it in all your interactions with this project.
+Please note our [Code of Conduct](https://github.com/fortran-lang/fortls/blob/master/CODE_OF_CONDUCT.md) and adhere to it in all your interactions with this project.
 
 ## 📚 Getting Started
 
-A good place to start is the [Issues tab](https://github.com/gnikit/fortls/issues) on GitHub. Look for any issues with the `help wanted` tag.
+A good place to start is the [Issues tab](https://github.com/fortran-lang/fortls/issues) on GitHub. Look for any issues with the `help wanted` tag.
 
 ### Downloading ⬇️
 
-Firstly, fork the repository from <https://github.com/gnikit/fortls>.
+Firstly, fork the repository from <https://github.com/fortran-lang/fortls>.
 
 Then clone the forked repository into your local machine.
 
@@ -70,4 +70,4 @@ You can find varisous test examples in the `tests` directory.
 
 ### Merging
 
-To merge your changes to the main `fortls` repository push your branch on GitHub and open a [Pull Request](https://github.com/gnikit/fortls/pulls). Ping `@gnikit` to review your PR.
+To merge your changes to the main `fortls` repository push your branch on GitHub and open a [Pull Request](https://github.com/fortran-lang/fortls/pulls). Ping `@gnikit` to review your PR.
diff --git a/README.md b/README.md
index 561141fe..dd9bd717 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![alt](https://raw.githubusercontent.com/gnikit/fortls/master/assets/logo.png)
+![alt](https://raw.githubusercontent.com/fortran-lang/fortls/master/assets/logo.png)
 
 # fortls - Fortran Language Server
 
@@ -6,29 +6,29 @@
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/fortls?style=flat-square)
 [![PyPi Downloads via PePy](https://img.shields.io/badge/dynamic/json?style=flat-square&color&maxAge=86400&label=PyPi%20Downloads&query=%24.total_downloads&url=https%3A%2F%2Fapi.pepy.tech%2Fapi%2Fprojects%2Ffortls)](https://pepy.tech/project/fortls)
 ![Conda](https://img.shields.io/conda/dn/conda-forge/fortls?label=Anaconda&style=flat-square)
-![GitHub License](https://img.shields.io/github/license/gnikit/fortls?style=flat-square)
-![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/gnikit/fortls/Tests/master?label=CI&style=flat-square)
-![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/gnikit/fortls/Docs/master?label=Docs&style=flat-square)
-![Codecov](https://img.shields.io/codecov/c/github/gnikit/fortls?style=flat-square)
+![GitHub License](https://img.shields.io/github/license/fortran-lang/fortls?style=flat-square)
+![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/fortran-lang/fortls/Tests/master?label=CI&style=flat-square)
+![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/fortran-lang/fortls/Docs/master?label=Docs&style=flat-square)
+![Codecov](https://img.shields.io/codecov/c/github/fortran-lang/fortls?style=flat-square)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg?style=flat-square)](https://github.com/psf/black)
-![GitHub Repo stars](https://img.shields.io/github/stars/gnikit/fortls?color=yellow&style=flat-square)
+![GitHub Repo stars](https://img.shields.io/github/stars/fortran-lang/fortls?color=yellow&style=flat-square)
 
 [<img alt="https://github.com/sponsors/gnikit" src="https://img.shields.io/static/v1?style=social&label=Sponsor&message=%E2%9D%A4&logo=GitHub&color&link=%3Curl%3E" height="30" />](https://github.com/sponsors/gnikit)
 [<img alt="https://paypal.me/inikit" src="https://img.shields.io/static/v1?style=social&label=Donate&message=%E2%9D%A4&logo=Paypal&color&link=%3Curl%3E" height="30" />](https://paypal.me/inikit)
 
-![alt](https://raw.githubusercontent.com/gnikit/fortls/master/assets/animations/intro-demo.gif)
+![alt](https://raw.githubusercontent.com/fortran-lang/fortls/master/assets/animations/intro-demo.gif)
 
 `fortls` is an implementation of the [Language Server Protocol](https://github.com/Microsoft/language-server-protocol)
 (LSP) for Fortran using Python (3.7+).
 
 All code editors that support LSP can integrate with `fortls` see the section
-[Editor Integration](https://gnikit.github.io/fortls/editor_integration.html#editor-integration) in the documentation.
+[Editor Integration](https://fortls.fortran-lang.org/editor_integration.html#editor-integration) in the documentation.
 Some supported code editors include:
-[Visual Studio Code](https://gnikit.github.io/fortls/editor_integration.html#visual-studio-code),
-[Atom](https://gnikit.github.io/fortls/editor_integration.html#atom),
-[Sublime Text](https://gnikit.github.io/fortls/editor_integration.html#sublime-text),
-[(Neo)Vim](https://gnikit.github.io/fortls/editor_integration.html#vim-neovim-gvim),
-and [Emacs](https://gnikit.github.io/fortls/editor_integration.html#emacs).
+[Visual Studio Code](https://fortls.fortran-lang.org/editor_integration.html#visual-studio-code),
+[Atom](https://fortls.fortran-lang.org/editor_integration.html#atom),
+[Sublime Text](https://fortls.fortran-lang.org/editor_integration.html#sublime-text),
+[(Neo)Vim](https://fortls.fortran-lang.org/editor_integration.html#vim-neovim-gvim),
+and [Emacs](https://fortls.fortran-lang.org/editor_integration.html#emacs).
 
 ## Features
 
@@ -72,7 +72,7 @@ This project was originally based on `fortran-language-server` LSP implementatio
 the original `fortran-language-server` does not.
 
 For a complete and detailed list of the differences between the two Language Servers
-see the Documentation section: [Unique fortls features (not in fortran-language-server)](https://gnikit.github.io/fortls/fortls_changes.html)
+see the Documentation section: [Unique fortls features (not in fortran-language-server)](https://fortls.fortran-lang.org/fortls_changes.html)
 
 The name of executable for this project has been chosen to remain `fortls`
 to allow for integration with pre-existing plugins and workflows, but it could
@@ -119,7 +119,7 @@ conda install -c conda-forge fortls
 `fortls` can be configured through both the command line e.g.
 `fortls --hover_signature` or through a Configuration json file.
 The two interfaces are identical and a full list of the available options can
-be found in the [Documentation](https://gnikit.github.io/fortls/options.html)
+be found in the [Documentation](https://fortls.fortran-lang.org/options.html)
 or through `fortls -h`
 
 An example for a Configuration file is given below
@@ -172,14 +172,14 @@ If you want to support this project you can do it through
 
 ## Bug reports
 
-When [filing bugs](https://github.com/gnikit/fortls/issues/new)
+When [filing bugs](https://github.com/fortran-lang/fortls/issues/new)
 please provide example code to reproduce the observed issue.
 
 ## Security Policy
 
 To report a security vulnerability please follow the instructions in our
-[Security page](https://github.com/gnikit/fortls/security/policy).
+[Security page](https://github.com/fortran-lang/fortls/security/policy).
 
 ## License
 
-This project is made available under the [MIT License](https://github.com/gnikit/fortls/blob/master/LICENSE).
+This project is made available under the [MIT License](https://github.com/fortran-lang/fortls/blob/master/LICENSE).
diff --git a/SECURITY.md b/SECURITY.md
index 8a44efdc..ae58b710 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -9,4 +9,4 @@ For Anaconda environments the autoupdate functionality is disabled and it is up
 ## Reporting a Vulnerability
 
 The codebase is regularly scanned and patched for any potential security vulnerabilities.
-If you manage to find a vulnerability in the Language Server please open an [Bug Report](https://github.com/gnikit/fortls/issues) with prefix: **SECURITY:**.
+If you manage to find a vulnerability in the Language Server please open an [Bug Report](https://github.com/fortran-lang/fortls/issues) with prefix: **SECURITY:**.
diff --git a/assets/README.md b/assets/README.md
index fe0093f3..a9d6f669 100644
--- a/assets/README.md
+++ b/assets/README.md
@@ -1,6 +1,6 @@
 # Info about Licenses
 
-All the contents of this directory (original URL: <https://github.com/gnikit/fortls/tree/master/assets>) and any subsequent directories or links or copies of this directory
+All the contents of this directory (original URL: <https://github.com/fortran-lang/fortls/tree/master/assets>) and any subsequent directories or links or copies of this directory
 are licensed under the
 [Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International](https://creativecommons.org/licenses/by-nc-nd/4.0/) license.
 
diff --git a/docs/conf.py b/docs/conf.py
index 854dd1fa..3079aaa3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -107,7 +107,7 @@
 html_title = "fortls"
 html_logo = "../assets/logo.svg"
 html_favicon = "../assets/icon.svg"
-html_baseurl = "https://gnikit.github.io/fortls/"
+html_baseurl = "https://fortls.fortran-lang.org/"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
diff --git a/docs/contact.rst b/docs/contact.rst
index 42e6a89c..2b7c717d 100644
--- a/docs/contact.rst
+++ b/docs/contact.rst
@@ -10,8 +10,8 @@ Is there a feature missing that you would like to see or have you spotted a bug?
 
 You can reach out in a number of ways:
 
-- Start a `GitHub Discussion <https://github.com/gnikit/fortls/discussions>`__.
+- Start a `GitHub Discussion <https://github.com/fortran-lang/fortls/discussions>`__.
 - Ask a question on `Fortran Language Discourse <https://fortran-lang.discourse.group/>`__ and tag `@gnikit <https://fortran-lang.discourse.group/u/gnikit/>`__ in your post.
-- For Feature Requests open an issue on `GitHub <https://github.com/gnikit/fortls/issues/new/choose>`__.
-- For Bug Reports, open a bug report on `GitHub <https://github.com/gnikit/fortls/issues/new/choose>`__. Make sure to check the open GitHub issues!
+- For Feature Requests open an issue on `GitHub <https://github.com/fortran-lang/fortls/issues/new/choose>`__.
+- For Bug Reports, open a bug report on `GitHub <https://github.com/fortran-lang/fortls/issues/new/choose>`__. Make sure to check the open GitHub issues!
 - For any other inquiry contact ``gnikit [@] duck [.] com``
diff --git a/docs/html_extra/robots.txt b/docs/html_extra/robots.txt
index 52e370c2..51963680 100644
--- a/docs/html_extra/robots.txt
+++ b/docs/html_extra/robots.txt
@@ -1,3 +1,3 @@
 User-agent: *
 Disallow:
-Sitemap: https://gnikit.github.io/fortls/sitemap.xml
+Sitemap: https://fortls.fortran-lang.org/sitemap.xml
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index ae3588db..09611b0d 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -57,7 +57,7 @@ The project is available for download through the **PyPi** and **Anaconda** pack
 
         .. code-block:: sh
 
-            pip install --user --upgrade git+git://github.com/gnikit/fortls
+            pip install --user --upgrade git+git://github.com/fortran-lang/fortls
 
 
 .. warning::
diff --git a/fortls/interface.py b/fortls/interface.py
index e1efd281..ac136aa2 100644
--- a/fortls/interface.py
+++ b/fortls/interface.py
@@ -31,7 +31,7 @@ def cli(name: str = "fortls") -> argparse.ArgumentParser:
             " default named '.fortlsrc', '.fortls.json' or '.fortls'"
             " (other names/paths can specified via -c or"
             " --config). For more details see our documentation:"
-            " https://gnikit.github.io/fortls/options.html#available-options"
+            " https://fortls.fortran-lang.org/options.html#available-options"
         ),
     )
 
diff --git a/setup.cfg b/setup.cfg
index 328c9d7b..7a4a5e66 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = fortls
-url = https://gnikit.github.io/fortls
+url = https://fortls.fortran-lang.org
 author = Giannis Nikiteas
 author_email = giannis.nikiteas@gmail.com
 description = fortls - Fortran Language Server
@@ -33,10 +33,10 @@ keywords =
     fortls
 project_urls =
     Donate = https://github.com/sponsors/gnikit
-    Documentation = https://gnikit.github.io/fortls
-    Changes = https://github.com/gnikit/fortls/blob/master/CHANGELOG.md
-    Tracker = https://github.com/gnikit/fortls/issues
-    Source Code = https://github.com/gnikit/fortls
+    Documentation = https://fortls.fortran-lang.org
+    Changes = https://github.com/fortran-lang/fortls/blob/master/CHANGELOG.md
+    Tracker = https://github.com/fortran-lang/fortls/issues
+    Source Code = https://github.com/fortran-lang/fortls
 
 [options]
 packages = find: