diff --git a/playbooks/roles/base_image/tasks/custom-image.yml b/playbooks/roles/base_image/tasks/custom-image.yml
index bac834e83..121fa112e 100644
--- a/playbooks/roles/base_image/tasks/custom-image.yml
+++ b/playbooks/roles/base_image/tasks/custom-image.yml
@@ -355,4 +355,3 @@
     mode: "u=rw,g=r,o=r"
   when:
     - custom_image_stat.stat.exists or custom_image_download is changed
-    - custom_image != base_image_pathname
diff --git a/playbooks/roles/devconfig/tasks/main.yml b/playbooks/roles/devconfig/tasks/main.yml
index 3499f7444..39d883b71 100644
--- a/playbooks/roles/devconfig/tasks/main.yml
+++ b/playbooks/roles/devconfig/tasks/main.yml
@@ -54,17 +54,25 @@
     dest: /etc/hostname
   tags: hostname
 
-- name: Ensure locales-all package is installed
-  become: true
-  become_flags: "su - -c"
-  become_method: sudo
-  ansible.builtin.package:
-    name: locales-all
-    state: present
+# Distro specific
+
+# Check and fix APT mirrors for Debian testing before installing dependencies
+- name: Check and fix APT mirrors for Debian testing
+  ansible.builtin.include_tasks: check-apt-mirrors.yml
   when:
-    - ansible_facts['os_family']|lower == 'debian'
-  tags: firstconfig
+    - devconfig_debian_testing is defined
+    - devconfig_debian_testing | bool
+
+- name: Install dependencies
+  ansible.builtin.include_tasks: install-deps/main.yml
+  tags: ["vars", "vars_simple"]
 
+- name: Configure custom repositories and install packages
+  ansible.builtin.import_tasks: config-custom-repos-and-packages/main.yml
+  when:
+    - ansible_facts['os_family']|lower == 'redhat'
+
+# Distro agnostic stuff goes below
 - name: Configure en_US.UTF-8 locale files
   become: true
   become_flags: "su - -c"
@@ -80,8 +88,6 @@
     - { path: "/etc/default/locale", line: "LANG=en_US.UTF-8" }
     - { path: "/etc/default/locale", line: "LANGUAGE=en_US:en" }
     - { path: "/etc/locale.gen", line: "en_US.UTF-8 UTF-8" }
-  when:
-    - ansible_facts['os_family']|lower == 'debian'
   tags: firstconfig
 
 - name: Generate and update locales
@@ -92,30 +98,8 @@
     locale-gen en_US.UTF-8
     update-locale LANG=en_US.UTF-8
   changed_when: true
-  when:
-    - ansible_facts['os_family']|lower == 'debian'
   tags: firstconfig
 
-# Distro specific
-
-# Check and fix APT mirrors for Debian testing before installing dependencies
-- name: Check and fix APT mirrors for Debian testing
-  ansible.builtin.include_tasks: check-apt-mirrors.yml
-  when:
-    - devconfig_debian_testing is defined
-    - devconfig_debian_testing | bool
-
-- name: Install dependencies
-  ansible.builtin.include_tasks: install-deps/main.yml
-  tags: ["vars", "vars_simple"]
-
-- name: Configure custom repositories and install packages
-  ansible.builtin.import_tasks: config-custom-repos-and-packages/main.yml
-  when:
-    - ansible_facts['os_family']|lower == 'redhat'
-
-# Distro agnostic stuff goes below
-
 - name: Check if /mirror directory exists on localhost
   delegate_to: localhost
   ansible.builtin.stat: