diff --git a/production.Dockerfile b/production.Dockerfile
index 172e5cf..b0dfec8 100644
--- a/production.Dockerfile
+++ b/production.Dockerfile
@@ -1,23 +1,32 @@
 # syntax=docker/dockerfile:1
 
-FROM ruby:3.2.1-slim
+FROM ruby:3.2.1-slim as base
+
+WORKDIR /rails
+
+ENV RAILS_ENV=production \
+    LANG=C.UTF-8 \
+    BUNDLE_JOBS=4 \
+    BUNDLE_RETRY=3 \
+    BUNDLE_PATH="/usr/local/bundle"
+
+
+# Throw-away build stage to reduce size of final image
+FROM base as build
+
+# Install packages needed to build gems
+# This example intentionally does not require or install node.js
+
 RUN apt-get update -qq && apt-get install -yq --no-install-recommends \
     build-essential \
     gnupg2 \
-    libpq-dev \
   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-ENV LANG=C.UTF-8 \
-  BUNDLE_JOBS=4 \
-  BUNDLE_RETRY=3 \
-  RAILS_ENV=production
-
 RUN gem update --system && gem install bundler
 
-WORKDIR /usr/src/app
-
-COPY Gemfile* ./
-
+# Install application gems
+COPY Gemfile Gemfile.lock ./
+# TODO: consolidate bundle config better, currently split between ENV and `bundle config`
 RUN bundle config frozen true \
  && bundle config jobs 4 \
  && bundle config deployment true \
@@ -25,14 +34,45 @@ RUN bundle config frozen true \
  && bundle install \
  && bundle exec bootsnap precompile --gemfile
 
+# Copy application code
 COPY . .
 
+# Precompile bootsnap code for faster boot times
+RUN bundle exec bootsnap precompile app/ lib/
+
 # Precompile assets
 # SECRET_KEY_BASE or RAILS_MASTER_KEY is required in production, but we don't
 # want real secrets in the image or image history. The real secret is passed in
 # at run time
 ARG SECRET_KEY_BASE=fakekeyforassets
-RUN bin/rails assets:clobber && bundle exec rails assets:precompile
+RUN ./bin/rails assets:precompile
+
+# TODO: This will work in Rails 7.1
+# Precompiling assets for production without requiring secret RAILS_MASTER_KEY
+# RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile
+
+# Final stage for app image
+FROM base
+
+# Install packages needed for deployment
+# RUN apt-get update -qq && apt-get install -yq --no-install-recommends \
+#     build-essential \
+#     gnupg2 \
+#     libpq-dev \
+#   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+# Copy built artifacts: gems, application
+COPY --from=build /usr/local/bundle /usr/local/bundle
+COPY --from=build /rails /rails
+
+# Run and own only the runtime files as a non-root user for security
+RUN useradd rails --home /rails --shell /bin/bash && \
+    chown -R rails:rails db log storage tmp
+USER rails:rails
+
+# TODO: migrate/consolidate to have all database migrations in here
+# Entrypoint prepares the database.
+# ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 
 # Run database migrations when deploying to Render. It is not great, maybe there's a better way?
 # https://community.render.com/t/release-command-for-db-migrations/247/6
@@ -40,6 +80,6 @@ ARG RENDER
 ARG DATABASE_URL
 RUN if [ -z "$RENDER" ]; then echo "var is unset"; else bin/rails db:migrate; fi
 
+# Start Server
 EXPOSE 3000
-
 CMD ["bundle", "exec", "puma", "-C", "config/puma.rb"]