diff --git a/site/content/contribute/developer-setup.md b/site/content/contribute/developer-setup.md
index 8cc86a8f5b..7f07e5d036 100644
--- a/site/content/contribute/developer-setup.md
+++ b/site/content/contribute/developer-setup.md
@@ -36,16 +36,7 @@ If you're using Windows, we recommend using the Windows Subsystem for Linux (WSL
    sudo apt install build-essential
    ```
 
-1. Install [Docker](https://www.docker.com/). If you don't want to use Docker, you can follow the steps in the sub-bullets below for manual database setup.
-    1. Set `MM_NO_DOCKER` to `true` in the `server/config.mk` file.
-    2. Install [PostgreSQL](https://www.postgresql.org/download/)
-    3. Run `psql postgres`. Then create `mmuser` by running `CREATE ROLE mmuser WITH LOGIN PASSWORD 'mostest';`
-    4. Modify the role to give rights to create a database by running `ALTER ROLE mmuser CREATEDB;`
-    5. Confirm the role rights by running `\du`
-    6. Before creating the database, exit by running `\q`
-    7. Login again via `mmuser` by running `psql postgres -U mmuser`
-    8. Create the database

 by running `CREATE DATABASE mattermost_test;` and exit again with `\q`
-    9. Login again with `psql postgres` and run `GRANT ALL PRIVILEGES ON DATABASE mattermost_test TO mmuser;` to give all rights to `mmuser`
+1. Install [Docker](https://www.docker.com/). If you don't want to use Docker, you can follow [this guide](#develop-mattermost-without-docker).
 
 1. Install [Go](https://go.dev/).
 
@@ -120,3 +111,75 @@ If you're using Windows, we recommend using the Windows Subsystem for Linux (WSL
 1. Set your options:
 
     Some behaviors can be customized such as running the server in the foreground as described in the `config.mk` file in the server directory. See that file for details.
+
+# Develop Mattermost without Docker
+1. Install `make`.
+    - On Ubuntu, you can install `build essential` tools which will also take care of installing the `make`:
+   ```sh
+   sudo apt install build-essential
+   ```
+1. Set `MM_NO_DOCKER` to `true` in the `server/config.mk` file.
+1. Install [PostgreSQL](https://www.postgresql.org/download/)
+1. Run `psql postgres`. Then create `mmuser` by running `CREATE ROLE mmuser WITH LOGIN PASSWORD 'mostest';`
+1. Modify the role to give rights to create a database by running `ALTER ROLE mmuser CREATEDB;`
+1. Confirm the role rights by running `\du`
+1. Before creating the database, exit by running `\q`
+1. Login again via `mmuser` by running `psql postgres -U mmuser`
+1. Create the database

 by running `CREATE DATABASE mattermost_test;` and exit again with `\q`
+1. Login again with `psql postgres` and run `GRANT ALL PRIVILEGES ON DATABASE mattermost_test TO mmuser;` to give all rights to `mmuser`
+1. Install [Go](https://go.dev/).
+1. Increase the number of available file descriptors. Update your shell's initialization script (e.g. `.bashrc` or `.zshrc`), and add the following:
+    ```sh
+    ulimit -n 8096
+    ```
+    
+1. If you don't have it already, install libpng with your preferred package manager.
+    - If you are on ARM based Mac, you'll need to install [Rosetta](https://support.apple.com/en-in/HT211861) to make `libpng` work. Rosetta can be installed by the following command-
+        ```sh
+        softwareupdate --install-rosetta
+        ```
+
+1. Fork https://github.com/mattermost/mattermost.
+1. Clone the Mattermost source code from your fork:
+    ```sh
+    git clone https://github.com/YOUR_GITHUB_USERNAME/mattermost.git
+    ```
+    
+1. Install NVM and use it to install the required version of Node.js:
+    - First, install {{< newtabref href="https://github.com/nvm-sh/nvm" title="NVM" >}} by following {{< newtabref href="https://github.com/nvm-sh/nvm#installing-and-updating" title="these instructions" >}}.
+    - Then, use NVM to install the correct version of Node.js for the Mattermost web app (this should be run within the `webapp` directory):
+        ```sh
+        nvm install
+        ```
+
+1. Start the server:
+    ```sh
+    cd server
+    make run-server
+    ```
+
+1. Test your environment:
+    ```sh
+    curl http://localhost:8065/api/v4/system/ping
+    ```
+    If successful, the `curl` step will return a JSON object:
+    ```json
+    {"AndroidLatestVersion":"","AndroidMinVersion":"","DesktopLatestVersion":"","DesktopMinVersion":"","IosLatestVersion":"","IosMinVersion":"","status":"OK"}
+    ```
+
+1. Run the webapp and watch:
+    ```sh
+    make run
+    ```
+
+1. Stop the server:
+    ```sh
+    make stop-server
+    ```
+    The `stop-server` make target does not stop all the docker containers started by `run-server`. To stop the running docker containers:
+    ```sh
+    make stop-docker
+    ```
+
+1. Set your options:
+    Some behaviors can be customized such as running the server in the foreground as described in the `config.mk` file in the server directory. See that file for details.