diff --git a/README.md b/README.md
index 70935d5..5349808 100644
--- a/README.md
+++ b/README.md
@@ -108,6 +108,7 @@ export AQUARIUS_VERSION=v2.0.0
 | `--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                                                        |
+| `--deploy-ocean-subgraph`  | Deploys ocean-subgraph                                                                          |
 | `--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/ocean_subgraph.yml b/compose-files/ocean_subgraph.yml
new file mode 100644
index 0000000..7b9f358
--- /dev/null
+++ b/compose-files/ocean_subgraph.yml
@@ -0,0 +1,12 @@
+version: '3'
+services:
+  subgraph:
+    image: oceanprotocol/subgraph:${SUBGRAPH_VERSION:-latest}
+    networks:
+      backend:
+        ipv4_address: 172.15.0.19
+    depends_on:
+      - graph-node
+      - ocean-contracts
+    volumes:
+    - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
diff --git a/compose-files/thegraph.yml b/compose-files/thegraph.yml
index 39ea20e..9e7ce1e 100644
--- a/compose-files/thegraph.yml
+++ b/compose-files/thegraph.yml
@@ -21,7 +21,7 @@ services:
       postgres_pass: let-me-in
       postgres_db: graph-node
       ipfs: '172.15.0.16:5001'
-      ethereum: 'barge:${NETWORK_RPC_URL}'
+      ethereum: 'development:${NETWORK_RPC_URL}'
       RUST_LOG: info
   postgres:
     image: postgres
diff --git a/start_ocean.sh b/start_ocean.sh
index 826ebb9..88d49df 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}
 
@@ -233,6 +234,11 @@ while :; do
             COMPOSE_FILES+=" -f ${COMPOSE_DIR}/thegraph.yml"
             printf $COLOR_Y'Starting with TheGraph...\n\n'$COLOR_RESET
             ;;
+        --deploy-ocean-subgraph)
+            COMPOSE_FILES+=" -f ${COMPOSE_DIR}/ocean_subgraph.yml"
+            COMPOSE_FILES+=" -f ${COMPOSE_DIR}/thegraph.yml"
+            printf $COLOR_Y'Deploying ocean-subgraph...\n\n'$COLOR_RESET
+            ;;
         --no-ganache)
             COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/ganache.yml/}"
             COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/ocean_contracts.yml/}"