diff --git a/quadlets/bluefin-cli/bluefin-cli-toolbox-quadlet.container b/quadlets/bluefin-cli/bluefin-cli-toolbox-quadlet.container
deleted file mode 100644
index de25096..0000000
--- a/quadlets/bluefin-cli/bluefin-cli-toolbox-quadlet.container
+++ /dev/null
@@ -1,36 +0,0 @@
-[Unit]
-Description=Bluefin CLI, Wolfi container to serve you brew
-
-[Container]
-AutoUpdate=registry
-ContainerName=bluefin-cli-toolbox-quadlet
-Environment=TOOLBOX_PATH=/usr/bin/toolbox
-Environment=XDG_RUNTIME_DIR=%t
-Exec=init-container --gid %G --home %h --shell %s --uid %U --user %u --home-link --media-link --mnt-link
-HostName=bluefin-cli-toolbox-quadlet
-Image=ghcr.io/ublue-os/bluefin-cli:latest
-Mount=type=devpts,destination=/dev/pts
-Network=host
-PodmanArgs=--cgroupns host
-PodmanArgs=--ipc host
-PodmanArgs=--label com.github.containers.toolbox=true
-PodmanArgs=--no-hosts
-PodmanArgs=--pid host
-PodmanArgs=--privileged
-PodmanArgs=--security-opt label=disable
-PodmanArgs=--entrypoint toolbox
-Ulimit=host
-UserNS=keep-id
-User=root:root
-Volume=/:/run/host:rslave
-Volume=/dev:/dev:rslave
-Volume=/run/dbus/system_bus_socket:/run/dbus/system_bus_socket
-Volume=/var/%h:/var/%h:rslave
-Volume=/usr/bin/toolbox:/usr/bin/toolbox:ro
-Volume=%t:%t
-Volume=/run/avahi-daemon/socket:/run/avahi-daemon/socket
-Volume=/run/.heim_org.h5l.kcm-socket:/run/.heim_org.h5l.kcm-socket
-Volume=/run/pcscd/pcscd.comm:/run/pcscd/pcscd.comm
-Volume=/run/media:/run/media:rslave
-Volume=/etc/profile.d/toolbox.sh:/etc/profile.d/toolbox.sh:ro
-Volume=bluefin-cli-Cellar.volume:/home/linuxbrew/.linuxbrew/Cellar
\ No newline at end of file
diff --git a/quadlets/wolfi-toolbox/wolfi-toolbox-quadlet.container b/quadlets/wolfi-toolbox/wolfi-toolbox-quadlet.container
deleted file mode 100644
index 9765fe7..0000000
--- a/quadlets/wolfi-toolbox/wolfi-toolbox-quadlet.container
+++ /dev/null
@@ -1,35 +0,0 @@
-[Unit]
-Description=Wolfi Toolbox for your toolbox needs
-
-[Container]
-AutoUpdate=registry
-ContainerName=wolfi-toolbox-quadlet
-Environment=TOOLBOX_PATH=/usr/bin/toolbox
-Environment=XDG_RUNTIME_DIR=%t
-Exec=init-container --gid %G --home %h --shell %s --uid %U --user %u --home-link --media-link --mnt-link
-HostName=wolfi-toolbox-quadlet
-Image=ghcr.io/ublue-os/wolfi-toolbox:latest
-Mount=type=devpts,destination=/dev/pts
-Network=host
-PodmanArgs=--cgroupns host
-PodmanArgs=--ipc host
-PodmanArgs=--label com.github.containers.toolbox=true
-PodmanArgs=--no-hosts
-PodmanArgs=--pid host
-PodmanArgs=--privileged
-PodmanArgs=--security-opt label=disable
-PodmanArgs=--entrypoint toolbox
-Ulimit=host
-UserNS=keep-id
-User=root:root
-Volume=/:/run/host:rslave
-Volume=/dev:/dev:rslave
-Volume=/run/dbus/system_bus_socket:/run/dbus/system_bus_socket
-Volume=/var/%h:/var/%h:rslave
-Volume=/usr/bin/toolbox:/usr/bin/toolbox:ro
-Volume=%t:%t
-Volume=/run/avahi-daemon/socket:/run/avahi-daemon/socket
-Volume=/run/.heim_org.h5l.kcm-socket:/run/.heim_org.h5l.kcm-socket
-Volume=/run/pcscd/pcscd.comm:/run/pcscd/pcscd.comm
-Volume=/run/media:/run/media:rslave
-Volume=/etc/profile.d/toolbox.sh:/etc/profile.d/toolbox.sh:ro
\ No newline at end of file
diff --git a/systemd/ubuntu-toolbox/ubuntu-distrobox-oneshot.service b/systemd/ubuntu-toolbox/ubuntu-distrobox-oneshot.service
index af1950c..cb4e643 100644
--- a/systemd/ubuntu-toolbox/ubuntu-distrobox-oneshot.service
+++ b/systemd/ubuntu-toolbox/ubuntu-distrobox-oneshot.service
@@ -3,6 +3,6 @@ Description=Wolfi Toolbox for your distrobox fun
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/distrobox assemble create --replace -f /etc/distrobox/distrobox.ini -n wolfi-toolbox
-ExecStart=/usr/bin/distrobox enter wolfi-toolbox 
+ExecStart=/usr/bin/distrobox assemble create --replace -f /etc/distrobox/ubuntu-distrobox.ini -n ubuntu-toolbox
+ExecStart=/usr/bin/distrobox enter ubuntu-toolbox 
 RemainAfterExit=true
\ No newline at end of file
diff --git a/systemd/wolfi-toolbox/wolfi-distrobox-oneshot.service b/systemd/wolfi-toolbox/wolfi-distrobox-oneshot.service
index 8419663..a2651e5 100644
--- a/systemd/wolfi-toolbox/wolfi-distrobox-oneshot.service
+++ b/systemd/wolfi-toolbox/wolfi-distrobox-oneshot.service
@@ -3,6 +3,6 @@ Description=Ubuntu Toolbox for your distrobox fun
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/distrobox assemble create --replace -f /etc/distrobox/distrobox.ini -n ubuntu-toolbox
-ExecStart=/usr/bin/distrobox enter ubuntu-toolbox 
+ExecStart=/usr/bin/distrobox assemble create --replace -f /etc/distrobox/wolfi-distrobox.ini -n wolfi-toolbox
+ExecStart=/usr/bin/distrobox enter wolfi-toolbox 
 RemainAfterExit=true
\ No newline at end of file