diff --git a/Dockerfile b/Dockerfile
index 3395f6d..f483712 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.4.8-alpine3.23
+FROM ruby:3.4.8-alpine3.23 AS builder
 
 ARG TERRAFYING_VERSION=0.0.0
 ENV TERRAFORM_VERSION=1.2.8
@@ -12,13 +12,22 @@ RUN wget -O terraform.zip https://releases.hashicorp.com/terraform/${TERRAFORM_V
 COPY pkg /tmp
 
 RUN apk add --update --no-cache --virtual .terra-builddeps build-base ruby-dev \
- && apk add --update --no-cache --virtual .terra-rundeps git bash \
- && gem install /tmp/terrafying-components-${TERRAFYING_VERSION}.gem \
- && install -d /terra \
+ && gem install --install-dir /usr/local/bundle /tmp/terrafying-components-${TERRAFYING_VERSION}.gem \
+ && install -d -o 65532 -g 65532 /terra \
  && apk del .terra-builddeps \
  && rm -rf /var/cache/apk/*
 
+FROM dhi.io/ruby:3.4-alpine3.23
+
+ENV GEM_HOME=/usr/local/bundle
+ENV GEM_PATH=/usr/local/bundle
+ENV PATH=/usr/local/bundle/bin:$PATH
+
+COPY --from=builder /usr/bin/terraform /usr/bin/terraform
+COPY --from=builder /usr/local/bundle /usr/local/bundle
+COPY --from=builder --chown=65532:65532 /terra /terra
+
 WORKDIR /terra
 
 ENTRYPOINT []
-CMD ["/bin/bash"]
+CMD ["ruby"]