diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..efc1054
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,23 @@
+; https://editorconfig.org/
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[{Makefile,go.mod,go.sum,*.go,.gitmodules}]
+indent_style = tab
+indent_size = 4
+
+[{*.md,*.toml}]
+indent_size = 4
+trim_trailing_whitespace = false
+
+[{Containerfile,Dockerfile,*.bash,*.sh}]
+indent_style = space
+indent_size = 4
diff --git a/.github/workflows/build-boxkit.yml b/.github/workflows/build-boxkit.yml
index 6ff7395..91c0953 100644
--- a/.github/workflows/build-boxkit.yml
+++ b/.github/workflows/build-boxkit.yml
@@ -1,17 +1,17 @@
-name: build-boxkit
+name: build-bluefin-toolbox
 on:
   pull_request:
     branches:
       - main
   schedule:
-    - cron: '0 0 * * TUE'
+    - cron: 26 7,19 * * * # (26 minutes after ublue-os/toolbox/bluefin-cli builds)
   push:
     branches:
       - main
     paths-ignore:
       - '**/README.md'
 env:
-    IMAGE_NAME: boxkit
+    IMAGE_NAME: bluefin-cli
     IMAGE_TAGS: latest
     IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
 
diff --git a/Containerfile b/Containerfile
index a25c67e..37765c2 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,20 +1,25 @@
-FROM quay.io/toolbx-images/alpine-toolbox:edge
+FROM ghcr.io/ublue-os/bluefin-cli:latest
 
-LABEL com.github.containers.toolbox="true" \
-      usage="This image is meant to be used with the toolbox or distrobox command" \
-      summary="A cloud-native terminal experience" \
-      maintainer="jorge.castro@gmail.com"
+LABEL   com.github.containers.toolbox="true" \
+        usage="This image is meant to be used with the Toolbox or Distrobox commands" \
+        summary="A new cloud-native terminal experience powered by Wolfi and Homebrew" \
+        maintainer="27022259+auricom@users.noreply.github.com"
 
-COPY extra-packages /
-RUN apk update && \
-    apk upgrade && \
-    grep -v '^#' /extra-packages | xargs apk add
-RUN rm /extra-packages
+COPY ./extra-packages /extra-packages
 
-RUN   ln -fs /bin/sh /usr/bin/sh && \
-      ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/docker && \
-      ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/flatpak && \ 
-      ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/podman && \
-      ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/rpm-ostree && \
-      ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/transactional-update
-     
+# Remove default fish bling script, Install extra packages, nix-portable and devbox
+RUN  \
+    rm usr/share/fish/vendor_conf.d/bling.fish && \
+    grep -v '^#' /extra-packages | xargs apk add && \
+    rm /extra-packages && \
+    wget --quiet --output-document /usr/bin/nix-portable \
+        https://github.com/DavHau/nix-portable/releases/latest/download/nix-portable-$(uname -m) && \
+    chmod +x /usr/bin/nix-portable && \
+    ln -s /usr/bin/nix-portable /usr/bin/nix && \
+    ln -s /usr/bin/nix-portable /usr/bin/nix-shell && \
+    curl -fsSL https://get.jetify.com/devbox | bash -s -- --force && \
+    mv /usr/local/bin/devbox /usr/bin/devbox && \
+    chmod +r /usr/bin/devbox && \
+    mkdir -p /nix/store
+
+ENV NP_GIT=/usr/bin/git
diff --git a/cosign.pub b/cosign.pub
index f9482c4..4a1c07f 100644
--- a/cosign.pub
+++ b/cosign.pub
@@ -1,4 +1,4 @@
 -----BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE7lh7fJMV4dBT2jT1XafixUJa7OVA
-cT+QFVD8IfIJIS/KBAc8hx1aslzkH3tfeM0cwyCLB7kOStZ4sh6RyFQD9w==
------END PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE/tZcxAuuK/qIKSMWfr5Rux5yRXHC
+V8y2Xx4XGkqXyp3yVh5QXzhKe9k7bbTBwF4nhJp5XvlQfmPKu6Ohn1cknA==
+-----END PUBLIC KEY-----
\ No newline at end of file
diff --git a/extra-packages b/extra-packages
index b0bee6b..9d33cde 100644
--- a/extra-packages
+++ b/extra-packages
@@ -1,31 +1,25 @@
-age
 atuin
-btop
 bat
+brew
+btop
 chezmoi
-clipboard
-cosign
-dbus-x11
 direnv
 eza
-ffmpeg
+fd
+fish
 fzf
-github-cli
-helix
-just
-make
-micro
-ncdu
-ncurses
-neofetch
-neovim
-npm
-plocate
-python3
+gawk
+mc
+nano
+nmap
+rclone
 ripgrep
-speedtest-cli
+sed
 starship
-vimdiff
-wl-clipboard
-zellij
-zstd
+systemd
+task
+tig
+uutils
+zoxide
+#vscode
+libstdc++