diff --git a/Cargo.lock b/Cargo.lock
index 563e43cd..fe30b2b1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -243,7 +243,7 @@ dependencies = [
  "colored",
  "era-compiler-common",
  "era-compiler-llvm-context",
- "era-compiler-solidity",
+ "era-compiler-solidity 1.5.0",
  "era-compiler-vyper",
  "evm",
  "glob",
@@ -265,8 +265,8 @@ dependencies = [
  "solidity-adapter",
  "structopt",
  "web3",
- "zkevm-assembly",
- "zkevm_opcode_defs",
+ "zkevm-assembly 1.4.1",
+ "zkevm_opcode_defs 1.4.1",
  "zkevm_tester",
 ]
 
@@ -277,11 +277,11 @@ dependencies = [
  "anyhow",
  "compiler-tester",
  "era-compiler-llvm-context",
- "era-compiler-solidity",
+ "era-compiler-solidity 1.4.1",
  "libfuzzer-sys",
  "semver",
  "solidity-adapter",
- "zkevm-assembly",
+ "zkevm-assembly 1.4.1",
  "zkevm_tester",
 ]
 
@@ -393,6 +393,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
 dependencies = [
  "const-oid",
+ "pem-rfc7468",
  "zeroize",
 ]
 
@@ -453,6 +454,7 @@ dependencies = [
  "ff",
  "generic-array",
  "group",
+ "pem-rfc7468",
  "pkcs8",
  "rand_core 0.6.4",
  "sec1",
@@ -517,8 +519,8 @@ dependencies = [
  "serde",
  "sha2",
  "sha3",
- "zkevm-assembly",
- "zkevm_opcode_defs",
+ "zkevm-assembly 1.4.1",
+ "zkevm_opcode_defs 1.4.1",
 ]
 
 [[package]]
@@ -547,13 +549,42 @@ dependencies = [
  "structopt",
  "thiserror",
  "which",
- "zkevm-assembly",
+ "zkevm-assembly 1.4.1",
+]
+
+[[package]]
+name = "era-compiler-solidity"
+version = "1.5.0"
+source = "git+https://github.com/matter-labs/era-compiler-solidity?branch=aba-fix-crt-links#106c0ebaf565fdf410da9e87c971bc3dfd4d2a6e"
+dependencies = [
+ "anyhow",
+ "colored",
+ "era-compiler-common",
+ "era-compiler-llvm-context",
+ "hex",
+ "inkwell",
+ "md5",
+ "mimalloc",
+ "num",
+ "once_cell",
+ "path-slash",
+ "rand 0.8.5",
+ "rayon",
+ "regex",
+ "semver",
+ "serde",
+ "serde_json",
+ "sha3",
+ "structopt",
+ "thiserror",
+ "which",
+ "zkevm-assembly 1.5.0",
 ]
 
 [[package]]
 name = "era-compiler-vyper"
-version = "1.4.1"
-source = "git+https://github.com/matter-labs/era-compiler-vyper?branch=main#8fc8c76e4592f7b16619ab9b76a8f38521f54e4b"
+version = "1.5.0"
+source = "git+https://github.com/matter-labs/era-compiler-vyper?branch=aba-fix-crt-linkage#b2576496fa9f7fc59129f06f2ccc5c81b68579b2"
 dependencies = [
  "anyhow",
  "colored",
@@ -572,8 +603,8 @@ dependencies = [
  "sha3",
  "structopt",
  "which",
- "zkevm-assembly",
- "zkevm_opcode_defs",
+ "zkevm-assembly 1.5.0",
+ "zkevm_opcode_defs 1.5.0",
 ]
 
 [[package]]
@@ -1433,6 +1464,18 @@ version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
+[[package]]
+name = "p256"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
+dependencies = [
+ "ecdsa",
+ "elliptic-curve",
+ "primeorder",
+ "sha2",
+]
+
 [[package]]
 name = "parity-scale-codec"
 version = "3.6.9"
@@ -1488,6 +1531,15 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42"
 
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -1542,6 +1594,15 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
+[[package]]
+name = "primeorder"
+version = "0.13.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
+dependencies = [
+ "elliptic-curve",
+]
+
 [[package]]
 name = "primitive-types"
 version = "0.12.2"
@@ -2898,7 +2959,7 @@ dependencies = [
  "serde_json",
  "static_assertions",
  "zk_evm_abstractions",
- "zkevm_opcode_defs",
+ "zkevm_opcode_defs 1.4.1",
 ]
 
 [[package]]
@@ -2910,7 +2971,7 @@ dependencies = [
  "num_enum",
  "serde",
  "static_assertions",
- "zkevm_opcode_defs",
+ "zkevm_opcode_defs 1.4.1",
 ]
 
 [[package]]
@@ -2929,7 +2990,26 @@ dependencies = [
  "smallvec",
  "structopt",
  "thiserror",
- "zkevm_opcode_defs",
+ "zkevm_opcode_defs 1.4.1",
+]
+
+[[package]]
+name = "zkevm-assembly"
+version = "1.5.0"
+source = "git+https://github.com/matter-labs/era-zkEVM-assembly?branch=v1.5.0#2faea98303377cad71f4c7d8dacb9c6546874602"
+dependencies = [
+ "env_logger",
+ "hex",
+ "lazy_static",
+ "log",
+ "nom",
+ "num-bigint",
+ "num-traits",
+ "sha3",
+ "smallvec",
+ "structopt",
+ "thiserror",
+ "zkevm_opcode_defs 1.5.0",
 ]
 
 [[package]]
@@ -2946,6 +3026,22 @@ dependencies = [
  "sha3",
 ]
 
+[[package]]
+name = "zkevm_opcode_defs"
+version = "1.5.0"
+source = "git+https://github.com/matter-labs/era-zkevm_opcode_defs?branch=v1.5.0#109d9f734804a8b9dc0531c0b576e2a0f55a40de"
+dependencies = [
+ "bitflags 2.5.0",
+ "blake2",
+ "ethereum-types",
+ "k256",
+ "lazy_static",
+ "p256",
+ "serde",
+ "sha2",
+ "sha3",
+]
+
 [[package]]
 name = "zkevm_tester"
 version = "1.4.1"
@@ -2963,5 +3059,5 @@ dependencies = [
  "vlog",
  "zk_evm",
  "zk_evm_abstractions",
- "zkevm-assembly",
+ "zkevm-assembly 1.4.1",
 ]
diff --git a/compiler_tester/Cargo.toml b/compiler_tester/Cargo.toml
index d012ac35..ed108fe5 100644
--- a/compiler_tester/Cargo.toml
+++ b/compiler_tester/Cargo.toml
@@ -44,8 +44,8 @@ zkevm_tester = { git = "https://github.com/matter-labs/era-zkevm_tester", branch
 
 era-compiler-common = { git = "https://github.com/matter-labs/era-compiler-common", branch = "main" }
 era-compiler-llvm-context = { git = "https://github.com/matter-labs/era-compiler-llvm-context", branch = "main" }
-era-compiler-solidity = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "main" }
-era-compiler-vyper = { git = "https://github.com/matter-labs/era-compiler-vyper", branch = "main" }
+era-compiler-solidity = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "aba-fix-crt-links" }
+era-compiler-vyper = { git = "https://github.com/matter-labs/era-compiler-vyper", branch = "aba-fix-crt-linkage" }
 
 # era-compiler-common = { path = "../../era-compiler-common" }
 # era-compiler-llvm-context = { path = "../../era-compiler-llvm-context" }