diff --git a/docker-compose.yml b/docker-compose.yml
index bff83a4b97..35d8145697 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -107,6 +107,7 @@ services:
       - WAIT_HOSTS=db:27017
       - ENVIRONMENT=development
       - DATABASE=scriptureforge
+      - CHORUS_HG_EXE=chg
       - MONGODB_CONN=mongodb://db:27017
       - MONGODB_AUTHSOURCE=admin
       - LANGUAGE_DEPOT_API_TOKEN=bogus-development-token
diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile
index 1df8b41a0d..d803423066 100644
--- a/docker/app/Dockerfile
+++ b/docker/app/Dockerfile
@@ -10,6 +10,8 @@ WORKDIR /data
 # Copy in files needed for compilation, located in the repo root
 COPY package.json pnpm-lock.yaml ./
 
+# Install latest corepack version to work around a bug with signatures
+RUN npm install -g corepack@latest
 RUN corepack enable
 RUN pnpm install
 
diff --git a/docker/lfmerge/Dockerfile b/docker/lfmerge/Dockerfile
index 5bd0e3c9bd..401fedd22c 100644
--- a/docker/lfmerge/Dockerfile
+++ b/docker/lfmerge/Dockerfile
@@ -1,2 +1,2 @@
-FROM ghcr.io/sillsdev/lfmerge:2.0.140
+FROM ghcr.io/sillsdev/lfmerge:2.0.141
 # Do not add anything to this Dockerfile, it should stay empty
diff --git a/docker/next-app/Dockerfile.next-app b/docker/next-app/Dockerfile.next-app
index fbd92bce79..d713585504 100644
--- a/docker/next-app/Dockerfile.next-app
+++ b/docker/next-app/Dockerfile.next-app
@@ -7,6 +7,8 @@ COPY tsconfig.json pnpm-lock.yaml package.json postcss.config.cjs svelte.config.
 COPY src /app/src
 COPY static /app/static
 
+# Install latest corepack version to work around a bug with signatures
+RUN npm install -g corepack@latest
 RUN corepack enable
 RUN pnpm install
 RUN pnpm run build
diff --git a/docker/next-app/dev/Dockerfile b/docker/next-app/dev/Dockerfile
index 0b52c4c8c9..6ff14d82c3 100644
--- a/docker/next-app/dev/Dockerfile
+++ b/docker/next-app/dev/Dockerfile
@@ -6,6 +6,8 @@ COPY tsconfig.json pnpm-lock.yaml package.json postcss.config.cjs svelte.config.
 COPY src /app/src
 COPY static /app/static
 
+# Install latest corepack version to work around a bug with signatures
+RUN npm install -g corepack@latest
 RUN corepack enable
 RUN pnpm install
 
diff --git a/docker/ui-builder/Dockerfile b/docker/ui-builder/Dockerfile
index 056773fde2..ad5c8cea87 100644
--- a/docker/ui-builder/Dockerfile
+++ b/docker/ui-builder/Dockerfile
@@ -5,6 +5,8 @@ WORKDIR /data
 
 COPY package.json pnpm-lock.yaml ./
 
+# Install latest corepack version to work around a bug with signatures
+RUN npm install -g corepack@latest
 RUN corepack enable
 RUN pnpm install