diff --git a/.github/workflows/build-and-install.yml b/.github/workflows/build-and-install.yml
index 36093f8..ac82f35 100644
--- a/.github/workflows/build-and-install.yml
+++ b/.github/workflows/build-and-install.yml
@@ -41,6 +41,10 @@ jobs:
 
       - name: Build and Push
         run: |
+          docker pull komodoofficial/gaiad:latest@sha256:3e322a09696f70aa1cc7966e3930223f34179a0c33371a4b78a62c4417c4beea
+          docker tag komodoofficial/gaiad:latest@sha256:3e322a09696f70aa1cc7966e3930223f34179a0c33371a4b78a62c4417c4beea komodoofficial/gaiad:kdf-ci
+          docker push komodoofficial/gaiad:kdf-ci
+
           git clone https://github.com/cosmos/gaia
           cd gaia
           docker build -t komodoofficial/gaiad:latest -f ./Dockerfile .
@@ -62,10 +66,15 @@ jobs:
 
       - name: Build and Push
         run: |
+          docker pull komodoofficial/ibc-relayer:latest@sha256:5a4f27d75afa8e4d516506d0043978fc775ae950a42358e2c345b060102a05f5
+          docker tag komodoofficial/ibc-relayer:latest@sha256:5a4f27d75afa8e4d516506d0043978fc775ae950a42358e2c345b060102a05f5 komodoofficial/ibc-relayer:kdf-ci
+          docker push komodoofficial/ibc-relayer:kdf-ci
+
           git clone https://github.com/cosmos/relayer
           cd relayer
+          git checkout df42391dd3ab04fce238adb7b4112d7bd10fa63c
           rm ./Dockerfile
-          cp ../Dockerfile.ibc ./Dockerfile
+          cp ../Dockerfile.rly ./Dockerfile
           docker build -t komodoofficial/ibc-relayer:latest -f ./Dockerfile .
           docker push komodoofficial/ibc-relayer:latest
 
