diff --git a/README.md b/README.md
index b9def4f7..cbe57638 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ Check the [releases] for the latest version.
 ``` console
 git clone \
   --single-branch \
-  --branch 8.0.3 \
+  --branch 8.1.0 \
   --recurse-submodules \
   https://github.com/cardano-foundation/cardano-graphql.git \
   && cd cardano-graphql
@@ -78,7 +78,6 @@ API_PORT=3101 \
 HASURA_PORT=8091 \
 OGMIOS_PORT=1338 \
 POSTGRES_PORT=5433 \
-METADATA_SERVER_URI="https://metadata.world.dev.cardano.org" \
 docker compose -p preprod up -d --build &&\
 docker compose -p preprod logs -f
 ```
@@ -96,7 +95,6 @@ API_PORT=3102 \
 HASURA_PORT=8092 \
 OGMIOS_PORT=1339 \
 POSTGRES_PORT=5434 \
-METADATA_SERVER_URI="https://metadata.world.dev.cardano.org" \
 docker compose -p preview up -d --build &&\
 docker compose -p preview logs -f
 ```
@@ -113,7 +111,6 @@ API_PORT=3102 \
 HASURA_PORT=8092 \
 OGMIOS_PORT=1339 \
 POSTGRES_PORT=5434 \
-METADATA_SERVER_URI="https://metadata.world.dev.cardano.org" \
 docker compose -p preview up -d --build &&\
 docker compose -p preview logs -f
 ```
@@ -130,10 +127,10 @@ your use-case.
 Get the most recent weekly snapshot link [here](https://update-cardano-mainnet.iohk.io/cardano-db-sync/index.html#11/), and set it as `RESTORE_SNAPSHOT` below, or omit if you wish to sync from genesis.
 ``` console
 export NETWORK=mainnet &&\
-docker pull cardanofoundation/cardano-graphql-server:8.0.3-${NETWORK} &&\
-docker pull cardanofoundation/cardano-graphql-background:8.0.3-${NETWORK} &&\
-docker pull cardanofoundation/cardano-graphql-hasura:8.0.3 &&\
-docker pull cardanosolutions/cardano-node-ogmios:v5.6.0_1.35.5-${NETWORK} &&\
+docker pull cardanofoundation/cardano-graphql-server:8.1.0-${NETWORK} &&\
+docker pull cardanofoundation/cardano-graphql-background:8.1.0-${NETWORK} &&\
+docker pull cardanofoundation/cardano-graphql-hasura:8.1.0 &&\
+docker pull cardanosolutions/cardano-node-ogmios:v6.4.0_8.9.3-${NETWORK} &&\
 RESTORE_SNAPSHOT=https://update-cardano-mainnet.iohk.io/cardano-db-sync/13.2/db-sync-snapshot-schema-13.2-block-10060706-x86_64.tgz \
 docker compose up -d &&\
 docker compose logs -f
@@ -145,10 +142,10 @@ docker compose logs -f
 
 ``` console
 export NETWORK=preprod &&\
-docker pull cardanofoundation/cardano-graphql-server:8.0.3-${NETWORK} &&\
-docker pull cardanofoundation/cardano-graphql-background:8.0.3-${NETWORK} &&\
-docker pull cardanofoundation/cardano-graphql-hasura:8.0.3 &&\
-docker pull cardanosolutions/cardano-node-ogmios:v5.6.0_1.35.5-${NETWORK} &&\
+docker pull cardanofoundation/cardano-graphql-server:8.1.0-${NETWORK} &&\
+docker pull cardanofoundation/cardano-graphql-background:8.1.0-${NETWORK} &&\
+docker pull cardanofoundation/cardano-graphql-hasura:8.1.0 &&\
+docker pull cardanosolutions/cardano-node-ogmios:v6.4.0_8.9.3-${NETWORK} &&\
 API_PORT=3101 \
 HASURA_PORT=8091 \
 OGMIOS_PORT=1338 \
@@ -164,10 +161,10 @@ docker compose -p ${NETWORK} logs -f
 
 ``` console
 export NETWORK=preview &&\
-docker pull cardanofoundation/cardano-graphql-server:8.0.3-${NETWORK} &&\
-docker pull cardanofoundation/cardano-graphql-background:8.0.3-${NETWORK} &&\
-docker pull cardanofoundation/cardano-graphql-hasura:8.0.3 &&\
-docker pull cardanosolutions/cardano-node-ogmios:v6.2.0_8.9.0-${NETWORK} &&\
+docker pull cardanofoundation/cardano-graphql-server:8.1.0-${NETWORK} &&\
+docker pull cardanofoundation/cardano-graphql-background:8.1.0-${NETWORK} &&\
+docker pull cardanofoundation/cardano-graphql-hasura:8.1.0 &&\
+docker pull cardanosolutions/cardano-node-ogmios:v6.4.0_8.9.3-${NETWORK} &&\
 API_PORT=3102 \
 HASURA_PORT=8092 \
 OGMIOS_PORT=1339 \
@@ -210,10 +207,14 @@ docker compose -p preview down
 ### Use global Token Metadata Registry
 The public Token metadata registry has a limit of daily requests, this can lead to long sync times, when resyncing from scratch.
 If it's still needed to run with the global environment it's possible by removing the `token-metadata-registry` from `docker-compose.yml`.
-And start it with:
+And start it with for Mainnet:
 ```
 METADATA_SERVER_URI="https://tokens.cardano.org" docker compose up -d
 ```
+For other networks:
+```
+METADATA_SERVER_URI="https://metadata.world.dev.cardano.org"
+```
 
 ### Upgrade Database to Postgres 14
 If you are upgrading from Postgres 11 to 14: A resync will be needed.
diff --git a/docker-compose.yml b/docker-compose.yml
index 46879f64..3213ed80 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,7 +26,7 @@ services:
 
   cardano-node-ogmios:
     platform: linux/x86_64
-    image: cardanosolutions/cardano-node-ogmios:${OGMIOS_VERSION:-v6.2.0}_${CARDANO_NODE_VERSION:-8.9.0}-${NETWORK:-mainnet}
+    image: cardanosolutions/cardano-node-ogmios:${OGMIOS_VERSION:-v6.4.0}_${CARDANO_NODE_VERSION:-8.9.3}-${NETWORK:-mainnet}
     logging:
       driver: "json-file"
       options: