diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d73f0cf..9ae7612 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,6 @@ fedora-distrobox-build-job:
   tags:
     - shell-exec
   variables:
-    BUILDAH_FORMAT: docker
     FQ_IMAGE_NAME: "$CI_REGISTRY_IMAGE/fedora-distrobox:39"
   before_script:
     - buildah rm --all
@@ -40,6 +39,6 @@ fedora-distrobox-build-job:
     - buildah run $container -- sh -c 'printf "[charm]\nname=Charm\nbaseurl=https://repo.charm.sh/yum/\nenabled=1\ngpgcheck=1\ngpgkey=https://repo.charm.sh/yum/gpg.key\n" | tee /etc/yum.repos.d/charm.repo'
     - buildah run $container -- dnf install -y '@c-development' '@development-tools' ShellCheck autossh bat btop charm cmake diff-so-fancy emacs fd-find fzf git git-core glow golang gum htop httpie hugo hyperfine jc jq just lsd lsof neofetch nodejs npm nu openssl-devel pass perl-Image-ExifTool pipx procs pv python3-devel python3-pip ranger ripgrep rsync shfmt starship tealdeer trash-cli vim-default-editor w3m wget xclip xsel zellij zsh --allowerasing
     - buildah run $container -- dnf clean all
-    - buildah config --shell /usr/bin/nu $container
+    - buildah run $container -- sh -c 'echo "/usr/bin/nu" | tee -a /etc/shells'
     - buildah commit --squash --rm $container "$FQ_IMAGE_NAME"
     - buildah push "$FQ_IMAGE_NAME"
diff --git a/README.org b/README.org
index 0240fb4..21def19 100644
--- a/README.org
+++ b/README.org
@@ -27,5 +27,5 @@ Contains the latest stable release of Fedora (pulled from registry.fedoraproject
 
 **** Usage
 #+begin_src shell
-distrobox create -i git.hyperreal.coffee:5050/fedora-atomic/containers/fedora-distrobox:39 -n default
+distrobox create -i git.hyperreal.coffee:5050/fedora-atomic/containers/fedora-distrobox:39 -n default --additional-flags "--env SHELL=/usr/bin/nu"
 #+end_src