diff --git a/.github/workflows/tests_and_checks.yml b/.github/workflows/tests_and_checks.yml
index 0b17c59f..37e8750d 100644
--- a/.github/workflows/tests_and_checks.yml
+++ b/.github/workflows/tests_and_checks.yml
@@ -1,8 +1,8 @@
 name: Tests and checks
 on: pull_request
 jobs:
-  test:
-    name: App tests
+  unit_tests:
+    name: Unit Tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
@@ -18,6 +18,20 @@ jobs:
         run: yarn lint
       - name: Run tests
         run: yarn test
+
+  e2e_tests:
+    name: E2E Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+      - name: Set up node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: 'yarn'
+      - name: Install dependencies
+        run: yarn install --immutable
       - name: Run e2e transports
         run: docker compose -f docker-compose.test.yml up -d
       - name: Pull kapi
@@ -32,3 +46,4 @@ jobs:
           KEYS_API_URL: http://127.0.0.1:3000
           CHAIN_ID: 17000
           LOCATOR_DEVNET_ADDRESS: "0x28FAB2059C713A7F9D8c86Db49f9bb0e96Af1ef8"
+
diff --git a/hardhat.config.ts b/hardhat.config.ts
index 051a5f71..b49c1cd9 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -6,7 +6,7 @@ dotenv.config();
 const RPC_URL = process.env.RPC_URL!;
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 const secretKey = process.env.WALLET_PRIVATE_KEY!;
-const CHAIN_ID = process.env.CHAIN_ID;
+const CHAIN_ID = process.env.CHAIN_ID || '17000';
 
 const config: HardhatUserConfig = {
   networks: {
@@ -14,6 +14,7 @@ const config: HardhatUserConfig = {
       forking: {
         url: RPC_URL,
       },
+      chainId: parseInt(CHAIN_ID, 10),
       accounts: [
         {
           privateKey: secretKey,