diff --git a/modules/30-utils.yml b/modules/30-utils.yml
index 500de3a..85b4151 100644
--- a/modules/30-utils.yml
+++ b/modules/30-utils.yml
@@ -11,4 +11,3 @@ sources:
     - tinysparql
     - bash-completion
     - libnss-myhostname
-    - distrobox
diff --git a/modules/31-distrobox.yml b/modules/31-distrobox.yml
new file mode 100644
index 0000000..5c86812
--- /dev/null
+++ b/modules/31-distrobox.yml
@@ -0,0 +1,14 @@
+name: distrobox
+type: make
+sources:
+  - type: git
+    url: https://github.com/89luca89/distrobox.git
+    tag: 2.0.0-rc.2
+modules:
+  - name: distrobox-deps-install
+    type: apt
+    sources:
+      - packages:
+          - golang-go
+          - make
+          - podman
diff --git a/modules/998-distrobox-symlink.yml b/modules/998-distrobox-symlink.yml
deleted file mode 100644
index 65f9cbe..0000000
--- a/modules/998-distrobox-symlink.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-# this module exists to allow legacy apx containers to locate distrobox executables
-name: distrobox-symlink
-type: shell
-commands:
-  - mkdir -p /usr/share/apx/distrobox
-  - ln -s /usr/bin/distrobox-init /usr/bin/distrobox-export /usr/bin/distrobox-host-exec /usr/share/apx/distrobox/
diff --git a/recipe.yml b/recipe.yml
index d45d561..e794526 100644
--- a/recipe.yml
+++ b/recipe.yml
@@ -45,6 +45,7 @@ stages:
       - modules/10-input-and-locale.yml
       - modules/20-ssh.yml
       - modules/30-utils.yml
+      - modules/31-distrobox.yml
       - modules/40-essentials.yml
       - modules/41-move-boot-scripts.yml
       - modules/45-lvm-fix.yml
@@ -59,7 +60,6 @@ stages:
       - modules/120-fingerprint.yml
       - modules/140-manpages.yml
       - modules/150-init-executable.yml
-      - modules/998-distrobox-symlink.yml
       - modules/998-podman-registry.yml
       - modules/999-replace-locale-gen.yml
       - modules/999-remove-grub-files.yml
@@ -72,7 +72,7 @@ stages:
   - name: cleanup
     type: shell
     commands:
-      - apt remove -y dpkg-dev build-essential
+      - apt remove -y golang-go make dpkg-dev build-essential
       - apt autoremove -y
       - apt clean