diff --git a/docker-compose.yaml b/docker-compose.yaml
index 3ef3c1b..a2b874c 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -29,9 +29,9 @@ services:
     environment:
       HOST: arns-service
       PORT: 3000
-      GATEWAY_HOST: arlocal
-      GATEWAY_PORT: 1984
-      GATEWAY_PROTOCOL: http
+      GATEWAY_HOST: ${GATEWAY_HOST:-arlocal}
+      GATEWAY_PORT: ${GATEWAY_PORT:-1984}
+      GATEWAY_PROTOCOL: ${GATEWAY_PROTOCOL:-http}
     depends_on:
       - arlocal
       - arns-service
diff --git a/tests/integration/routes.test.ts b/tests/integration/routes.test.ts
index 20ff0dd..bac5305 100644
--- a/tests/integration/routes.test.ts
+++ b/tests/integration/routes.test.ts
@@ -168,21 +168,19 @@ describe('Integration tests', () => {
           const exampleSortKey = 'example-sort-key';
 
           const { status } = await axios.get(
-            `/v1/contract/${id}/interactions?blockHeight=${validBlockHeight}&sortKey=${exampleSortKey}`,
+            `/v1/contract/${id}?blockHeight=${validBlockHeight}&sortKey=${exampleSortKey}`,
           );
           expect(status).to.equal(400);
         });
 
         it('should return contract state evaluated up to a given block height query param', async () => {
-          // block height before the interactions were created
+          // block height before other interactions
           const blockHeight = 1;
-
           const { status, data } = await axios.get(
-            `/v1/contract/${id}/interactions?blockHeight=${blockHeight}`,
+            `/v1/contract/${id}?blockHeight=${blockHeight}`,
           );
           const { contractTxId, state, evaluationOptions, sortKey } = data;
           expect(status).to.equal(200);
-          expect(data).not.to.be.undefined;
           expect(contractTxId).to.equal(id);
           expect(evaluationOptions).not.to.be.undefined;
           expect(state).not.to.be.undefined;