diff --git a/Dockerfile b/Dockerfile
index 2e9ad9b..5ce6320 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,16 @@ RUN  pacman-key --init && \
      rm -rf /var/lib/pacman/sync/* && \
      find /var/cache/pacman/ -type f -delete
 
+
+## Change the default shell to fish
+RUN pacman -Sy fish --noconfirm
+SHELL ["fish", "--command"]
+RUN chsh -s /usr/bin/fish
+ENV SHELL /usr/bin/fish
+ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
+
+
 FROM scratch
 LABEL org.opencontainers.image.description="CachyOS - Arch-based distribution offering an easy installation, several customizations, and unique performance optimization."
 COPY --from=rootfs / /
-CMD ["/usr/bin/bash"]
+CMD ["/usr/bin/fish"]