diff --git a/Dockerfile b/Dockerfile
index d22c440f..5375758a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ COPY go.* ./
 COPY . ./
 RUN go mod download
 RUN go mod verify
-RUN CGO_ENABLED=0 go build -o evm-gateway ./cmd/main/main.go
+RUN CGO_ENABLED=1 go build -o evm-gateway ./cmd/main/main.go
 RUN chmod a+x evm-gateway
 RUN chmod a+x ./scripts/run.sh
 
diff --git a/dev/Dockerfile b/dev/Dockerfile
index 66b4f0c6..dd0b884e 100644
--- a/dev/Dockerfile
+++ b/dev/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:latest
 
 # Install curl, Git, and other required dependencies
-RUN apt-get update && apt-get install -y curl git
+RUN apt-get update && apt-get install -y curl git gcc
 
 # Download and verify the Go archive
 RUN curl -LO https://go.dev/dl/go1.22.2.linux-amd64.tar.gz && \
@@ -23,7 +23,7 @@ RUN git clone https://github.com/onflow/flow-evm-gateway.git /app/flow-evm-gatew
 
 RUN cd /app/flow-evm-gateway && go mod download
 RUN cd /app/flow-evm-gateway && go mod verify
-RUN cd /app/flow-evm-gateway && CGO_ENABLED=0 go build -o /app/flow-evm-gateway/evm-gateway /app/flow-evm-gateway/cmd/main/main.go
+RUN cd /app/flow-evm-gateway && CGO_ENABLED=1 go build -o /app/flow-evm-gateway/evm-gateway /app/flow-evm-gateway/cmd/main/main.go
 RUN chmod a+x /app/flow-evm-gateway/evm-gateway
 
 # Copy the flow.json file to the directory where the gateway expects to find it