diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..8ac6b8c
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
diff --git a/.github/gen_package_list.sh b/.github/gen_package_list.sh
index 218fb94..8198d53 100755
--- a/.github/gen_package_list.sh
+++ b/.github/gen_package_list.sh
@@ -15,4 +15,4 @@ for line in $(dpkg -l --no-pager); do
 done
 
 packages="[${packages%,}]"
-printf "\"packages\":%s\n" "$packages"
\ No newline at end of file
+printf "\"packages\":%s\n" "$packages"
diff --git a/.github/workflows/vib-build.yml b/.github/workflows/vib-build.yml
index d06c874..41b94e3 100644
--- a/.github/workflows/vib-build.yml
+++ b/.github/workflows/vib-build.yml
@@ -18,17 +18,14 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Vib
-      run: |
-        wget https://github.com/Vanilla-OS/Vib/releases/download/v0.3.1/vib
-        chmod +x vib
-        ./vib build recipe.yml
+    - uses: vanilla-os/vib-gh-action@v0.3.2-2
 
     - name: Build the Docker image
       run: docker image build -f Containerfile --tag ghcr.io/vanilla-os/desktop:main .
 
     # Push the image to GHCR (Image Registry)
     - name: Push To GHCR
+      if: github.repository == 'vanilla-os/desktop-image'
       run: |
         docker login ghcr.io -u ${{ env.REGISTRY_USER }} -p ${{ env.REGISTRY_PASSWORD }}
         docker image push "ghcr.io/vanilla-os/desktop:main"
diff --git a/.github/workflows/vib-pr.yml b/.github/workflows/vib-pr.yml
index ec77ce9..fffbac4 100644
--- a/.github/workflows/vib-pr.yml
+++ b/.github/workflows/vib-pr.yml
@@ -13,16 +13,12 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Vib
-      run: |
-        wget https://github.com/Vanilla-OS/Vib/releases/download/v0.3.1/vib
-        chmod +x vib
-        ./vib build recipe.yml
+    - uses: vanilla-os/vib-gh-action@v0.3.2-2
 
     - name: Build the Docker image
       run: docker image build -f Containerfile --tag vanillaos/desktop .
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: Containerfile
         path: Containerfile
diff --git a/includes.container/etc/modules.load.d/waydroid.conf b/includes.container/etc/modules.load.d/waydroid.conf
index cb4e8a0..75f4443 100644
--- a/includes.container/etc/modules.load.d/waydroid.conf
+++ b/includes.container/etc/modules.load.d/waydroid.conf
@@ -1,2 +1,2 @@
 binder_linux
-ashmem_linux
\ No newline at end of file
+ashmem_linux
diff --git a/includes.container/etc/udev/rules.d/99-waydroid.rules b/includes.container/etc/udev/rules.d/99-waydroid.rules
index db9cb79..8d3cc77 100644
--- a/includes.container/etc/udev/rules.d/99-waydroid.rules
+++ b/includes.container/etc/udev/rules.d/99-waydroid.rules
@@ -1,2 +1,2 @@
 KERNEL=="binder", NAME="%k", MODE="0666"
-KERNEL=="ashmem", NAMe="%k", MODE="0666"
\ No newline at end of file
+KERNEL=="ashmem", NAMe="%k", MODE="0666"
diff --git a/includes.container/usr/share/glib-2.0/schemas/90-vanilla-gnome-vso-extension.gschema.override b/includes.container/usr/share/glib-2.0/schemas/90-vanilla-gnome-vso-extension.gschema.override
index ffb1e76..6f13d55 100644
--- a/includes.container/usr/share/glib-2.0/schemas/90-vanilla-gnome-vso-extension.gschema.override
+++ b/includes.container/usr/share/glib-2.0/schemas/90-vanilla-gnome-vso-extension.gschema.override
@@ -1,3 +1,3 @@
 [org.gnome.shell]
 enabled-extensions=['vso@vanillaos.org']
-disable-user-extensions=false
\ No newline at end of file
+disable-user-extensions=false
diff --git a/includes.container/usr/share/polkit-1/actions/org.vanillaos.vso.policy b/includes.container/usr/share/polkit-1/actions/org.vanillaos.vso.policy
index 0ce9ea3..d98aac8 100644
--- a/includes.container/usr/share/polkit-1/actions/org.vanillaos.vso.policy
+++ b/includes.container/usr/share/polkit-1/actions/org.vanillaos.vso.policy
@@ -40,4 +40,4 @@
     </defaults>
     <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/podman</annotate>
   </action>
-</policyconfig>
\ No newline at end of file
+</policyconfig>
diff --git a/includes.container/usr/share/vso/apx/package-managers/apt.yaml b/includes.container/usr/share/vso/apx/package-managers/apt.yaml
index 1be4512..8d4322d 100644
--- a/includes.container/usr/share/vso/apx/package-managers/apt.yaml
+++ b/includes.container/usr/share/vso/apx/package-managers/apt.yaml
@@ -1,13 +1,14 @@
 name: apt
+model: 2
 needsudo: true
-cmdautoremove: autoremove
-cmdclean: clean
-cmdinstall: install
-cmdlist: list
-cmdpurge: purge
-cmdremove: remove
-cmdsearch: search
-cmdshow: show
-cmdupdate: update
-cmdupgrade: upgrade
+cmdautoremove: apt autoremove
+cmdclean: apt clean
+cmdinstall: apt install
+cmdlist: apt list
+cmdpurge: apt purge
+cmdremove: apt remove
+cmdsearch: apt search
+cmdshow: apt show
+cmdupdate: apt update
+cmdupgrade: apt upgrade
 builtin: true
diff --git a/modules/02-waydroid-modules.yml b/modules/02-waydroid-modules.yml
index 99d4cbc..6b2d39b 100644
--- a/modules/02-waydroid-modules.yml
+++ b/modules/02-waydroid-modules.yml
@@ -21,4 +21,3 @@ modules:
         type: shell
         commands:
           - apt install -y linux-headers-amd64
-
diff --git a/modules/170-gnome-software-vso-plugin.yml b/modules/170-gnome-software-vso-plugin.yml
index dbe508f..d582449 100644
--- a/modules/170-gnome-software-vso-plugin.yml
+++ b/modules/170-gnome-software-vso-plugin.yml
@@ -2,4 +2,4 @@ name: gs-vso-plugin
 type: shell
 commands:
 - curl -L -O https://github.com/Vanilla-OS/gs-plugin-vso/releases/download/continuous/libgs_plugin_vso.so
-- mv libgs_plugin_vso.so /usr/lib/x86_64-linux-gnu/gnome-software/plugins-20/
\ No newline at end of file
+- mv libgs_plugin_vso.so /usr/lib/x86_64-linux-gnu/gnome-software/plugins-20/