diff --git a/ci_resources/Dockerfile.android b/ci_resources/Dockerfile.android
index bdd3dd2f52..25edb6a0ec 100644
--- a/ci_resources/Dockerfile.android
+++ b/ci_resources/Dockerfile.android
@@ -8,6 +8,7 @@ ENV LC_ALL=en_US.UTF-8
 ENV LANG=en_US.UTF-8
 
 RUN apt-get update && apt-get install -y \
+    locales \
     openjdk-17-jdk \
     wget \
     unzip \
@@ -16,13 +17,15 @@ RUN apt-get update && apt-get install -y \
     ruby \
     ruby-dev \
     build-essential \
+    && locale-gen en_US.UTF-8 \
+    && update-locale LANG=en_US.UTF-8 \
     && apt-get clean
 
 RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg && \
-        chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg && \
-        echo "deb [signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" > /etc/apt/sources.list.d/github-cli.list && \
-        apt-get update && apt-get install -y gh && \
-        apt-get clean
+    chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg && \
+    echo "deb [signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" > /etc/apt/sources.list.d/github-cli.list && \
+    apt-get update && apt-get install -y gh && \
+    apt-get clean
 
 RUN mkdir -p $ANDROID_HOME/cmdline-tools/latest && \
     wget https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip -O /tmp/cmdline-tools.zip && \
diff --git a/ci_resources/Dockerfile.lightweight b/ci_resources/Dockerfile.lightweight
index 62c29262d9..c2b4b399b2 100644
--- a/ci_resources/Dockerfile.lightweight
+++ b/ci_resources/Dockerfile.lightweight
@@ -1,19 +1,26 @@
 FROM ubuntu:24.04
 
+ENV LC_ALL=en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV DEBIAN_FRONTEND=noninteractive
+
 RUN apt-get update && apt-get install -y \
+    locales \
     curl \
     git \
+    && locale-gen en_US.UTF-8 \
+    && update-locale LANG=en_US.UTF-8 \
     && apt-get clean
 
 RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg && \
-        chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg && \
-        echo "deb [signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" > /etc/apt/sources.list.d/github-cli.list && \
-        apt-get update && apt-get install -y gh && \
-        apt-get clean
+    chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg && \
+    echo "deb [signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" > /etc/apt/sources.list.d/github-cli.list && \
+    apt-get update && apt-get install -y gh && \
+    apt-get clean
 
 RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash && \
-        apt-get install -y git-lfs && \
-        git lfs install && \
-        apt-get clean
+    apt-get install -y git-lfs && \
+    git lfs install && \
+    apt-get clean
 
 CMD ["bash"]