diff --git a/docs/build/notifications.md b/docs/build/notifications.md
index 5a7d4d612..7b39fbe31 100644
--- a/docs/build/notifications.md
+++ b/docs/build/notifications.md
@@ -18,7 +18,7 @@ See the [example-notification-server-go](https://github.com/xmtp/example-notifi
 
 This example branch can serve as the basis for what you might want to provide for your own notification server. The branch also demonstrates how to generate the proto code if you decide to perform these tasks for your own app. This proto code from the example notification server has already been generated in the `xmtp-android` example app.
 
-Check out the [Setup Guide for XMTP Notification Server](/blog/setting-up-push-notification-server).
+Check out the [Setup Guide for XMTP Notification Server](/docs/tutorials/other/notifications-server).
 
 ## Firebase Cloud Messaging
 
diff --git a/docs/tutorials/img/notifications/bells.png b/docs/tutorials/img/notifications/bells.png
new file mode 100644
index 000000000..af5fd7660
Binary files /dev/null and b/docs/tutorials/img/notifications/bells.png differ
diff --git a/docs/tutorials/img/notifications/cmd1.png b/docs/tutorials/img/notifications/cmd1.png
new file mode 100644
index 000000000..b3b7c26ed
Binary files /dev/null and b/docs/tutorials/img/notifications/cmd1.png differ
diff --git a/docs/tutorials/img/notifications/cmd2.png b/docs/tutorials/img/notifications/cmd2.png
new file mode 100644
index 000000000..fee25d6cf
Binary files /dev/null and b/docs/tutorials/img/notifications/cmd2.png differ
diff --git a/docs/tutorials/img/notifications/cmd3.png b/docs/tutorials/img/notifications/cmd3.png
new file mode 100644
index 000000000..bb0df9f2c
Binary files /dev/null and b/docs/tutorials/img/notifications/cmd3.png differ
diff --git a/docs/tutorials/img/notifications/cmd4.png b/docs/tutorials/img/notifications/cmd4.png
new file mode 100644
index 000000000..6503eb65f
Binary files /dev/null and b/docs/tutorials/img/notifications/cmd4.png differ
diff --git a/docs/tutorials/other/notifications-server.md b/docs/tutorials/other/notifications-server.md
new file mode 100644
index 000000000..7bbdab1ea
--- /dev/null
+++ b/docs/tutorials/other/notifications-server.md
@@ -0,0 +1,130 @@
+---
+sidebar_label: GO Notifications Server
+sidebar_position: 2
+---
+
+# Setup Guide for XMTP Notification Server
+
+This guide is a supplement to [core instructions](https://github.com/xmtp/example-notification-server-go/blob/np/export-kotlin-proto-code/README.md#local-setup) provided in the `example-notification-server-go` repository and aims to address some common misconceptions and issues encountered during the setup. This guide is written for macOS users, but the steps should be similar for Linux users.
+
+![](../img/notifications/bells.png)
+
+<!--truncate-->
+
+## Install Docker
+
+1. Install docker desktop depending on your OS:
+
+   - [Mac](https://docs.docker.com/docker-for-mac/install/)
+   - [Windows](https://docs.docker.com/docker-for-windows/install/)
+   - [Linux](https://docs.docker.com/engine/install/)
+
+:::tip
+After installation, make sure Docker is running by searching for Docker in Spotlight and opening the application. You don't need to do anything with the UI from Docker. We are going to use only terminal commands.
+:::
+
+2. You need to have Docker and Docker Compose installed on your system. If you don't have Docker and Docker Compose installed, you can install them using Homebrew:
+
+   ```bash
+   brew install docker docker-compose docker-credential-desktop
+   ```
+
+3. Make sure Docker Desktop is running by searching for Docker in Spotlight and opening the application.
+
+## Install Go
+
+1. If you need to upgrade Go on your system, you can do it via Homebrew:
+
+   ```bash
+   brew install go
+   ```
+
+   If you encounter any errors like `Error: go 1.17.2 is already installed`, it means you already have Go installed on your system. You can check the version of Go installed on your system using:
+
+   ```bash
+   brew update
+   brew upgrade go
+   ```
+
+   After these steps, you should be able to update Homebrew and upgrade Go without issues.
+
+## Set up the server
+
+1. To start the XMTP service and database, navigate to the project terminal and run:
+
+   ```bash
+   ./dev/up
+   ```
+
+   ![](../img/notifications/cmd1.png)
+
+   If you encounter an error like `error getting credentials - err: docker-credential-desktop resolves to executable in current directory (./docker-credential-desktop), out:`, it's likely because Docker is not running. Make sure Docker Desktop is running and try the command again.
+
+2. Build the server using:
+
+   ```bash
+   ./dev/build
+   ```
+
+   During the build, if you encounter any Go-related errors like missing `go.sum` entries, use the suggested `go get` or `go mod download` commands in the error messages to resolve them. For example, if you see `missing go.sum entry; to add it: go mod download golang.org/x/sys`, run:
+
+   ```bash
+   go mod download golang.org/x/sys
+   ```
+
+   If you encounter errors related to Go build comments like `//go:build comment without // +build comment`, you can ignore them as they are warnings about future deprecations and won't prevent your code from running.
+
+## Run the server
+
+1. The server can be run using the `./dev/run` script with the `--xmtp-listener` and `--api` flags:
+
+   ```bash
+   ./dev/up
+   ```
+
+   ![](../img/notifications/cmd2.png)
+
+   ```bash
+   source .env
+   ./dev/run --xmtp-listener --api
+   ```
+
+   This will start both the `worker` and the `api` service. The `worker` listens for new messages on the XMTP network and sends push notifications, and the `api` service handles HTTP/GRPC requests.
+
+   ![](../img/notifications/cmd3.png)
+
+You can now send notifications to your device using an [XMTP push notification client](https://github.com/xmtp/example-notification-server-go/blob/main/docs/notifications-client-guide.md).
+
+![](../img/notifications/cmd4.png)
+
+## Troubleshooting
+
+- In case Docker or Docker Compose commands are not recognized, it might mean that they are not installed or their executable paths are not included in your system's PATH variable. Make sure Docker and Docker Compose are installed and their paths are included in your system's PATH.
+
+- If you encounter Go-related errors during the build, it's often due to missing packages or outdated versions. Always make sure your Go is up-to-date and use the `go get` or `go mod download` commands to fetch the necessary dependencies.
+
+- If you encounter any error like `./dev/up: line 3: docker-compose: command not found`, it's because you don't have Docker Compose installed on your system. Use the above command to install it.
+
+- If you see warnings about `//go:build comment without // +build comment`, these are warnings about future deprecations in Go. They won't prevent your code from running and can be ignored.
+
+- If `brew update` is giving errors, it might be due to changes in Homebrew's repository. Homebrew has switched from using "master" to "main" as its default branch. The steps provided in the "Upgrading Go" section should help resolve this issue.
+
+- If you encounter any errors during `brew update` like `fatal: couldn't find remote ref refs/heads/master`, this means Homebrew is having trouble updating its repositories. To fix this, run:
+  ```bash
+  cd $(brew --repository)
+  git checkout main
+  git reset --hard origin/main
+  ```
+- Here is a piece of code that points to the ports and network. Be sure to use TLS like this `./dev/run --xmtp-listener-tls --api`
+
+  ```jsx
+  static func envToUrl(env: XMTPEnvironment) -> String {
+   switch env {
+      case XMTPEnvironment.local: return "http://localhost:5556/"
+      case XMTPEnvironment.dev: return "https://dev.xmtp.network:5556/"
+      case XMTPEnvironment.production: return "https://production.xmtp.network:5556/"
+   }
+  }
+  ```
+
+If you have further issues or questions, don't hesitate to ask for help in the [XMTP Discord](https://discord.gg/xmtp).