diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index c1a0067ce..7274fd096 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -27,12 +27,12 @@ steps:
       - "proxy.log"
       - "solana.log"
       - "measurements.log"
-      - "evm_loader.log"
       - "dbcreation.log"
       - "faucet.log"
       - "airdropper.log"
       - "indexer.log"
       - "deploy_contracts.log"
+      - "proxy_program_loader.log"
 
   - label: ":coverage: full test suite (FTS)"
     key: "full_test_suite"
diff --git a/.buildkite/steps/deploy-test.sh b/.buildkite/steps/deploy-test.sh
index 8cf9b4e9b..e65f820d6 100755
--- a/.buildkite/steps/deploy-test.sh
+++ b/.buildkite/steps/deploy-test.sh
@@ -42,13 +42,13 @@ function cleanup_docker {
     fi
 
     if docker logs solana >solana.log 2>&1; then echo "solana logs saved"; fi
-    if docker logs evm_loader >evm_loader.log 2>&1; then echo "evm_loader logs saved"; fi
     if docker logs proxy_program_loader >proxy_program_loader.log 2>&1; then echo "proxy_program_loader logs saved"; fi
     if docker logs dbcreation >dbcreation.log 2>&1; then echo "dbcreation logs saved"; fi
     if docker logs faucet >faucet.log 2>&1; then echo "faucet logs saved"; fi
     if docker logs airdropper >airdropper.log 2>&1; then echo "airdropper logs saved"; fi
     if docker logs indexer >indexer.log 2>&1; then echo "indexer logs saved"; fi
     if docker logs deploy_contracts >deploy_contracts.log 2>&1; then echo "deploy_contracts logs saved"; fi
+    if docker logs proxy_program >proxy_program.log 2>&1; then echo "proxy_program.log logs saved"; fi
 
     echo "\nCleanup docker-compose..."
     docker-compose -f proxy/docker-compose-test.yml down -t 1
diff --git a/.buildkite/steps/full_test_suite/proxy_init.sh b/.buildkite/steps/full_test_suite/proxy_init.sh
index 910e10994..8a1f73ff6 100755
--- a/.buildkite/steps/full_test_suite/proxy_init.sh
+++ b/.buildkite/steps/full_test_suite/proxy_init.sh
@@ -51,11 +51,13 @@ services:
       - SOLANA_URL=$SOLANA_URL
   deploy_contracts:
     command: bash -c "echo done"
+  proxy_program_loader:
+    command: bash -c "echo done"
 EOF
 
 
 # Get list of services
-SERVICES=$(docker-compose -f docker-compose-test.yml config --services | grep -vP "solana|airdropper|prometheus|deploy_contracts")
+SERVICES=$(docker-compose -f docker-compose-test.yml config --services | grep -vP "solana|airdropper|prometheus|deploy_contracts|proxy_program_loader")
 
 
 # Pull latest versions
diff --git a/proxy/docker-compose-test.yml b/proxy/docker-compose-test.yml
index 57de69e83..ce21e45d4 100644
--- a/proxy/docker-compose-test.yml
+++ b/proxy/docker-compose-test.yml
@@ -35,8 +35,6 @@ services:
     depends_on:
       solana:
         condition: service_healthy
-      evm_loader:
-        condition: service_completed_successfully
     command: bash -c "deploy-proxy_program.sh"
 
   postgres: