diff --git a/config/default b/config/default
index f7f44e1a4..083d0a742 100644
--- a/config/default
+++ b/config/default
@@ -26,12 +26,14 @@ BASE_BOOT_MOUNT_PATH=boot
 DIST_VERSION="$(get_version)"
 BASE_ZIP_IMG="$(get_img_name)"
 DIST_NAME="RatOS"
+BASE_CONFIG_LOCALE="en_US.UTF-8"
 BASE_IMAGE_ENLARGEROOT=6500
 BASE_IMAGE_RESIZEROOT=600
 BASE_APT_CLEAN=no
 
 # export Variables
 export DIST_NAME
+export BASE_CONFIG_LOCALE
 export DIST_VERSION
 export BASE_ZIP_IMG
 export BASE_IMAGE_ENLARGEROOT
diff --git a/src/modules/piconfig/start_chroot_script b/src/modules/piconfig/start_chroot_script
index 804e7efcc..630e05ad9 100644
--- a/src/modules/piconfig/start_chroot_script
+++ b/src/modules/piconfig/start_chroot_script
@@ -85,8 +85,3 @@ cat > /etc/systemd/system/getty@tty1.service.d/autologin.conf << EOF
 ExecStart=
 ExecStart=-/sbin/agetty --autologin $BASE_USER --noclear %I \$TERM
 EOF
-
-# Step 13: Fix locale
-echo_green "Generating and setting default locale to en_US.UTF-8..."
-# Use en_US.UTF-8 as default locale
-raspi-config nonint do_change_locale en_US.UTF-8
\ No newline at end of file