diff --git a/Dockerfile.gaia b/Dockerfile.gaia
new file mode 100644
index 0000000..a93517f
--- /dev/null
+++ b/Dockerfile.gaia
@@ -0,0 +1,32 @@
+ARG IMG_TAG=latest
+
+# Compile the gaiad binary
+FROM golang:1.22-alpine AS gaiad-builder
+WORKDIR /src/app/
+ENV PACKAGES="curl make git libc-dev bash file gcc linux-headers eudev-dev python3"
+RUN apk add --no-cache $PACKAGES
+
+# See https://github.com/CosmWasm/wasmvm/releases
+ARG WASMVM_VERSION=v1.5.0
+ADD https://github.com/CosmWasm/wasmvm/releases/download/${WASMVM_VERSION}/libwasmvm_muslc.aarch64.a /lib/libwasmvm_muslc.aarch64.a
+ADD https://github.com/CosmWasm/wasmvm/releases/download/${WASMVM_VERSION}/libwasmvm_muslc.x86_64.a /lib/libwasmvm_muslc.x86_64.a
+RUN sha256sum /lib/libwasmvm_muslc.aarch64.a | grep 2687afbdae1bc6c7c8b05ae20dfb8ffc7ddc5b4e056697d0f37853dfe294e913
+RUN sha256sum /lib/libwasmvm_muslc.x86_64.a | grep 465e3a088e96fd009a11bfd234c69fb8a0556967677e54511c084f815cf9ce63
+RUN cp "/lib/libwasmvm_muslc.$(uname -m).a" /lib/libwasmvm_muslc.a
+
+COPY go.mod go.sum* ./
+RUN go mod download
+
+COPY . .
+RUN LEDGER_ENABLED=true LINK_STATICALLY=true BUILD_TAGS=muslc make build
+RUN echo "Ensuring binary is statically linked ..."  \
+    && file /src/app/build/gaiad | grep "statically linked"
+
+FROM alpine:$IMG_TAG
+RUN apk add --no-cache build-base
+ARG IMG_TAG
+COPY --from=gaiad-builder  /src/app/build/gaiad /usr/local/bin/
+EXPOSE 26656 26657 1317 9090
+USER 0
+
+ENTRYPOINT ["gaiad", "start"]
diff --git a/Dockerfile.ibc b/Dockerfile.ibc
deleted file mode 100644
index 2f7561e..0000000
--- a/Dockerfile.ibc
+++ /dev/null
@@ -1,71 +0,0 @@
-FROM --platform=$BUILDPLATFORM golang:1.21-alpine3.17 AS build-env
-
-RUN apk add --update --no-cache curl make git libc-dev bash gcc linux-headers eudev-dev
-
-ARG TARGETARCH
-ARG BUILDARCH
-
-RUN if [ "${TARGETARCH}" = "arm64" ] && [ "${BUILDARCH}" != "arm64" ]; then \
-    wget -c https://musl.cc/aarch64-linux-musl-cross.tgz -O - | tar -xzvv --strip-components 1 -C /usr; \
-    elif [ "${TARGETARCH}" = "amd64" ] && [ "${BUILDARCH}" != "amd64" ]; then \
-    wget -c https://musl.cc/x86_64-linux-musl-cross.tgz -O - | tar -xzvv --strip-components 1 -C /usr; \
-    fi
-
-ADD . .
-
-RUN if [ "${TARGETARCH}" = "arm64" ] && [ "${BUILDARCH}" != "arm64" ]; then \
-    export CC=aarch64-linux-musl-gcc CXX=aarch64-linux-musl-g++;\
-    elif [ "${TARGETARCH}" = "amd64" ] && [ "${BUILDARCH}" != "amd64" ]; then \
-    export CC=x86_64-linux-musl-gcc CXX=x86_64-linux-musl-g++; \
-    fi; \
-    GOOS=linux GOARCH=$TARGETARCH CGO_ENABLED=1 LDFLAGS='-linkmode external -extldflags "-static"' make install
-
-RUN if [ -d "/go/bin/linux_${TARGETARCH}" ]; then mv /go/bin/linux_${TARGETARCH}/* /go/bin/; fi
-
-# Use minimal busybox from infra-toolkit image for final scratch image
-FROM ghcr.io/strangelove-ventures/infra-toolkit:v0.0.6 AS busybox-min
-RUN addgroup --gid 1000 -S relayer && adduser --uid 100 -S relayer -G relayer
-
-# Use ln and rm from full featured busybox for assembling final image
-FROM busybox:1.34.1-musl AS busybox-full
-
-# Build final image from scratch
-FROM scratch
-
-LABEL org.opencontainers.image.source="https://github.com/cosmos/relayer"
-
-WORKDIR /bin
-
-# Install ln (for making hard links) and rm (for cleanup) from full busybox image (will be deleted, only needed for image assembly)
-COPY --from=busybox-full /bin/ln /bin/rm ./
-
-# Install minimal busybox image as shell binary (will create hardlinks for the rest of the binaries to this data)
-COPY --from=busybox-min /busybox/busybox /bin/sh
-
-# Add hard links for read-only utils, then remove ln and rm
-# Will then only have one copy of the busybox minimal binary file with all utils pointing to the same underlying inode
-RUN ln sh pwd && \
-    ln sh ls && \
-    ln sh cat && \
-    ln sh less && \
-    ln sh grep && \
-    ln sh sleep && \
-    ln sh env && \
-    ln sh tar && \
-    ln sh tee && \
-    ln sh du && \
-    rm ln rm
-
-# Install chain binaries
-COPY --from=build-env /bin/rly /bin
-
-# Install trusted CA certificates
-COPY --from=busybox-min /etc/ssl/cert.pem /etc/ssl/cert.pem
-
-# Install relayer user
-COPY --from=busybox-min /etc/passwd /etc/passwd
-COPY --from=busybox-min --chown=100:1000 /home/relayer /home/relayer
-
-WORKDIR /home/relayer
-
-ENTRYPOINT ["rly", "start"]
diff --git a/Dockerfile.rly b/Dockerfile.rly
new file mode 100644
index 0000000..4a93552
--- /dev/null
+++ b/Dockerfile.rly
@@ -0,0 +1,32 @@
+FROM --platform=$BUILDPLATFORM golang:1.21-alpine3.17 AS build-env
+
+RUN apk add --update --no-cache curl make git libc-dev bash gcc linux-headers eudev-dev
+
+ARG TARGETARCH
+ARG BUILDARCH
+
+RUN if [ "${TARGETARCH}" = "arm64" ] && [ "${BUILDARCH}" != "arm64" ]; then \
+    wget -c https://musl.cc/aarch64-linux-musl-cross.tgz -O - | tar -xzvv --strip-components 1 -C /usr; \
+    elif [ "${TARGETARCH}" = "amd64" ] && [ "${BUILDARCH}" != "amd64" ]; then \
+    wget -c https://musl.cc/x86_64-linux-musl-cross.tgz -O - | tar -xzvv --strip-components 1 -C /usr; \
+    fi
+
+ADD . .
+
+RUN if [ "${TARGETARCH}" = "arm64" ] && [ "${BUILDARCH}" != "arm64" ]; then \
+    export CC=aarch64-linux-musl-gcc CXX=aarch64-linux-musl-g++;\
+    elif [ "${TARGETARCH}" = "amd64" ] && [ "${BUILDARCH}" != "amd64" ]; then \
+    export CC=x86_64-linux-musl-gcc CXX=x86_64-linux-musl-g++; \
+    fi; \
+    GOOS=linux GOARCH=$TARGETARCH CGO_ENABLED=1 LDFLAGS='-linkmode external -extldflags "-static"' make install
+
+RUN if [ -d "/go/bin/linux_${TARGETARCH}" ]; then mv /go/bin/linux_${TARGETARCH}/* /go/bin/; fi
+
+FROM docker.io/chainguard/static:latest
+
+# Install chain binaries
+COPY --from=build-env /bin/rly /bin
+
+USER 0
+
+ENTRYPOINT ["rly", "start"]
\ No newline at end of file