diff --git a/rollupcreator/Dockerfile b/rollupcreator/Dockerfile
index 622eafb6..13150b58 100644
--- a/rollupcreator/Dockerfile
+++ b/rollupcreator/Dockerfile
@@ -1,14 +1,14 @@
 FROM node:18-bullseye-slim
 RUN apt-get update && \
-    apt-get install -y git docker.io python3 build-essential curl jq
+    apt-get install -y git docker.io python3 make gcc g++ curl jq
 ARG NITRO_CONTRACTS_BRANCH=main
 WORKDIR /workspace  
 RUN git clone --no-checkout https://github.com/OffchainLabs/nitro-contracts.git ./
 RUN git checkout ${NITRO_CONTRACTS_BRANCH}
+RUN yarn install && yarn cache clean
 RUN curl -L https://foundry.paradigm.xyz | bash
 ENV PATH="${PATH}:/root/.foundry/bin"
 RUN foundryup
 RUN touch scripts/config.ts
-RUN yarn install
 RUN yarn build:all
 ENTRYPOINT ["yarn"]
diff --git a/tokenbridge/Dockerfile b/tokenbridge/Dockerfile
index 38d417f1..4adce556 100644
--- a/tokenbridge/Dockerfile
+++ b/tokenbridge/Dockerfile
@@ -1,10 +1,12 @@
 FROM node:18-bullseye-slim
 RUN apt-get update && \
-    apt-get install -y git docker.io python3 build-essential curl jq
+    apt-get install -y git docker.io python3 make gcc g++ curl jq
 ARG TOKEN_BRIDGE_BRANCH=main
 WORKDIR /workspace  
-RUN git clone --no-checkout https://github.com/OffchainLabs/token-bridge-contracts.git ./
-RUN git checkout ${TOKEN_BRIDGE_BRANCH}
-RUN yarn install
+RUN git clone --no-checkout https://github.com/OffchainLabs/token-bridge-contracts.git ./ && \
+    git checkout ${TOKEN_BRIDGE_BRANCH} && \
+    rm -rf .git && \
+    git init && git add . && git -c user.name="user" -c user.email="user@example.com" commit -m "Initial commit"
+RUN yarn install && yarn cache clean
 RUN yarn build
 ENTRYPOINT ["yarn"]