diff --git a/README.md b/README.md
index 70935d5..89fa35a 100644
--- a/README.md
+++ b/README.md
@@ -107,7 +107,8 @@ export AQUARIUS_VERSION=v2.0.0
 | `--no-ganache`             | Start up Ocean without the `ganache` Building Block.                                            |
 | `--no-dashboard`           | Start up Ocean without the `dashboard` Building Block.                                          |
 | `--with-rbac`              | Start up Ocean with RBAC Server                                                                 |
-| `--with-thegraph`          | Start up Ocean with graphnode,postgresql                                                        |
+| `--with-thegraph`          | Start up Ocean with graphnode,postgresql and deploys ocean-subgraph                             |
+| `---skip-subgraph-deploy`  | Will skip deployment of ocean-subgraphs                                                         |
 | `--skip-deploy`            | Start up Ocean without deploying the contracts. Useful when ethereum node already has contracts.|
 | `--force-pull`             | Force pulling the latest revision of the used Docker images.                                    |
 | `--purge`                  | Removes the Docker containers, volumes, artifact folder and networks used by the script.        |
diff --git a/compose-files/thegraph.yml b/compose-files/thegraph.yml
index 9e7ce1e..df4efdd 100644
--- a/compose-files/thegraph.yml
+++ b/compose-files/thegraph.yml
@@ -37,6 +37,20 @@ services:
       POSTGRES_DB: graph-node
     volumes:
       - graphpgsql:/var/lib/postgresql/data
+  subgraph:
+    image: oceanprotocol/subgraph:${SUBGRAPH_VERSION:-latest}
+    networks:
+      backend:
+        ipv4_address: 172.15.0.19
+    environment:
+      DEPLOY_SUBGRAPH: ${DEPLOY_SUBGRAPH}
+    depends_on:
+      - graph-node
+      - ocean-contracts
+    volumes:
+    - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
 volumes:
   graphpgsql:
 
+
+
diff --git a/start_ocean.sh b/start_ocean.sh
index 826ebb9..256bb20 100755
--- a/start_ocean.sh
+++ b/start_ocean.sh
@@ -30,6 +30,7 @@ COMPOSE_DIR="${DIR}/compose-files"
 
 export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v4main}
 export PROVIDER_VERSION=${PROVIDER_VERSION:-v4main}
+export SUBGRAPH_VERSION=${SUBGRAPH_VERSION:-v4main}
 export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v4main_postaudit}
 export RBAC_VERSION=${RBAC_VERSION:-next}
 
@@ -61,6 +62,7 @@ export GANACHE_MNEMONIC=${GANACHE_MNEMONIC:-"taxi music thumb unique chat sand c
 export OCEAN_HOME="${HOME}/.ocean"
 export CONTRACTS_OWNER_ROLE_ADDRESS="${CONTRACTS_OWNER_ROLE_ADDRESS}"
 export DEPLOY_CONTRACTS=true
+export DEPLOY_SUBGRAPH=true
 export OCEAN_ARTIFACTS_FOLDER="${OCEAN_HOME}/ocean-contracts/artifacts"
 mkdir -p ${OCEAN_ARTIFACTS_FOLDER}
 export OCEAN_C2D_FOLDER="${OCEAN_HOME}/ocean-c2d/"
@@ -246,7 +248,6 @@ while :; do
             COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/elasticsearch.yml/}"
             printf $COLOR_Y'Starting without Elastic search...\n\n'$COLOR_RESET
             ;;
-
         --no-dashboard)
             COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/dashboard.yml/}"
             printf $COLOR_Y'Starting without Dashboard ...\n\n'$COLOR_RESET
@@ -255,6 +256,10 @@ while :; do
             export DEPLOY_CONTRACTS=false
             printf $COLOR_Y'Ocean contracts will not be deployed, the last deployment (if any) will be intact ...\n\n'$COLOR_RESET
             ;;
+        --skip-subgraph-deploy)
+            export DEPLOY_SUBGRAPH=false
+            printf $COLOR_Y'Ocean subgraph will not be deployed, the last deployment (if any) will be intact ...\n\n'$COLOR_RESET
+            ;;
         #################################################
         # Cleaning switches
         #################################################