diff --git a/.github/workflows/on-pr-manual.yml b/.github/workflows/on-pr-manual.yml
index 26807cb..d5d015a 100644
--- a/.github/workflows/on-pr-manual.yml
+++ b/.github/workflows/on-pr-manual.yml
@@ -14,14 +14,15 @@ on:
 
 jobs:
   build:
-    name: Run docker build
+    name: Run Docker Build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Run docker build
         run: make docker-build
-  test:
-    name: Run unit tests
+
+  unit-test:
+    name: Run Unit Tests
     runs-on: ubuntu-latest
     env:
       GOPATH: /tmp/go
@@ -53,6 +54,56 @@ jobs:
           echo vulcanize_ipld_ethcl_indexer=$GITHUB_WORKSPACE/ipld-ethcl-indexer >> ./config.sh
           cat ./config.sh
 
+      - uses: actions/setup-go@v3
+        with:
+          go-version: ">=1.17.0"
+          check-latest: true
+
+      - name: Install packages
+        run: |
+          go install github.com/onsi/ginkgo/v2/ginkgo@latest
+          which ginkgo
+
+      - name: Run the tests using Make
+        run: |
+          cd ipld-ethcl-indexer
+          make unit-test-ci
+
+  integration-test:
+    name: Run Integration Tests
+    runs-on: ubuntu-latest
+    env:
+      foundry-test-ref: feature/build-stack
+      ipld-eth-db-ref: main
+      GOPATH: /tmp/go
+    steps:
+      - name: Create GOPATH
+        run: mkdir -p /tmp/go
+
+      - uses: actions/checkout@v2
+        with:
+          path: "./ipld-ethcl-indexer"
+
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.inputs.foundry-test-ref }}
+          path: "./foundry-test/"
+          repository: vulcanize/foundry-test
+          fetch-depth: 0
+
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.inputs.ipld-eth-db-ref }}
+          repository: vulcanize/ipld-eth-db
+          path: "./ipld-eth-db/"
+          fetch-depth: 0
+
+      - name: Create config file
+        run: |
+          echo vulcanize_ipld_eth_db=$GITHUB_WORKSPACE/ipld-eth-db/ > ./config.sh
+          echo vulcanize_ipld_ethcl_indexer=$GITHUB_WORKSPACE/ipld-ethcl-indexer >> ./config.sh
+          cat ./config.sh
+
       - name: Run docker compose
         run: |
           docker-compose  \
@@ -74,4 +125,16 @@ jobs:
       - name: Run the tests using Make
         run: |
           cd ipld-ethcl-indexer
-          make test
+          make integration-test-ci
+
+  golangci:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-go@v3
+        with:
+          go-version: ">=1.17.0"
+      - uses: actions/checkout@v3
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          args: --disable errcheck