diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2d61518..ef6f807 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -64,7 +64,7 @@
 If you need further details on any of these issues, feel free to add comments.
 
 Performing code reviews is another good way to get started.  Go to
-https://gerrit.openbmc-project.xyz and click on the "all" and "open"
+https://gerrit.openbmc.org and click on the "all" and "open"
 menu items, or if you are interested in a particular repository - for
 example, "bmcweb" - type "status:open project:openbmc/bmcweb" into the
 search bar and press the "search" button.  Then select a review.
@@ -275,23 +275,23 @@
 
 The OpenBMC Gerrit server supports GitHub credentials, its link is:
 
-  https://gerrit.openbmc-project.xyz/#/q/status:open
+  https://gerrit.openbmc.org/#/q/status:open
 
 _One time setup_: Login to the WebUI with your GitHub credentials and verify on
 your Account Settings that your SSH keys were imported:
 
-  https://gerrit.openbmc-project.xyz/#/settings/
+  https://gerrit.openbmc.org/#/settings/
 
 Most repositories are supported by the Gerrit server, the current list can be
 found under Projects -> List:
 
-  https://gerrit.openbmc-project.xyz/#/admin/projects/
+  https://gerrit.openbmc.org/#/admin/projects/
 
 If you're going to be working with Gerrit often, it's useful to create an SSH
 host block in ~/.ssh/config. Ex:
 ```
 Host openbmc.gerrit
-        Hostname gerrit.openbmc-project.xyz
+        Hostname gerrit.openbmc.org
         Port 29418
         User your_github_id
 ```
@@ -305,7 +305,7 @@
 
 Alternatively, you can encode all the data in the URL:
 
-  `git remote add gerrit ssh://your_github_id@gerrit.openbmc-project.xyz:29418/openbmc/openbmc_repo`
+  `git remote add gerrit ssh://your_github_id@gerrit.openbmc.org:29418/openbmc/openbmc_repo`
 
 Then add the default branch for pushes to this remote:
 
