diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index e9bce5ade..4713572b7 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -1,4 +1,4 @@
-name: 'Build and Deploy'
+name: "Build and Deploy"
 
 on:
   workflow_call:
@@ -41,7 +41,7 @@ jobs:
 
       - name: Install dfx
         uses: dfinity/setup-dfx@main
-        with: 
+        with:
           dfx-version: "0.23.0"
 
       - name: Install Protobuf compiler
@@ -70,9 +70,6 @@ jobs:
           export RUST_BACKTRACE="full"
           sudo apt update
           sudo apt install -y gcc-multilib libunwind-dev ca-certificates
-          mkdir -p /usr/local/share/ca-certificates/
-          sudo cp btc-deploy/mkcert/* /usr/local/share/ca-certificates/
-          sudo update-ca-certificates --fresh --verbose
 
       - name: build solidity contracts
         run: |
diff --git a/btc-deploy/docker-compose.yml b/btc-deploy/docker-compose.yml
index 92da9ff0e..3b2fee4c8 100644
--- a/btc-deploy/docker-compose.yml
+++ b/btc-deploy/docker-compose.yml
@@ -61,10 +61,3 @@ services:
       POSTGRES_PASSWORD: postgres
       POSTGRES_DB: postgres
       POSTGRES_PORT: 5432
-
-  evm-rpc-canister-proxy:
-    image: ghcr.io/bitfinity-network/testing-local-ssl-proxy:latest
-    ports:
-      - "8002:8002"
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
diff --git a/btc-deploy/mkcert/localhost+3-key.pem b/btc-deploy/mkcert/localhost+3-key.pem
deleted file mode 100644
index 410d590c6..000000000
--- a/btc-deploy/mkcert/localhost+3-key.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCnvj+5wh6rQ+Cx
-Xaf7WPalvRhBSvDroU/yKDOAAVJxc9ibe9RdwBGhwrZnsJmbIolEjKS8E19fQWRV
-ZVCPXAt2ah2f1yYQW5gLOuUgBcAl78YwfB5QGhr0PcsP8FBSrIaH9+GlOrpNpQn7
-iPKhh411svxg5RhIzrM5L9yHlb/IqyzR8bYtwpH6v54d7TWlY2ll+zb2dkPHRKYZ
-asZNnskBuLchJqcvonelB3ZbUIb9ftu+lB8rTC1tNSkpYvNHiTyI+G9WaQN1LqP/
-uRS90VKAtZ8ugxvAZ/H0zBGVdgIe7nrosjTVi4yvdQuENIdAFaaGsECiG23FkqJC
-OXsDQsJXAgMBAAECggEAdNWXLzwc/m8NvpwcF35UdQYrMbcP7R7zPxhvHnZNRQZK
-Vam/NflEjqW/RKOFqb85WsyXJQRdRkyWpMAnh2K1/SlWLvG86mHRmejQlChNOF80
-bKrWtjYolfvARv68A4l1PpkRynMINnKAbHlrfcSba+JZ1OdcrcGCpY9HjAxqg0pN
-vDxpJRUDZfc6lx+UfxduMECrvTxrIs9A9ip8nioSjdUyPb6S4uU2JFV+0DLRIqM7
-aqcu5BX26swYxkjxUbDjQLkgaaL1wlyu0RP3DD1kWnH2PR41Rrl7pxBmRiQF7wfS
-3UmY08TpXEH9FeHEWKA/HCRH7q8i5b3fxOZfvaKgQQKBgQDGJJMzCTcsp6OapJPL
-GZRdCDKixqC9H0dqfr85N1fRucZExryXST77DA0SUxzK7RXfHq7bRnP2kBpM07V8
-AK6o/Zzl2sTuoI5zCKJop2AgKXaStxIT3TVqKQzOsqaN02PBsolVxmY4mSEgpWso
-OPWsTjU1w2n2bK6u57iVVRb69wKBgQDYuUIDvL2Np1pljJiKCz7dNsMWoqgXaNrZ
-kzyWYFGyNGdYQLC2G/JoQkyHRqnNp5b61KHZ1x87S6kOBYxm4Vq9+oWy+tKmbLap
-nH55hcIJS37G7etEIEoZjpVMZQEb/ikZ5yGTCBeTiE7Z7a7WV1vgBEVtWG5k0Xgc
-uhWNNcg7oQKBgDaaJaZOx9GacM9QwxmY9vWcKLgKnIkBcaC7RN7zjVPSKf0R9y6J
-lL2B2KhQFwMkyn4t6mmqxJIRq+23+a8uUPNo0C/XVaWcwSSaIIdOeILkajSMFoM6
-1llm7oyXVqaGtlrOZGIqxkiaijKA40K2T50oACnMrAqocIrqeEdOp4KJAoGBALuR
-GqFBaIyAmqvo0twmf3HVQ2MDw5b/GOnVlEpRcmNZF1g6JLZ32YSCXNl3Pt7OfMz5
-2lo+5Ljc8qNAChPAVli1yaDtlAKVdEG3P37NVPHWdRKWN1fu2jLkRDKp+BvSDKBu
-eZBXIJB/GD9khjzbvphTGgNY1bJL2DiElMJyGaoBAoGAJxFNEaUsvYYoeaDaVCyh
-bXQ+rNTTYXXLYcNQrFMuUSEgu8+81Qz+kS5KYWHpJzufEa5cvGrzOS7YCaBHasCI
-rJRrEVfXN9HvQV7OIMO1H5p7tMc5kLReDESzWICKmj5FOMIZ21l8gUW4hhpoYjyx
-nofwsH49aUjArbOaij+G3i0=
------END PRIVATE KEY-----
diff --git a/btc-deploy/mkcert/localhost+3.crt b/btc-deploy/mkcert/localhost+3.crt
deleted file mode 100644
index 29f6fb0d1..000000000
--- a/btc-deploy/mkcert/localhost+3.crt
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEEjCCAnqgAwIBAgIRAJru0JwaMFZYqgRbvr0hb9cwDQYJKoZIhvcNAQELBQAw
-VzEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMRYwFAYDVQQLDA1tYXhp
-bUBtYXhib29rMR0wGwYDVQQDDBRta2NlcnQgbWF4aW1AbWF4Ym9vazAeFw0yNDA0
-MjYwODM5NTBaFw0yNjA3MjYwODM5NTBaMEExJzAlBgNVBAoTHm1rY2VydCBkZXZl
-bG9wbWVudCBjZXJ0aWZpY2F0ZTEWMBQGA1UECwwNbWF4aW1AbWF4Ym9vazCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKe+P7nCHqtD4LFdp/tY9qW9GEFK
-8OuhT/IoM4ABUnFz2Jt71F3AEaHCtmewmZsiiUSMpLwTX19BZFVlUI9cC3ZqHZ/X
-JhBbmAs65SAFwCXvxjB8HlAaGvQ9yw/wUFKshof34aU6uk2lCfuI8qGHjXWy/GDl
-GEjOszkv3IeVv8irLNHxti3Ckfq/nh3tNaVjaWX7NvZ2Q8dEphlqxk2eyQG4tyEm
-py+id6UHdltQhv1+276UHytMLW01KSli80eJPIj4b1ZpA3Uuo/+5FL3RUoC1ny6D
-G8Bn8fTMEZV2Ah7ueuiyNNWLjK91C4Q0h0AVpoawQKIbbcWSokI5ewNCwlcCAwEA
-AaNvMG0wDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB8GA1Ud
-IwQYMBaAFMti8ob5zzTx7WDfIVgddRoJVV6+MCUGA1UdEQQeMByCCWxvY2FsaG9z
-dIIDb3JkhwR/AAABhwQAAAAAMA0GCSqGSIb3DQEBCwUAA4IBgQA9L5At08+Uyc0g
-CcXOtA2Knt6MKEvIjzqfpN1uEjgyiySXBcln6us5HxlOTHv+BmuDfKFMr1B51nln
-6t1n5cXiNV3XarTTieOUGt8G2uazfcbTEpuwJ/awpFq+OeEijrVJpSTocEr0vKqK
-510tSBwpGaypmpgRUizEfAItmxn78flxvQU91UWFcCPLX5uSxrnThr21m75FdXiZ
-cBnHEKLKfH/lMoDyzgi0X1kTgLAnCtwDe1bpzM2m04GS/NS5x3yVQ/UHS5Gk3e6X
-HOeqfSCSIxtD211UewboIBmtNujXCi53r+4SmHTMQk+dK3krONxKdnXTYWzMfpQL
-9us3kepDPhGfqDVec9FxtVKzLUujmPnaQnTye10hNFGdaajtyd9aGwWqi2xjSYal
-QYepHDoa2Y3lV4r7bX0zxzSBMLJn8WREM3ialigYIj1nYZ8jM2lWJGhBDYi4O8vO
-hOGluly3AbWPuaMmBDN6YN7ZftVBXHCSxEGoCVB75eUq1a1Ydok=
------END CERTIFICATE-----
diff --git a/btc-deploy/mkcert/rootCA-key.pem b/btc-deploy/mkcert/rootCA-key.pem
deleted file mode 100644
index 7b17313c0..000000000
--- a/btc-deploy/mkcert/rootCA-key.pem
+++ /dev/null
@@ -1,40 +0,0 @@
------BEGIN PRIVATE KEY-----
-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
-3JXOJ68P5SOPoXKz4so4l4Gijw==
------END PRIVATE KEY-----
diff --git a/btc-deploy/mkcert/rootCA.crt b/btc-deploy/mkcert/rootCA.crt
deleted file mode 100644
index cd5c3e838..000000000
--- a/btc-deploy/mkcert/rootCA.crt
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEfTCCAuWgAwIBAgIQJPvGiqygFJL9/U6KC6pS4DANBgkqhkiG9w0BAQsFADBX
-MR4wHAYDVQQKExVta2NlcnQgZGV2ZWxvcG1lbnQgQ0ExFjAUBgNVBAsMDW1heGlt
-QG1heGJvb2sxHTAbBgNVBAMMFG1rY2VydCBtYXhpbUBtYXhib29rMB4XDTI0MDQx
-NTA1MjExMloXDTM0MDQxNTA1MjExMlowVzEeMBwGA1UEChMVbWtjZXJ0IGRldmVs
-b3BtZW50IENBMRYwFAYDVQQLDA1tYXhpbUBtYXhib29rMR0wGwYDVQQDDBRta2Nl
-cnQgbWF4aW1AbWF4Ym9vazCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGB
-ALmC7UdNk7PQU1SLTpSGmRHGgZ+lhlxdmzLdL3fVuovM/bu+Fvmyekxbtu1g6Hbx
-Jf/FDHipsxOCKB4XJegBDglCmZKWSu+aWewG74JH2041NvsUcPVkDxlHp2uXw+ST
-KlO4Wv3XblUgmGJ6aNZfZUE4sJbQDERkIeoefLgD+L1tespH63PqGghu8MYaB2cf
-y1pYqxD5+zjw3xi4DuzFJnST+Q0FHWcS5Ha1nrGQOg5/Sz2cmH+yVSqNqAee1RbQ
-rUncsIVcxcDKilE8GAqVsEupfMUZA8Fm58Jkwv6m46wi52YeiWjBwDCbHrC9xcm1
-J47GfjKg8kRpdObvpfIATyq2RWrGwbyPKa9nnOWQlV1dMTssXI6hu2Y4d4P6rh2S
-fEkf9+oNEMK+Mp2B5H1S3a3MSaf9ZlyMcmQF8HB9MRhFWxfT3DXFTodWk8ZxGB0e
-57RUhBbgj9Nejy6WYHFrN15bYEjZs53vJ96AgKdxbpoFkH6ZwP+SrUnP9w5Ak2Mr
-LQIDAQABo0UwQzAOBgNVHQ8BAf8EBAMCAgQwEgYDVR0TAQH/BAgwBgEB/wIBADAd
-BgNVHQ4EFgQUy2LyhvnPNPHtYN8hWB11GglVXr4wDQYJKoZIhvcNAQELBQADggGB
-ACMFjqqE8Cev8Knumh+w3tJ3eYBcoMitgTcymio1YwhyNnhzqEzQZ3+xdJupOYzi
-AnnTb+aZb4HyarNS933QNaOAWaOtjJSUBaMRuiFuOAqaSdsUyO8mpHitpcAKCAnd
-6upwWjpujc6VRLHLo70fbhkHpMDqhsecSIB4WinMxR4r4ecJBQ9yMic3YfWXVRXt
-hKXurqSFm1oxcZRhpD0RsFaVjmQeRrb85v+T32eCYis/hctRw8HiEAeYXPnfM6bD
-dUqmGPz6sFW4XnCa36SxE2BiCgb2k8NzCxnsEcdXm+zjIdZjbKy+CO+uXwi6usEl
-VLL5i402Tmacs0yz8U96eQq5PsXwj6WLu6oVYEE4OzO0b8ewU2d28df3kKywVC+7
-GqdkPJc/6L/pCWTE0c/DkeC7VcGkwRVyoT9JPp6Z984f84GG40kVt7OaufJpXkKv
-Xdroa/5i+oIA2NPUJpMLXtfENtYGQFmWf4+LjDs7aHgac23IaZpWtPomGh/gFlx3
-WA==
------END CERTIFICATE-----
diff --git a/docs/deploy.md b/docs/deploy.md
index aa620e159..86e29ed93 100644
--- a/docs/deploy.md
+++ b/docs/deploy.md
@@ -1,12 +1,12 @@
 # Deploy
 
 - [Deploy](#deploy)
-    - [Requirements](#requirements)
-        - [Ubuntu 24.04 additional dependencies](#ubuntu-2404-additional-dependencies)
-    - [Build](#build)
-    - [Local test EVM deployment](#local-test-evm-deployment)
-    - [Bridge deployment](#bridge-deployment)
-        - [Erc20 bridge](#erc20-bridge)
+  - [Requirements](#requirements)
+    - [Ubuntu 24.04 additional dependencies](#ubuntu-2404-additional-dependencies)
+  - [Build](#build)
+  - [Local test EVM deployment](#local-test-evm-deployment)
+  - [Bridge deployment](#bridge-deployment)
+    - [Erc20 bridge](#erc20-bridge)
 
 ## Requirements
 
@@ -23,23 +23,6 @@
     ```
 
 - Install [just](https://just.systems/) command runner.
-- Install SSL certificates to make the `local-ssl-proxy` in the docker images able to work.
-
-  On Debian-based systems it should be enough to run
-
-    ```sh
-    sudo cp btc-deploy/mkcert/* /usr/local/share/ca-certificates/
-    sudo update-ca-certificates --fresh --verbose
-    ```
-
-  On Arch linux based systems
-
-    ```sh
-    sudo trust anchor btc-deploy/mkcert/*
-    sudo update-ca-trust
-    ```
-
-  While on MacOS you should install them by clicking on the certificates in the mkcert folder.
 
 ### Ubuntu 24.04 additional dependencies
 
diff --git a/src/bridge-did/src/init/brc20.rs b/src/bridge-did/src/init/brc20.rs
index adf3e4821..63af688a2 100644
--- a/src/bridge-did/src/init/brc20.rs
+++ b/src/bridge-did/src/init/brc20.rs
@@ -62,9 +62,9 @@ impl Brc20BridgeConfig {
         if self
             .indexer_urls
             .iter()
-            .any(|url| !url.starts_with("https"))
+            .any(|url| !url.starts_with("https") && !url.starts_with("http://localhost"))
         {
-            return Err("Indexer url must specify https url".to_string());
+            return Err("Indexer url must etiher specify https url or be localhost".to_string());
         }
 
         Ok(())
diff --git a/src/bridge-did/src/init/rune.rs b/src/bridge-did/src/init/rune.rs
index 2700ae6eb..0f2bae249 100644
--- a/src/bridge-did/src/init/rune.rs
+++ b/src/bridge-did/src/init/rune.rs
@@ -73,10 +73,12 @@ pub enum IndexerType {
 impl IndexerType {
     fn validate(&self) -> Result<(), String> {
         match self {
-            Self::OrdHttp { url } if !url.starts_with("https") => {
-                Err("Indexer url must specify https url".to_string())
+            Self::OrdHttp { url }
+                if url.starts_with("https") || url.starts_with("http://localhost") =>
+            {
+                Ok(())
             }
-            _ => Ok(()),
+            _ => Err("Indexer url must etiher specify https url or be localhost".to_string()),
         }
     }
 
diff --git a/src/integration-tests/tests/context/brc20_bridge.rs b/src/integration-tests/tests/context/brc20_bridge.rs
index a63d8b1f5..e51d59d77 100644
--- a/src/integration-tests/tests/context/brc20_bridge.rs
+++ b/src/integration-tests/tests/context/brc20_bridge.rs
@@ -28,7 +28,6 @@ use ord_rs::Utxo;
 use tokio::sync::{Mutex, RwLock};
 use tokio::time::Instant;
 
-use super::CanisterType;
 use crate::context::TestContext;
 use crate::utils::brc20_helper::Brc20Helper;
 use crate::utils::btc_rpc_client::BitcoinRpcClient;
@@ -214,7 +213,7 @@ async fn brc20_setup(brc20_to_deploy: &[Brc20InitArgs]) -> anyhow::Result<Brc20W
 impl Brc20Context<crate::dfx_tests::DfxTestContext> {
     pub async fn dfx(brc20_to_deploy: &[Brc20InitArgs]) -> Self {
         let context =
-            crate::dfx_tests::DfxTestContext::new(&CanisterType::BRC20_CANISTER_SET).await;
+            crate::dfx_tests::DfxTestContext::new(&super::CanisterType::BRC20_CANISTER_SET).await;
 
         Self::new(context, brc20_to_deploy).await
     }
@@ -227,7 +226,7 @@ impl Brc20Context<crate::pocket_ic_integration_test::PocketIcTestContext> {
         use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 
         let context = crate::pocket_ic_integration_test::PocketIcTestContext::new_with(
-            &CanisterType::BRC20_CANISTER_SET,
+            &super::CanisterType::BRC20_CANISTER_SET,
             |builder| {
                 builder
                     .with_ii_subnet()
diff --git a/src/integration-tests/tests/context/mod.rs b/src/integration-tests/tests/context/mod.rs
index 0ca04d807..2f2091e3a 100644
--- a/src/integration-tests/tests/context/mod.rs
+++ b/src/integration-tests/tests/context/mod.rs
@@ -1075,7 +1075,7 @@ pub trait TestContext {
                     .expect("authorize failed");
                 assert!(res, "authorize failed");
                 let hostname = format!(
-                    "https://127.0.0.1:8002/?canisterId={}",
+                    "http://{}.raw.localhost:8000",
                     self.canisters().external_evm()
                 );
                 println!("EVM-RPC provider hostname: {hostname}");
@@ -1472,7 +1472,7 @@ pub fn rune_bridge_canister_init_data(
             btc_cache_timeout_secs: None,
             min_confirmations: 1,
             indexers: vec![IndexerType::OrdHttp {
-                url: "https://localhost:8001".to_string(),
+                url: "http://localhost:8000".to_string(),
             }],
             deposit_fee: 500_000,
             mempool_timeout: Duration::from_secs(60),
@@ -1493,7 +1493,7 @@ pub fn brc20_bridge_canister_init_data(
         Brc20BridgeConfig {
             network: BitcoinNetwork::Regtest,
             min_confirmations: 1,
-            indexer_urls: HashSet::from_iter(["https://localhost:8005".to_string()]),
+            indexer_urls: HashSet::from_iter(["http://localhost:8004".to_string()]),
             deposit_fee: 500_000,
             mempool_timeout: Duration::from_secs(60),
             indexer_consensus_threshold: 1,
diff --git a/src/integration-tests/tests/context/rune_bridge.rs b/src/integration-tests/tests/context/rune_bridge.rs
index ec55eb69c..2c36c99d1 100644
--- a/src/integration-tests/tests/context/rune_bridge.rs
+++ b/src/integration-tests/tests/context/rune_bridge.rs
@@ -29,7 +29,6 @@ use rune_bridge::ops::RuneDepositRequestData;
 use tokio::sync::{Mutex, RwLock};
 use tokio::time::Instant;
 
-use super::CanisterType;
 use crate::context::TestContext;
 use crate::utils::btc_rpc_client::BitcoinRpcClient;
 use crate::utils::miner::{Exit, Miner};
@@ -158,7 +157,8 @@ async fn rune_setup(runes_to_etch: &[String]) -> anyhow::Result<RuneWallet> {
 #[cfg(feature = "dfx_tests")]
 impl RunesContext<crate::dfx_tests::DfxTestContext> {
     pub async fn dfx(runes_to_etch: &[String]) -> Self {
-        let context = crate::dfx_tests::DfxTestContext::new(&CanisterType::RUNE_CANISTER_SET).await;
+        let context =
+            crate::dfx_tests::DfxTestContext::new(&super::CanisterType::RUNE_CANISTER_SET).await;
 
         Self::new(context, runes_to_etch).await
     }
@@ -171,7 +171,7 @@ impl RunesContext<crate::pocket_ic_integration_test::PocketIcTestContext> {
         use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 
         let context = crate::pocket_ic_integration_test::PocketIcTestContext::new_with(
-            &CanisterType::RUNE_CANISTER_SET,
+            &super::CanisterType::RUNE_CANISTER_SET,
             |builder| {
                 builder
                     .with_ii_subnet()
diff --git a/src/integration-tests/tests/dfx_tests/brc20_bridge.rs b/src/integration-tests/tests/dfx_tests/brc20_bridge.rs
index 86561fef8..52d63be80 100644
--- a/src/integration-tests/tests/dfx_tests/brc20_bridge.rs
+++ b/src/integration-tests/tests/dfx_tests/brc20_bridge.rs
@@ -137,6 +137,7 @@ async fn test_should_deposit_and_withdraw_brc20_tokens() {
 }
 
 #[tokio::test]
+#[serial_test::serial]
 async fn test_brc20_bridge_stress_test() {
     let context = crate::dfx_tests::DfxTestContext::new(&CanisterType::BRC20_CANISTER_SET).await;