diff --git a/files/apps/wolf/scripts/debugging/steam-test.sh b/files/apps/wolf/scripts/debugging/steam-test.sh
deleted file mode 100644
index 9257c7a..0000000
--- a/files/apps/wolf/scripts/debugging/steam-test.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-sudo podman run --rm -it \
---device=/dev/dri/renderD128 \
---device=/dev/dri/card1 \
--ipc=host \
--privileged \
--cap-add=ALL \
--security-opt seccomp=unconfined \
--e XDG_RUNTIME_DIR=/tmp \
--v ${XDG_RUNTIME_DIR}/${WAYLAND_DISPLAY}:/tmp/${WAYLAND_DISPLAY}:rw \
--e XDG_SESSION_TYPE=wayland \
--e WAYLAND_DISPLAY=${WAYLAND_DISPLAY} \
--e RUN_SWAY=true \
--v /tmp/SteamGOWData:/home/retro/ \
-ghcr.io/games-on-whales/steam:fix-steam-mesa
diff --git a/files/apps/wolf/scripts/debugging/wolf-api.sh b/files/apps/wolf/scripts/debugging/wolf-api.sh
deleted file mode 100644
index de4fc88..0000000
--- a/files/apps/wolf/scripts/debugging/wolf-api.sh
+++ /dev/null
@@ -1 +0,0 @@
-curl --unix-socket /var/run/wolf/wolf.sock http://localhost/api/v1/sessions | jq
\ No newline at end of file
diff --git a/files/apps/wolf/scripts/debugging/wolf.sh b/files/apps/wolf/scripts/debugging/wolf.sh
deleted file mode 100644
index b87deab..0000000
--- a/files/apps/wolf/scripts/debugging/wolf.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-sudo podman stop WolfPulseAudio || true
-sudo podman rm WolfPulseAudio || true
-sudo podman run --rm \
-        --name wolf \
-        --privileged \
-        --network=host \
-        --ipc=host \
-        --cap-add=ALL \
-        --device-cgroup-rule "c 13:* rmw" \
-        --device /dev/dri \
-        --device /dev/uinput \
-        --device /dev/uhid \
-        -v /tmp/sockets:/tmp/sockets:rw \
-        -v /etc/wolf:/etc/wolf:rw \
-        -v /run/podman/podman.sock:/var/run/docker.sock:ro \
-        -v /dev/input:/dev/input:ro \
-        -v /run/udev:/run/udev:rw \
-        --security-opt seccomp=unconfined \
-        ghcr.io/games-on-whales/wolf:stable
-
-
-#       -e WOLF_RENDER_NODE=/dev/dri/renderD129 \
-#       -e WOLF_ENCODER_NODE=/dev/dri/renderD129 \
diff --git a/files/justfiles/apps/wolf/wolf.just b/files/justfiles/apps/wolf/wolf.just
new file mode 100644
index 0000000..e9e75c4
--- /dev/null
+++ b/files/justfiles/apps/wolf/wolf.just
@@ -0,0 +1,39 @@
+wolf-api-schema:
+    sudo curl --unix-socket /var/run/wolf/wolf.sock http://localhost/api/v1/openapi-schema | jq
+
+wolf-debug-steam:
+    sudo podman run --rm -it \
+        --device=/dev/dri/renderD128 \
+        --device=/dev/dri/card1 \
+        -ipc=host \
+        -privileged \
+        -cap-add=ALL \
+        -security-opt seccomp=unconfined \
+        -e XDG_RUNTIME_DIR=/tmp \
+        -v ${XDG_RUNTIME_DIR}/${WAYLAND_DISPLAY}:/tmp/${WAYLAND_DISPLAY}:rw \
+        -e XDG_SESSION_TYPE=wayland \
+        -e WAYLAND_DISPLAY=${WAYLAND_DISPLAY} \
+        -e RUN_SWAY=true \
+        -v /tmp/SteamGOWData:/home/retro/ \
+        ghcr.io/games-on-whales/steam:fix-steam-mesa
+
+wolf-debug:
+    sudo podman stop WolfPulseAudio || true
+    sudo podman rm WolfPulseAudio || true
+    sudo podman run --rm \
+        --name wolf \
+        --privileged \
+        --network=host \
+        --ipc=host \
+        --cap-add=ALL \
+        --device-cgroup-rule "c 13:* rmw" \
+        --device /dev/dri \
+        --device /dev/uinput \
+        --device /dev/uhid \
+        -v /tmp/sockets:/tmp/sockets:rw \
+        -v /etc/wolf:/etc/wolf:rw \
+        -v /run/podman/podman.sock:/var/run/docker.sock:ro \
+        -v /dev/input:/dev/input:ro \
+        -v /run/udev:/run/udev:rw \
+        --security-opt seccomp=unconfined \
+        ghcr.io/games-on-whales/wolf:stable
diff --git a/recipes/apps/wolf.yml b/recipes/apps/wolf.yml
new file mode 100644
index 0000000..13b0825
--- /dev/null
+++ b/recipes/apps/wolf.yml
@@ -0,0 +1,10 @@
+modules:
+  - type: files
+    files:
+      - source: apps/wolf/system
+        destination: / # copies files/apps/wolf/system/* (* means everything inside it) into your image's root folder /
+        
+  - type: justfiles
+    validate: true
+    include:
+      - apps/wolf
diff --git a/recipes/beardy.yml b/recipes/beardy.yml
index fe0777e..6abae6d 100644
--- a/recipes/beardy.yml
+++ b/recipes/beardy.yml
@@ -118,4 +118,7 @@ modules:
   # #     - libva-intel-media-driver
   # #     - igt-gpu-tools # To check GPU usage via sudo intel_gpu_top
 
+  # Add wolf
+  - from-file: apps/wolf.yml
+
   - type: signing # this sets up the proper policy & signing files for signed images to work fully