diff --git a/Dockerfile b/Dockerfile
index 2cb2c83e7..c165b18f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ WORKDIR /rails
 
 # Install base packages
 RUN apt-get update -qq \
-    && apt-get install --no-install-recommends -y curl libvips postgresql-client libyaml-0-2 procps \
+    && apt-get install --no-install-recommends -y curl libvips postgresql-client libyaml-0-2 procps libjemalloc2 \
     && rm -rf /var/lib/apt/lists /var/cache/apt/archives
 
 # Set production environment
@@ -19,7 +19,7 @@ ENV RAILS_ENV="production" \
     BUNDLE_PATH="/usr/local/bundle" \
     BUNDLE_WITHOUT="development" \
     BUILD_COMMIT_SHA=${BUILD_COMMIT_SHA}
-    
+
 # Throw-away build stage to reduce size of final image
 FROM base AS build
 
diff --git a/bin/docker-entrypoint b/bin/docker-entrypoint
index 67ef49314..672521a98 100755
--- a/bin/docker-entrypoint
+++ b/bin/docker-entrypoint
@@ -1,5 +1,15 @@
 #!/bin/bash -e
 
+# Use jemalloc to reduce memory fragmentation if available
+JEMALLOC="/usr/lib/$(uname -m)-linux-gnu/libjemalloc.so.2"
+if [ -f "$JEMALLOC" ] && [ -z "${DISABLE_JEMALLOC}" ]; then
+  export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}$JEMALLOC"
+else
+  [ -n "${DISABLE_JEMALLOC}" ] \
+    && echo "WARNING: jemalloc disabled via DISABLE_JEMALLOC" \
+    || echo "WARNING: jemalloc not found at $JEMALLOC, skipping"
+fi
+
 # If running the rails server then create or migrate existing database
 if [ "${1}" == "./bin/rails" ] && [ "${2}" == "server" ]; then
   ./bin/rails db:prepare