@@ -330,7 +330,7 @@
 documentation](https://gerrit-review.googlesource.com/Documentation/intro-user.html#topics).
 
 Gerrit will show you the URL link to your review.  You can also find
-your reviews from the [OpenBMC Gerrit server](https://gerrit.openbmc-project.xyz) search bar
+your reviews from the [OpenBMC Gerrit server](https://gerrit.openbmc.org) search bar
 or menu (All > Open, or My > Changes).
 
 Invite reviewers to review your changes.  Each OpenBMC repository has
diff --git a/designs/error-log-handling-for-phal.md b/designs/error-log-handling-for-phal.md
index dde9072..573f828 100644
--- a/designs/error-log-handling-for-phal.md
+++ b/designs/error-log-handling-for-phal.md
@@ -149,7 +149,7 @@
 1. Simulate hardware procedure failure and check if PEL is created.
 
 [1]: (https://github.com/openbmc/phosphor-logging/blob/master/extensions/openpower-pels/README.md)
-[2]: (https://gerrit.openbmc-project.xyz/#/c/openbmc/docs/+/27804/2/designs/gard_on_bmc.md)
+[2]: (https://gerrit.openbmc.org/#/c/openbmc/docs/+/27804/2/designs/gard_on_bmc.md)
 [3]: (https://github.com/openbmc/phosphor-logging)
 [4]: (https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Logging/Create.interface.yaml)
 [5]: (https://github.com/dgibson/dtc)
diff --git a/designs/external-sensor.md b/designs/external-sensor.md
index 27686da..5801add 100644
--- a/designs/external-sensor.md
+++ b/designs/external-sensor.md
@@ -212,12 +212,12 @@
 
 ## Footnotes
 
-[^1]: https://gerrit.openbmc-project.xyz/q/owner:krellan%2540google.com
+[^1]: https://gerrit.openbmc.org/q/owner:krellan%2540google.com
 [^2]: https://github.com/openbmc/dbus-sensors/blob/master/README.md
 [^3]: https://www.kernel.org/doc/html/latest/hwmon/index.html
 [^4]: https://github.com/openbmc/entity-manager/blob/master/README.md
-[^5]: https://gerrit.openbmc-project.xyz/c/openbmc/dbus-sensors/+/36206
-[^6]: https://gerrit.openbmc-project.xyz/c/openbmc/dbus-sensors/+/35476
+[^5]: https://gerrit.openbmc.org/c/openbmc/dbus-sensors/+/36206
+[^6]: https://gerrit.openbmc.org/c/openbmc/dbus-sensors/+/35476
 [^7]: https://github.com/openbmc/dbus-sensors/blob/master/src/HwmonTempMain.cpp
 [^8]: https://think-async.com/Asio/
 [^9]: https://github.com/openbmc/dbus-sensors/blob/master/include/sensor.hpp
@@ -231,9 +231,9 @@
 [^17]: https://github.com/openbmc/openbmc/issues/1892
 [^18]: https://github.com/openbmc/entity-manager/blob/master/docs/my_first_sensors.md
 [^19]: https://github.com/openbmc/dbus-sensors/blob/master/src/SensorPaths.cpp
-[^20]: https://gerrit.openbmc-project.xyz/c/openbmc/dbus-sensors/+/36206
-[^21]: https://gerrit.openbmc-project.xyz/c/openbmc/dbus-sensors/+/41398
-[^22]: https://gerrit.openbmc-project.xyz/c/openbmc/dbus-sensors/+/39294
-[^23]: https://gerrit.openbmc-project.xyz/c/openbmc/dbus-sensors/+/41394
-[^24]: https://gerrit.openbmc-project.xyz/c/openbmc/entity-manager/+/41397
-[^25]: https://gerrit.openbmc-project.xyz/c/openbmc/dbus-sensors/+/16177
+[^20]: https://gerrit.openbmc.org/c/openbmc/dbus-sensors/+/36206
+[^21]: https://gerrit.openbmc.org/c/openbmc/dbus-sensors/+/41398
+[^22]: https://gerrit.openbmc.org/c/openbmc/dbus-sensors/+/39294
+[^23]: https://gerrit.openbmc.org/c/openbmc/dbus-sensors/+/41394
+[^24]: https://gerrit.openbmc.org/c/openbmc/entity-manager/+/41397
+[^25]: https://gerrit.openbmc.org/c/openbmc/dbus-sensors/+/16177
diff --git a/designs/management-console/service-discovery.md b/designs/management-console/service-discovery.md
index cadf4f4..44f1b01 100644
--- a/designs/management-console/service-discovery.md
+++ b/designs/management-console/service-discovery.md
@@ -41,8 +41,8 @@
 
 Following commits implements the behaviour.
 
- https://gerrit.openbmc-project.xyz/c/openbmc/meta-phosphor/+/22950
- https://gerrit.openbmc-project.xyz/c/openbmc/meta-ibm/+/22951
+ https://gerrit.openbmc.org/c/openbmc/meta-phosphor/+/22950
+ https://gerrit.openbmc.org/c/openbmc/meta-ibm/+/22951
 
 As part of avahi discovery response, the client receives the following:
 1) Hostname
diff --git a/designs/phosphor-audit.md b/designs/phosphor-audit.md
index 557d55b..f3cc378 100644
--- a/designs/phosphor-audit.md
+++ b/designs/phosphor-audit.md
@@ -30,7 +30,7 @@
 YADRO had an internal solution for the problem. It was only applicable to an
 outdated version of OpenBMC and needed a redesign. There was also a parallel
 effort by IBM that can be found here:
-[REST and Redfish Traffic Logging](https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/22699)
+[REST and Redfish Traffic Logging](https://gerrit.openbmc.org/c/openbmc/bmcweb/+/22699)
 
 ## Assumptions
 
diff --git a/designs/phosphor-hwmon-io-uring.md b/designs/phosphor-hwmon-io-uring.md
index ad10f68..124d8fd 100644
--- a/designs/phosphor-hwmon-io-uring.md
+++ b/designs/phosphor-hwmon-io-uring.md
@@ -28,7 +28,7 @@
 [brandonkim@google.com](mailto:brandonkim@google.com) has previously created a
 method for preventing sensors from blocking all other sensor reads and D-Bus if
 they do not report failures quickly enough in the phosphor-hwmon repository
-([link to change](https://gerrit.openbmc-project.xyz/c/openbmc/phosphor-hwmon/+/24337)).
+([link to change](https://gerrit.openbmc.org/c/openbmc/phosphor-hwmon/+/24337)).
 Internal Google BMC efforts have also focused on introducing the io_uring
 library to its code.
 
diff --git a/designs/redfish-eventservice.md b/designs/redfish-eventservice.md
index 486a61d..701d05c 100644
--- a/designs/redfish-eventservice.md
+++ b/designs/redfish-eventservice.md
@@ -18,13 +18,13 @@
  - [Redfish specification](https://www.dmtf.org/sites/default/files/standards/documents/DSP0266_1.7.0.pdf)
  - [DMTF Redfish school events](https://www.dmtf.org/sites/default/files/Redfish_School-Events_2018.2.pdf)
  - [Redfish event logging](https://github.com/openbmc/docs/blob/master/redfish-logging-in-bmcweb.md)
- - [Telemetry service](https://gerrit.openbmc-project.xyz/#/c/openbmc/docs/+/24357/)
+ - [Telemetry service](https://gerrit.openbmc.org/#/c/openbmc/docs/+/24357/)
  - [Beast async client](https://www.boost.org/doc/libs/develop/libs/beast/example/http/client/async/)
  - [Beast async-ssl client](https://www.boost.org/doc/libs/develop/libs/beast/example/http/client/async-ssl/)
  - [EventService schema](https://redfish.dmtf.org/schemas/v1/EventService_v1.xml)
  - [EventDestinationCollection schema](https://redfish.dmtf.org/schemas/v1/EventDestinationCollection_v1.xml)
  - [EventDestination schema](https://redfish.dmtf.org/schemas/v1/EventDestination_v1.xml)
- - [Upgrade connection for SSE](https://gerrit.openbmc-project.xyz/#/c/openbmc/bmcweb/+/13948/)
+ - [Upgrade connection for SSE](https://gerrit.openbmc.org/#/c/openbmc/bmcweb/+/13948/)
 
 ## Requirements
 
@@ -501,7 +501,7 @@
      operations(Single, average, max, min, sum etc..).
 
      Refer below link for design document of telemetry service.
-[link](https://gerrit.openbmc-project.xyz/#/c/openbmc/docs/+/24357/)
+[link](https://gerrit.openbmc.org/#/c/openbmc/docs/+/24357/)
 
 
 ### Redfish resource schema's
@@ -787,7 +787,7 @@
 the open connection will be upgraded to WebSocket by checking the request
 Content-Type header(matches to 'text/event-stream') and keep the connection
 alive till the client/server closes the connection. Please refer
-[link](https://gerrit.openbmc-project.xyz/#/c/openbmc/bmcweb/+/13948/) for
+[link](https://gerrit.openbmc.org/#/c/openbmc/bmcweb/+/13948/) for
 details on how to upgrade the connection for SSE. The "Context" property
 in the EventDestination resource shall be an opaque string generated by the
 service.
diff --git a/designs/redfish-pcie.md b/designs/redfish-pcie.md
index 8ff5580..a0bebc2 100644
--- a/designs/redfish-pcie.md
+++ b/designs/redfish-pcie.md
@@ -35,7 +35,7 @@
 the Redfish PCIe resources.
 
 The proposed D-Bus interface can be found here:
-https://gerrit.openbmc-project.xyz/c/openbmc/phosphor-dbus-interfaces/+/19768
+https://gerrit.openbmc.org/c/openbmc/phosphor-dbus-interfaces/+/19768
 
 The proposed producer will be a new D-Bus daemon that will be responsible for
 gathering and caching PCIe hardware data and maintaining the D-Bus interfaces
diff --git a/designs/redfish-resource-supplement-for-pfr.md b/designs/redfish-resource-supplement-for-pfr.md
index b66d5bc..14c32d4 100644
--- a/designs/redfish-resource-supplement-for-pfr.md
+++ b/designs/redfish-resource-supplement-for-pfr.md
@@ -89,7 +89,7 @@
 it can not be re-provisioned.
 
 New OemComputerSystem schema can be found at
-[link](https://gerrit.openbmc-project.xyz/#/c/openbmc/bmcweb/+/24253/)
+[link](https://gerrit.openbmc.org/#/c/openbmc/bmcweb/+/24253/)
 
 PFR in OpenBMC must support logging of resiliency error detection and
 correction. Below are two metadata entries in redfish message registry
diff --git a/designs/state-management-and-external-interfaces.md b/designs/state-management-and-external-interfaces.md
index 6dc13c7..96875d8 100644
--- a/designs/state-management-and-external-interfaces.md
+++ b/designs/state-management-and-external-interfaces.md
@@ -174,4 +174,4 @@
 [1]: http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/ResetType
 [2]: https://github.com/openbmc/phosphor-state-manager
 [3]: https://github.com/openbmc/bmcweb
-[4]: https://gerrit.openbmc-project.xyz/c/openbmc/docs/+/22358
+[4]: https://gerrit.openbmc.org/c/openbmc/docs/+/22358
diff --git a/designs/telemetry.md b/designs/telemetry.md
index 1c27105..21a15db 100644
--- a/designs/telemetry.md
+++ b/designs/telemetry.md
@@ -802,8 +802,8 @@
 [2]: https://github.com/openbmc/docs/blob/master/architecture/sensor-architecture.md
 [3]: https://www.kernel.org/doc/Documentation/hwmon/
 [4]: https://www.freedesktop.org/wiki/Software/dbus/
-[5]: https://gerrit.openbmc-project.xyz/c/openbmc/docs/+/22257
-[6]: https://gerrit.openbmc-project.xyz/c/openbmc/docs/+/24749
+[5]: https://gerrit.openbmc.org/c/openbmc/docs/+/22257
+[6]: https://gerrit.openbmc.org/c/openbmc/docs/+/24749
 [7]: https://github.com/google/googletest
 [8]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Telemetry/ReportManager.interface.yaml
 [9]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Telemetry/Report.interface.yaml
diff --git a/development/gerrit-setup.md b/development/gerrit-setup.md
index c1d5be8..84d798c 100644
--- a/development/gerrit-setup.md
+++ b/development/gerrit-setup.md
@@ -28,15 +28,15 @@
 * <https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/>
 
 Add Keys to OpenBMC's Gerrit Server:
-* Login to [Gerrit](https://gerrit.openbmc-project.xyz/) with your GitHub
+* Login to [Gerrit](https://gerrit.openbmc.org/) with your GitHub
   account.
 * Go to
-  <https://gerrit.openbmc-project.xyz/plugins/github-plugin/static/account.html>
+  <https://gerrit.openbmc.org/plugins/github-plugin/static/account.html>
 * Your information should be auto-filled, so click "Next".
 * If successful you should see a blank screen, feel free to exit out.
 
 ##### Add e-mail to Gerrit
-* Login to [Gerrit](https://gerrit.openbmc-project.xyz/)
+* Login to [Gerrit](https://gerrit.openbmc.org/)
 * Enter e-mail in Settings -> Contact Information -> Register New E-Mail
 * Check e-mail for confirmation and click the link to confirm
 
@@ -47,7 +47,7 @@
 Add the following to `~/.ssh/config`:
 ```
 Host openbmc.gerrit
-    Hostname gerrit.openbmc-project.xyz
+    Hostname gerrit.openbmc.org
     Port 29418
     User <Your Gerrit Username>
 ```
@@ -83,7 +83,7 @@
   `git commit --signoff`
 * Push your changes to Gerrit for code review:
   `git push origin HEAD:refs/for/master`
-* Go to [Gerrit web interface](https://gerrit.openbmc-project.xyz/), click on
+* Go to [Gerrit web interface](https://gerrit.openbmc.org/), click on
   your new review, and add reviewers based on `MAINTAINERS` file in the repo.
 
 ##### Conclusion