diff --git a/docker/Dockerfile b/docker/Dockerfile
index c30d69313..ac9803d5d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -18,15 +18,27 @@
 
 FROM postgres:14
 
-RUN apt-get update
-RUN apt-get install --assume-yes --no-install-recommends --no-install-suggests \
-  bison \
-  build-essential \
-  flex \
-  postgresql-server-dev-14
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
+       bison \
+       build-essential \
+       flex \
+       postgresql-server-dev-14 \
+       locales
+
+ENV LANG=en_US.UTF-8
+ENV LC_COLLATE=en_US.UTF-8
+ENV LC_CTYPE=en_US.UTF-8
+
+RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
+    && locale-gen \
+    && update-locale LANG=en_US.UTF-8
 
 COPY . /age
-RUN cd /age && make install
+
+WORKDIR /age
+
+RUN make && make install
 
 COPY docker/docker-entrypoint-initdb.d/00-create-extension-age.sql /docker-entrypoint-initdb.d/00-create-extension-age.sql
 
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index 812aafd2a..8162f5b56 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -24,8 +24,16 @@ RUN apt-get install --assume-yes --no-install-recommends --no-install-suggests \
   bison \
   build-essential \
   flex \
-  postgresql-server-dev-14
+  postgresql-server-dev-14 \
+  locales
 
+ENV LANG=en_US.UTF-8
+ENV LC_COLLATE=en_US.UTF-8
+ENV LC_CTYPE=en_US.UTF-8
+
+RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
+    && locale-gen \
+    && update-locale LANG=en_US.UTF-8
 COPY . /age
 
 # Set current working directory to /age/ and build.