diff --git a/scripts/devnet/.env b/scripts/devnet/.env
index 27d2fbae2829..8ab1f3f81037 100644
--- a/scripts/devnet/.env
+++ b/scripts/devnet/.env
@@ -1,4 +1,4 @@
-LOTUS_IMAGE=filecoin/lotus-all-in-one:v1.35.1-rc1-2k
+LOTUS_IMAGE=filecoin/lotus-all-in-one:v1.35.1-2k
 FOREST_DATA_DIR=/forest_data
 LOTUS_DATA_DIR=/lotus_data
 FIL_PROOFS_PARAMETER_CACHE=/var/tmp/filecoin-proof-parameters
diff --git a/scripts/tests/api_compare/.env b/scripts/tests/api_compare/.env
index 7d93452a6fe7..7136465e50b9 100644
--- a/scripts/tests/api_compare/.env
+++ b/scripts/tests/api_compare/.env
@@ -1,8 +1,9 @@
 # Note: this should be a `fat` image so that it contains the pre-downloaded filecoin proof parameters
 FOREST_IMAGE=ghcr.io/chainsafe/forest:edge-fat
-LOTUS_IMAGE=filecoin/lotus-all-in-one:v1.35.1-rc1-calibnet
+LOTUS_IMAGE=filecoin/lotus-all-in-one:v1.35.1-calibnet
 FIL_PROOFS_PARAMETER_CACHE=/var/tmp/filecoin-proof-parameters
 LOTUS_RPC_PORT=1234
+LOTUS_VIA_GATEWAY_RPC_PORT=4568
 FOREST_RPC_PORT=2345
 FOREST_OFFLINE_RPC_PORT=3456
 FOREST_VIA_GATEWAY_RPC_PORT=4567
diff --git a/scripts/tests/api_compare/docker-compose.yml b/scripts/tests/api_compare/docker-compose.yml
index ce6bed19d3b1..0d4dc88029c1 100644
--- a/scripts/tests/api_compare/docker-compose.yml
+++ b/scripts/tests/api_compare/docker-compose.yml
@@ -151,7 +151,8 @@ services:
       - |
         set -euxo pipefail
         export FULLNODE_API_INFO="$(cat /data/forest-token):/dns/forest/tcp/${FOREST_RPC_PORT}/http"
-        lotus-gateway run --api-max-lookback 72000h --api-wait-lookback-limit 2000 --listen 0.0.0.0:${FOREST_VIA_GATEWAY_RPC_PORT}
+        lotus-gateway --version
+        lotus-gateway run --api-max-lookback 72000h --api-wait-lookback-limit 20000 --listen 0.0.0.0:${FOREST_VIA_GATEWAY_RPC_PORT}
     healthcheck:
       test: |
         export FULLNODE_API_INFO="/dns/forest-via-gateway/tcp/${FOREST_VIA_GATEWAY_RPC_PORT}/http"
@@ -160,6 +161,30 @@ services:
       retries: 10
       start_period: 30s
       timeout: 5s
+  lotus-via-gateway:
+    depends_on:
+      lotus-sync-wait:
+        condition: service_completed_successfully
+    image: ${LOTUS_IMAGE}
+    volumes:
+      - node-data:/data
+    networks:
+      - api-tests
+    entrypoint: ["/bin/bash", "-c"]
+    command:
+      - |
+        set -euxo pipefail
+        export FULLNODE_API_INFO="$(cat /data/lotus-token):/dns/lotus/tcp/${LOTUS_RPC_PORT}/http"
+        lotus-gateway --version
+        lotus-gateway run --api-max-lookback 72000h --api-wait-lookback-limit 20000 --listen 0.0.0.0:${LOTUS_VIA_GATEWAY_RPC_PORT}
+    healthcheck:
+      test: |
+        export FULLNODE_API_INFO="/dns/lotus-via-gateway/tcp/${LOTUS_VIA_GATEWAY_RPC_PORT}/http"
+        lotus chain head || exit 1
+      interval: 10s
+      retries: 10
+      start_period: 30s
+      timeout: 5s
   lotus:
     depends_on:
       init:
@@ -184,6 +209,7 @@ services:
     command:
       - |
         set -euxo pipefail
+        lotus --version
         lotus daemon --remove-existing-chain --import-snapshot $(ls /data/*.car.zst | tail -n 1)
   lotus-sync-wait:
     depends_on:
@@ -266,8 +292,8 @@ services:
 
   api-compare-gateway:
     depends_on:
-      lotus-sync-wait:
-        condition: service_completed_successfully
+      lotus-via-gateway:
+        condition: service_healthy
       forest-via-gateway:
         condition: service_healthy
       forest-wallet-import:
@@ -290,7 +316,7 @@ services:
       - |
         set -uxo pipefail
         # Test against websocket endpoint for online server
-        LOTUS_API_INFO="$(cat /data/lotus-token):/dns/lotus/tcp/${LOTUS_RPC_PORT}/ws"
+        LOTUS_API_INFO="$(cat /data/lotus-token):/dns/lotus-via-gateway/tcp/${LOTUS_VIA_GATEWAY_RPC_PORT}/ws"
         FOREST_API_INFO="$(cat /data/forest-token):/dns/forest-via-gateway/tcp/${FOREST_VIA_GATEWAY_RPC_PORT}/ws"
         forest-tool api compare $(ls /data/*.car.zst | tail -n 1) \
           --forest $$FOREST_API_INFO \
diff --git a/scripts/tests/bootstrapper/.env b/scripts/tests/bootstrapper/.env
index 03d52e67275d..32d0577d0ae8 100644
--- a/scripts/tests/bootstrapper/.env
+++ b/scripts/tests/bootstrapper/.env
@@ -1,5 +1,5 @@
 # Note: this should be a `fat` image so that it contains the pre-downloaded filecoin proof parameters
-LOTUS_IMAGE=filecoin/lotus-all-in-one:v1.35.1-rc1-calibnet
+LOTUS_IMAGE=filecoin/lotus-all-in-one:v1.35.1-calibnet
 FIL_PROOFS_PARAMETER_CACHE=/var/tmp/filecoin-proof-parameters
 LOTUS_RPC_PORT=1234
 FOREST_RPC_PORT=2345
diff --git a/scripts/tests/snapshot_parity/.env b/scripts/tests/snapshot_parity/.env
index 9c33cb273d68..6fb16cb0a267 100644
--- a/scripts/tests/snapshot_parity/.env
+++ b/scripts/tests/snapshot_parity/.env
@@ -1,4 +1,4 @@
-LOTUS_IMAGE=filecoin/lotus-all-in-one:v1.35.1-rc1-calibnet
+LOTUS_IMAGE=filecoin/lotus-all-in-one:v1.35.1-calibnet
 FIL_PROOFS_PARAMETER_CACHE=/var/tmp/filecoin-proof-parameters
 LOTUS_RPC_PORT=1234
 FOREST_RPC_PORT=2345