diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 490c7249c..61ba22663 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -52,6 +52,7 @@ steps:
               - <<: *commandContainer
                 command:
                 - |-
+                  git submodule update --init
                   make unit_test
                   .buildkite/scripts/gen_coverage_metadata.sh .build/metadata.txt
       - docker-compose#v3.0.0:
@@ -72,6 +73,7 @@ steps:
               - <<: *commandContainer
                 command:
                 - |-
+                  git submodule update --init
                   ./scripts/golint.sh
       - docker-compose#v3.0.0:
           run: unit-test
@@ -92,6 +94,7 @@ steps:
               - <<: *commandContainer
                 command:
                 - |-
+                  git submodule update --init
                   make integ_test_sticky_off
       - docker-compose#v3.0.0:
           run: integ-test
@@ -112,6 +115,7 @@ steps:
               - <<: *commandContainer
                 command:
                 - |-
+                  git submodule update --init
                   make integ_test_sticky_on
       - docker-compose#v3.0.0:
           run: integ-test
@@ -132,6 +136,7 @@ steps:
               - <<: *commandContainer
                 command:
                 - |-
+                  git submodule update --init
                   make integ_test_grpc
       - docker-compose#v3.0.0:
           run: integ-test-grpc
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index 98ff28bbb..e0ccdf01f 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -7,6 +7,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
+          submodules: 'true'
           fetch-depth: 0
 
       - name: Set up Go
diff --git a/docker/buildkite/Dockerfile b/docker/buildkite/Dockerfile
index 86570f243..d9f41953d 100644
--- a/docker/buildkite/Dockerfile
+++ b/docker/buildkite/Dockerfile
@@ -4,6 +4,7 @@ RUN mkdir -p /go/src/go.uber.org/cadence
 WORKDIR /go/src/go.uber.org/cadence
 
 ADD go.mod go.sum /go/src/go.uber.org/cadence/
+ADD idls /go/src/go.uber.org/cadence/idls
 
 # allow git-status and similar to work
 RUN git config --global --add safe.directory /go/src/go.uber.org/cadence
diff --git a/go.mod b/go.mod
index 1097a88f5..2ff74d305 100644
--- a/go.mod
+++ b/go.mod
@@ -114,3 +114,5 @@ retract (
 	v0.3.0 // Published accidentally
 	v0.2.0 // Published accidentally
 )
+
+replace github.com/uber/cadence-idl => ./idls
diff --git a/go.sum b/go.sum
index af9380393..50446c519 100644
--- a/go.sum
+++ b/go.sum
@@ -203,8 +203,6 @@ github.com/uber-go/mapdecode v1.0.0/go.mod h1:b5nP15FwXTgpjTjeA9A2uTHXV5UJCl4arw
 github.com/uber-go/tally v3.3.12+incompatible/go.mod h1:YDTIBxdXyOU/sCWilKB4bgyufu1cEi0jdVnRdxvjnmU=
 github.com/uber-go/tally v3.3.15+incompatible h1:9hLSgNBP28CjIaDmAuRTq9qV+UZY+9PcvAkXO4nNMwg=
 github.com/uber-go/tally v3.3.15+incompatible/go.mod h1:YDTIBxdXyOU/sCWilKB4bgyufu1cEi0jdVnRdxvjnmU=
-github.com/uber/cadence-idl v0.0.0-20240416202333-83d5cae7fc51 h1:gAdDymipzIzh7PTPAW7DjFT2BOEwY7hwC0COsZIulsI=
-github.com/uber/cadence-idl v0.0.0-20240416202333-83d5cae7fc51/go.mod h1:oyUK7GCNCRHCCyWyzifSzXpVrRYVBbAMHAzF5dXiKws=
 github.com/uber/jaeger-client-go v2.22.1+incompatible h1:NHcubEkVbahf9t3p75TOCR83gdUHXjRJvjoBh1yACsM=
 github.com/uber/jaeger-client-go v2.22.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
 github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=