diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 470dd51e..8f1d75d9 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -48,11 +48,6 @@
     - item.fstype == 'btrfs'
     - not 'backup' in item.mount
 
-- name: Generate locales
-  locale_gen: name={{ item }} state=present
-  with_items:
-    - en_US.UTF-8
-
 - name: Configure locales
   template: src=locale.conf.j2 dest=/etc/locale.conf owner=root group=root mode=0644
 
diff --git a/roles/install_arch/tasks/main.yml b/roles/install_arch/tasks/main.yml
index 07b4adb2..0a664e12 100644
--- a/roles/install_arch/tasks/main.yml
+++ b/roles/install_arch/tasks/main.yml
@@ -127,14 +127,6 @@
 - name: Mount /dev to new chroot  # noqa command-instead-of-module
   command: mount --rbind /dev /mnt/dev creates=/mnt/dev/zero
 
-- name: Configure locale.gen
-  lineinfile: dest=/mnt/etc/locale.gen line="en_US.UTF-8 UTF-8" owner=root group=root mode=0644
-
-- name: Run locale-gen inside chroot
-  command: chroot /mnt locale-gen
-  register: chroot_locale_gen
-  changed_when: "chroot_locale_gen.rc == 0"
-
 - name: Run systemd-firstboot
   command: chroot /mnt systemd-firstboot --locale=C.UTF-8 --timezone=UTC --hostname={{ hostname }}
   register: chroot_systemd_firstboot
diff --git a/roles/postgres/files/upgrade_pg.sh b/roles/postgres/files/upgrade_pg.sh
index 460f07b5..5ed4de9c 100755
--- a/roles/postgres/files/upgrade_pg.sh
+++ b/roles/postgres/files/upgrade_pg.sh
@@ -46,7 +46,7 @@ chown postgres: /var/lib/postgres/data
 chattr -f +C /var/lib/postgres/data || :
 
 # initialize the new cluster
-su - postgres -c 'initdb --locale en_US.UTF-8 -E UTF8 -D /var/lib/postgres/data'
+su - postgres -c 'initdb --locale C.UTF-8 -E UTF8 -D /var/lib/postgres/data'
 
 # copy existing configuration and SSL certs from the old cluster
 for f in pg_hba.conf postgresql.conf {fullchain,chain,privkey}.pem; do
diff --git a/roles/postgres/tasks/main.yml b/roles/postgres/tasks/main.yml
index 2dc0940a..c46fa866 100644
--- a/roles/postgres/tasks/main.yml
+++ b/roles/postgres/tasks/main.yml
@@ -21,7 +21,7 @@
   become: true
   become_user: postgres
   become_method: su
-  command: initdb --locale en_US.UTF-8 -E UTF8 -D '/var/lib/postgres/data'
+  command: initdb --locale C.UTF-8 -E UTF8 -D '/var/lib/postgres/data'
   args:
     chdir: /var/lib/postgres
     creates: /var/lib/postgres/data/postgresql.conf
diff --git a/roles/postgres/templates/postgresql.conf.j2 b/roles/postgres/templates/postgresql.conf.j2
index 4441c736..58d082b5 100644
--- a/roles/postgres/templates/postgresql.conf.j2
+++ b/roles/postgres/templates/postgresql.conf.j2
@@ -707,11 +707,11 @@ timezone = 'UTC'
 					# encoding
 
 # These settings are initialized by initdb, but they can be changed.
-lc_messages = 'en_US.UTF-8'			# locale for system error message
+lc_messages = 'C.UTF-8'			# locale for system error message
 					# strings
-lc_monetary = 'en_US.UTF-8'			# locale for monetary formatting
-lc_numeric = 'en_US.UTF-8'			# locale for number formatting
-lc_time = 'en_US.UTF-8'				# locale for time formatting
+lc_monetary = 'C.UTF-8'			# locale for monetary formatting
+lc_numeric = 'C.UTF-8'			# locale for number formatting
+lc_time = 'C.UTF-8'				# locale for time formatting
 
 # default configuration for text search
 default_text_search_config = 'pg_catalog.english'