diff --git a/package-managers/ame.yaml b/package-managers/pacman.yaml
similarity index 85%
rename from package-managers/ame.yaml
rename to package-managers/pacman.yaml
index 0215b95..7f5e4c8 100644
--- a/package-managers/ame.yaml
+++ b/package-managers/pacman.yaml
@@ -1,5 +1,5 @@
-name: ame
-needsudo: false
+name: pacman
+needsudo: true
 cmdautoremove: -Yc
 cmdclean: -Sc
 cmdinstall: -S
diff --git a/package-managers/swupd.yaml b/package-managers/swupd.yaml
new file mode 100644
index 0000000..d2ab1a6
--- /dev/null
+++ b/package-managers/swupd.yaml
@@ -0,0 +1,13 @@
+name: swupd
+needsudo: true
+cmdautoremove: bundle-remove --orphans
+cmdclean: clean
+cmdinstall: bundle-add
+cmdlist: bundle-list --status
+cmdpurge: bundle-remove -R
+cmdremove: bundle-remove
+cmdsearch: search
+cmdshow: bundle-info
+cmdupdate: check-update
+cmdupgrade: update
+builtin: true
diff --git a/package-managers/xbps.yaml b/package-managers/xbps.yaml
new file mode 100644
index 0000000..f7d79e3
--- /dev/null
+++ b/package-managers/xbps.yaml
@@ -0,0 +1,13 @@
+name: sh
+needsudo: true
+cmdautoremove: -c "xbps-remove -oO"
+cmdclean: -c "xbps-remove -O"
+cmdinstall: -c "xbps-install -S"
+cmdlist: -c "xbps-query -l"
+cmdpurge: -c "xbps-remove -R"
+cmdremove: -c "xbps-remove"
+cmdsearch: -c "xbps-query -Rs"
+cmdshow: -c "xbps-query -RS"
+cmdupdate: -c "xbps-install -Su"
+cmdupgrade: -c "xbps-install -Su"
+builtin: true
diff --git a/stacks/arch.yaml b/stacks/arch.yaml
new file mode 100644
index 0000000..8e0dbd6
--- /dev/null
+++ b/stacks/arch.yaml
@@ -0,0 +1,5 @@
+name: arch linux
+base: docker.io/library/archlinux:latest
+packages: []
+pkgmanager: pacman
+builtin: true
diff --git a/stacks/crystal-linux.yaml b/stacks/crystal-linux.yaml
deleted file mode 100644
index d004416..0000000
--- a/stacks/crystal-linux.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: crystal-linux
-base: registry.getcryst.al/crystal/misc/docker:latest
-packages: []
-pkgmanager: ame
-builtin: true
diff --git a/stacks/debian-dev.yaml b/stacks/debian-dev.yaml
new file mode 100644
index 0000000..c9b4db8
--- /dev/null
+++ b/stacks/debian-dev.yaml
@@ -0,0 +1,5 @@
+name: debian sid
+base: debian:sid
+packages: []
+pkgmanager: apt
+builtin: true
diff --git a/stacks/debian.yaml b/stacks/debian.yaml
new file mode 100644
index 0000000..3c74b81
--- /dev/null
+++ b/stacks/debian.yaml
@@ -0,0 +1,5 @@
+name: debian stable
+base: debian:stable
+packages: []
+pkgmanager: apt
+builtin: true
diff --git a/stacks/fedora-dev.yaml b/stacks/fedora-dev.yaml
new file mode 100644
index 0000000..561074f
--- /dev/null
+++ b/stacks/fedora-dev.yaml
@@ -0,0 +1,5 @@
+name: fedora rawhide
+base: fedora:latest
+packages: []
+pkgmanager: dnf
+builtin: true
diff --git a/stacks/fedora.yaml b/stacks/fedora.yaml
index e143717..9bfe248 100644
--- a/stacks/fedora.yaml
+++ b/stacks/fedora.yaml
@@ -1,4 +1,4 @@
-name: fedora
+name: fedora workstation
 base: fedora:latest
 packages: []
 pkgmanager: dnf
diff --git a/stacks/pika.yaml b/stacks/pika.yaml
new file mode 100644
index 0000000..0305af6
--- /dev/null
+++ b/stacks/pika.yaml
@@ -0,0 +1,5 @@
+name: pika os
+base: ghcr.io/pikaos-linux/pika-package-container:latest
+packages: []
+pkgmanager: apt
+builtin: true
diff --git a/stacks/ubuntu-dev.yaml b/stacks/ubuntu-dev.yaml
new file mode 100644
index 0000000..c9c050a
--- /dev/null
+++ b/stacks/ubuntu-dev.yaml
@@ -0,0 +1,5 @@
+name: ubuntu latest
+base: ubuntu:rolling
+packages: []
+pkgmanager: apt
+builtin: true
diff --git a/stacks/ubuntu.yaml b/stacks/ubuntu.yaml
index a76fbab..533cd56 100644
--- a/stacks/ubuntu.yaml
+++ b/stacks/ubuntu.yaml
@@ -1,4 +1,4 @@
-name: ubuntu
+name: ubuntu lts
 base: ubuntu:latest
 packages: []
 pkgmanager: apt
diff --git a/stacks/void.yaml b/stacks/void.yaml
new file mode 100644
index 0000000..e14ed16
--- /dev/null
+++ b/stacks/void.yaml
@@ -0,0 +1,5 @@
+name: void linux
+base: ghcr.io/void-linux/void-linux:latest-full-x86_64
+packages: []
+pkgmanager: xbps
+builtin: true