diff --git a/app/client/README.md b/app/client/README.md
index 4a5ba02f8e3..5caedc5141a 100755
--- a/app/client/README.md
+++ b/app/client/README.md
@@ -1,9 +1,4 @@
-## Dev Dependencies
-- `yarn`
-- `nvm`
-
-## Dev Setup
-
+# Appsmith Client
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
-
+
For details on setting up your development machine, please refer to the [Setup Guide](../../contributions/ClientSetup.md)
diff --git a/app/server/README.md b/app/server/README.md
index 135bed18332..bfb384ae203 100644
--- a/app/server/README.md
+++ b/app/server/README.md
@@ -1,39 +1,4 @@
# Appsmith Server
-
This is the server-side repository for the Appsmith framework.
-For details on setting up your development machine, please refer to the [Setup Guide](../../contributions/ServerSetup.md). Alternatively, you can run the server using docker(see the instructions below).
-
-## Run locally with Docker
-
-You can run the server codebase in a docker container. This is the easiest way to get the server up and running if all you care about is contributing to the client codebase.
-
-### What's in the box
-
-* Appsmith server
-* MongoDB
-* Redis
-
-### Pre-requisites
-
-* [Docker](https://docs.docker.com/get-docker/)
-
-### Steps for setup
-
-1. Clone the Appsmith repository and `cd` into it
-```sh
-git clone https://github.com/appsmithorg/appsmith.git
-cd appsmith
-```
-2. Change your directory to `app/server`
-```sh
-cd app/server
-```
-3. Create a copy of the `envs/docker.env.example`
-```sh
-cp envs/docker.env.example envs/docker.env
-```
-4. Start up the containers
-```sh
-docker-compose up -d
-```
-5. Have fun!
+
+For details on setting up your development machine, please refer to the [Setup Guide](../../contributions/ServerSetup.md)
diff --git a/contributions/ClientSetup.md b/contributions/ClientSetup.md
index 7cf5d478042..7a394e0478a 100644
--- a/contributions/ClientSetup.md
+++ b/contributions/ClientSetup.md
@@ -2,6 +2,10 @@
Appsmith's client (UI/frontend) uses the ReactJS library and Typescript. The application also uses libraries like react-redux and redux-saga for workflows. We use VS Code Editor as our primary editor
+
+[](https://www.youtube.com/watch?v=FwJlVWVx0X0)
+
+
### Pre-requisites:
On your development machine, please ensure that:
diff --git a/contributions/ServerSetup.md b/contributions/ServerSetup.md
index c49108d4b72..f5a5500d768 100644
--- a/contributions/ServerSetup.md
+++ b/contributions/ServerSetup.md
@@ -1,8 +1,48 @@
-## Running Server Codebase
+# Running Server Codebase
This document explains how you can setup a development environment for Appsmith server. As the server codebase is written in Java and is powered by Spring + WebFlux we need Java and Maven installed to build the code. In addition we also need one instance of MongoDB and Redis each to run Appsmith server. Lastly, we will set up IntelliJ IDEA to let you edit the code. Let's get those prerequisites installed on your machine.
->If you are not setting up a development environment you can get the Appsmith server up and running quickly with `Docker`. Please refer to the [Setup Guide](../app/server/README.md#run-locally-with-docker) on how to do that.
+
+[](https://www.youtube.com/watch?v=W2qbuUYGrQs)
+
+
+# Setup with Docker
+
+You can run the server codebase in a docker container. This is the easiest way to get the server up and running if you are more interested in contributing to the client codebase.
+
+## What's in the box
+
+* Appsmith server
+* MongoDB database
+* Redis instance
+
+## Pre-requisites
+
+* [Docker](https://docs.docker.com/get-docker/)
+
+## Steps for setup
+
+1. Clone the Appsmith repository and `cd` into it
+```
+git clone https://github.com/appsmithorg/appsmith.git
+cd appsmith
+```
+2. Change your directory to `app/server`
+```
+cd app/server
+```
+3. Create a copy of the `envs/docker.env.example`
+```
+cp envs/docker.env.example envs/docker.env
+```
+4. Start up the containers
+```
+docker-compose up -d
+```
+5. Have fun!
+
+
+# Local Setup
## Pre-requisites
diff --git a/static/images/client-yt-video-thumbnail.jpg b/static/images/client-yt-video-thumbnail.jpg
new file mode 100644
index 00000000000..a8a67194793
Binary files /dev/null and b/static/images/client-yt-video-thumbnail.jpg differ
diff --git a/static/images/server-yt-video-thumbnail.jpg b/static/images/server-yt-video-thumbnail.jpg
new file mode 100644
index 00000000000..0f649aa5d5b
Binary files /dev/null and b/static/images/server-yt-video-thumbnail.jpg differ