diff --git a/.envrc b/.envrc
index c642786..08d4831 100644
--- a/.envrc
+++ b/.envrc
@@ -41,7 +41,7 @@ export APPEND_ARGS="--allow-private-ip --pool-limit 10 --trie-cache-size 0 --pro
 # Validator Values:
 if [ ! -f node.privatekey ]; then
   # generate node key like this:
-  DOCKER_DEFAULT_PLATFORM=linux/amd64 docker run --rm -it docker.io/parity/subkey:latest generate-node-key  | sed -n '2p' > midnight-node.privatekey
+  docker run --rm -it ghcr.io/blinklabs-io/subkey:9.0.0 generate-node-key  | sed -n '2p' > midnight-node.privatekey
   # Use the second line of output for NODE_KEY (that's what sed -n '2p' does)
 fi
 export NODE_KEY="$(cat ./midnight-node.privatekey)"
@@ -50,6 +50,6 @@ export NODE_KEY="$(cat ./midnight-node.privatekey)"
 # Partner chains config:
 #
 export CARDANO_NETWORK=preview
-export CARDANO_IMAGE="ghcr.io/intersectmbo/cardano-node:10.2.1"
+export CARDANO_IMAGE="ghcr.io/blinklabs-io/cardano-node:10.2.1"
 export CARDANO_DATA_DIR=./cardano-data
 export CARDANO_CONFIG_DIR=./cardano-config/${CARDANO_NETWORK}
diff --git a/compose-partner-chains.yml b/compose-partner-chains.yml
index 4b73f4b..d801b24 100644
--- a/compose-partner-chains.yml
+++ b/compose-partner-chains.yml
@@ -22,7 +22,6 @@ volumes:
 services:
   cardano-node:
     image: ${CARDANO_IMAGE}
-    platform: linux/amd64
     restart: unless-stopped
     container_name: cardano-node
     ports:
@@ -36,7 +35,6 @@ services:
 
   postgres:
     image: postgres:15.3
-    platform: linux/amd64
     container_name: db-sync-postgres
     environment:
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
@@ -53,8 +51,7 @@ services:
       retries: 5
 
   cardano-db-sync:
-    image: ghcr.io/intersectmbo/cardano-db-sync:13.6.0.4
-    platform: linux/amd64
+    image: ghcr.io/blinklabs-io/cardano-db-sync:13.6.0.4
     container_name: cardano-db-sync
     restart: unless-stopped
     depends_on:
@@ -73,7 +70,6 @@ services:
 
   cardano-ogmios:
     image: cardanosolutions/ogmios:v6.11.0
-    platform: linux/amd64
     container_name: cardano-ogmios
     restart: unless-stopped
     environment: