diff --git a/src/modules/netinstall/build/_base_and_developer_edition.yaml b/src/modules/netinstall/build/_base_and_developer_edition.yaml
index 465f084..904b001 100644
--- a/src/modules/netinstall/build/_base_and_developer_edition.yaml
+++ b/src/modules/netinstall/build/_base_and_developer_edition.yaml
@@ -22,8 +22,8 @@
     - linux-firmware
     - linux-firmware-marvell
     - linux-api-headers
-    - linux-cachyos
-    - linux-cachyos-headers
+    - linux-xanmod-anbox
+    - linux-xanmod-anbox-headers
 
     - base
     - base-devel
@@ -121,7 +121,6 @@
         - virtualbox-guest-utils
         - xf86-input-vmmouse
         - xf86-video-qxl
-        - xf86-video-vmware
 
     - name: "Filesystem (base_system) (base_and_developer_edition) (full netinstall)"
       description: "Filesystem tools and applications"
@@ -622,6 +621,8 @@
       description: "Desktop environment"
       selected: true
       packages:
+        - wl-clipboard
+        - weston
         - accountsservice
         - akonadi
         - akonadi-calendar
@@ -895,6 +896,9 @@
       description: "Add Code IDE and programming language package"
       selected: true
       packages:
+        - waydroid-git
+        - waydroid-helper
+        - waydroid-script-git
         - android-emulator
         - android-ndk
         - android-platform
@@ -927,6 +931,7 @@
         - git-lfs
         - go
         - go-tools
+        - hypercorn
         - icu69
         - jdk-openjdk
         - jq
@@ -934,21 +939,29 @@
         - lldb
         - llvm
         - llvm-libs
+        - lua-language-server
         - lua51
         - luarocks
-        - lua-language-server
         - make
         - mold
         - mypy
         - nodejs
         - npm
         - perl
+        - pyenv
         - python
+        - python-aiosqlite
+        - python-fastapi
         - python-lsp-server
         - python-pip
         - python-poetry
+        - python-pylint-pydantic
         - python-pytest-ruff
+        - python-python-multipart
         - python-ruff
+        - python-sqlalchemy
+        - python-sqlalchemy-i18n
+        - python-sqlalchemy-utils
         - ruff
         - ruff-lsp
         - rust-analyzer
@@ -960,7 +973,9 @@
         - tailwindcss-language-server
         - typescript
         - typescript-language-server
+        - unicorn
         - uv
+        - uvicorn
         - visual-studio-code-bin
         - vscode-json-languageserver
         - vue-language-server
@@ -998,7 +1013,7 @@
       description: "Add the mail applications"
       selected: true
       packages:
-        - legcord-bin
+        - legcord
         - telegram-desktop-bin
         - zoom
 
@@ -1006,7 +1021,7 @@
       description: "Add the mail applications"
       selected: false
       packages:
-        - skypeforlinux-bin
+        - teams-for-linux
 
     - name: "Passwords / keys applications (base_system) (base_and_developer_edition) (full netinstall)"
       description: "Add the mail applications"
diff --git a/src/modules/netinstall/build/_base_system.yaml b/src/modules/netinstall/build/_base_system.yaml
index 91d054d..b9c4a56 100644
--- a/src/modules/netinstall/build/_base_system.yaml
+++ b/src/modules/netinstall/build/_base_system.yaml
@@ -22,8 +22,8 @@
     - linux-firmware
     - linux-firmware-marvell
     - linux-api-headers
-    - linux-cachyos
-    - linux-cachyos-headers
+    - linux-xanmod-anbox
+    - linux-xanmod-anbox-headers
 
     - base
     - base-devel
@@ -121,7 +121,6 @@
         - virtualbox-guest-utils
         - xf86-input-vmmouse
         - xf86-video-qxl
-        - xf86-video-vmware
 
     - name: "Filesystem (base_system) (base_and_developer_edition) (full netinstall)"
       description: "Filesystem tools and applications"
@@ -622,6 +621,8 @@
       description: "Desktop environment"
       selected: true
       packages:
+        - wl-clipboard
+        - weston
         - accountsservice
         - akonadi
         - akonadi-calendar
@@ -895,6 +896,9 @@
       description: "Add Code IDE and programming language package"
       selected: false
       packages:
+        - waydroid-git
+        - waydroid-helper
+        - waydroid-script-git
         - android-emulator
         - android-ndk
         - android-platform
@@ -927,6 +931,7 @@
         - git-lfs
         - go
         - go-tools
+        - hypercorn
         - icu69
         - jdk-openjdk
         - jq
@@ -934,21 +939,29 @@
         - lldb
         - llvm
         - llvm-libs
+        - lua-language-server
         - lua51
         - luarocks
-        - lua-language-server
         - make
         - mold
         - mypy
         - nodejs
         - npm
         - perl
+        - pyenv
         - python
+        - python-aiosqlite
+        - python-fastapi
         - python-lsp-server
         - python-pip
         - python-poetry
+        - python-pylint-pydantic
         - python-pytest-ruff
+        - python-python-multipart
         - python-ruff
+        - python-sqlalchemy
+        - python-sqlalchemy-i18n
+        - python-sqlalchemy-utils
         - ruff
         - ruff-lsp
         - rust-analyzer
@@ -960,7 +973,9 @@
         - tailwindcss-language-server
         - typescript
         - typescript-language-server
+        - unicorn
         - uv
+        - uvicorn
         - visual-studio-code-bin
         - vscode-json-languageserver
         - vue-language-server
@@ -998,7 +1013,7 @@
       description: "Add the mail applications"
       selected: true
       packages:
-        - legcord-bin
+        - legcord
         - telegram-desktop-bin
         - zoom
 
@@ -1006,7 +1021,7 @@
       description: "Add the mail applications"
       selected: false
       packages:
-        - skypeforlinux-bin
+        - teams-for-linux
 
     - name: "Passwords / keys applications (base_system) (base_and_developer_edition) (full netinstall)"
       description: "Add the mail applications"
diff --git a/src/modules/netinstall/build/_netinstall_only.yaml b/src/modules/netinstall/build/_netinstall_only.yaml
index 8f0c94d..f4563f3 100644
--- a/src/modules/netinstall/build/_netinstall_only.yaml
+++ b/src/modules/netinstall/build/_netinstall_only.yaml
@@ -22,8 +22,8 @@
     - linux-firmware
     - linux-firmware-marvell
     - linux-api-headers
-    - linux-cachyos
-    - linux-cachyos-headers
+    - linux-xanmod-anbox
+    - linux-xanmod-anbox-headers
 
     - base
     - base-devel
@@ -121,7 +121,6 @@
         - virtualbox-guest-utils
         - xf86-input-vmmouse
         - xf86-video-qxl
-        - xf86-video-vmware
 
     - name: "Filesystem (base_system) (base_and_developer_edition) (full netinstall)"
       description: "Filesystem tools and applications"
@@ -622,6 +621,8 @@
       description: "Desktop environment"
       selected: true
       packages:
+        - wl-clipboard
+        - weston
         - accountsservice
         - akonadi
         - akonadi-calendar
@@ -895,6 +896,9 @@
       description: "Add Code IDE and programming language package"
       selected: false
       packages:
+        - waydroid-git
+        - waydroid-helper
+        - waydroid-script-git
         - android-emulator
         - android-ndk
         - android-platform
@@ -927,6 +931,7 @@
         - git-lfs
         - go
         - go-tools
+        - hypercorn
         - icu69
         - jdk-openjdk
         - jq
@@ -934,21 +939,29 @@
         - lldb
         - llvm
         - llvm-libs
+        - lua-language-server
         - lua51
         - luarocks
-        - lua-language-server
         - make
         - mold
         - mypy
         - nodejs
         - npm
         - perl
+        - pyenv
         - python
+        - python-aiosqlite
+        - python-fastapi
         - python-lsp-server
         - python-pip
         - python-poetry
+        - python-pylint-pydantic
         - python-pytest-ruff
+        - python-python-multipart
         - python-ruff
+        - python-sqlalchemy
+        - python-sqlalchemy-i18n
+        - python-sqlalchemy-utils
         - ruff
         - ruff-lsp
         - rust-analyzer
@@ -960,7 +973,9 @@
         - tailwindcss-language-server
         - typescript
         - typescript-language-server
+        - unicorn
         - uv
+        - uvicorn
         - visual-studio-code-bin
         - vscode-json-languageserver
         - vue-language-server
@@ -998,7 +1013,7 @@
       description: "Add the mail applications"
       selected: false
       packages:
-        - legcord-bin
+        - legcord
         - telegram-desktop-bin
         - zoom
 
@@ -1006,7 +1021,7 @@
       description: "Add the mail applications"
       selected: false
       packages:
-        - skypeforlinux-bin
+        - teams-for-linux
 
     - name: "Passwords / keys applications (base_system) (base_and_developer_edition) (full netinstall)"
       description: "Add the mail applications"
diff --git a/src/modules/netinstall/netinstall.yaml b/src/modules/netinstall/netinstall.yaml
index 766b49b..9adb788 100644
--- a/src/modules/netinstall/netinstall.yaml
+++ b/src/modules/netinstall/netinstall.yaml
@@ -22,8 +22,8 @@
     - linux-firmware
     - linux-firmware-marvell
     - linux-api-headers
-    - linux-cachyos
-    - linux-cachyos-headers
+    - linux-xanmod-anbox
+    - linux-xanmod-anbox-headers
 
     - base
     - base-devel
@@ -121,7 +121,6 @@
         - virtualbox-guest-utils
         - xf86-input-vmmouse
         - xf86-video-qxl
-        - xf86-video-vmware
 
     - name: "Filesystem (base_system) (base_and_developer_edition) (full netinstall)"
       description: "Filesystem tools and applications"
@@ -279,6 +278,7 @@
         - tree
         - ttf-terminus-nerd
         - unace
+        - unifetch
         - unrar
         - unzip
         - usbutils
@@ -622,6 +622,8 @@
       description: "Desktop environment"
       selected: true
       packages:
+        - wl-clipboard
+        - weston
         - accountsservice
         - akonadi
         - akonadi-calendar
@@ -895,6 +897,9 @@
       description: "Add Code IDE and programming language package"
       selected: true
       packages:
+        - waydroid-git
+        - waydroid-helper
+        - waydroid-script-git
         - android-emulator
         - android-ndk
         - android-platform
@@ -927,6 +932,7 @@
         - git-lfs
         - go
         - go-tools
+        - hypercorn
         - icu69
         - jdk-openjdk
         - jq
@@ -934,21 +940,29 @@
         - lldb
         - llvm
         - llvm-libs
+        - lua-language-server
         - lua51
         - luarocks
-        - lua-language-server
         - make
         - mold
         - mypy
         - nodejs
         - npm
         - perl
+        - pyenv
         - python
+        - python-aiosqlite
+        - python-fastapi
         - python-lsp-server
         - python-pip
         - python-poetry
+        - python-pylint-pydantic
         - python-pytest-ruff
+        - python-python-multipart
         - python-ruff
+        - python-sqlalchemy
+        - python-sqlalchemy-i18n
+        - python-sqlalchemy-utils
         - ruff
         - ruff-lsp
         - rust-analyzer
@@ -960,7 +974,9 @@
         - tailwindcss-language-server
         - typescript
         - typescript-language-server
+        - unicorn
         - uv
+        - uvicorn
         - visual-studio-code-bin
         - vscode-json-languageserver
         - vue-language-server
@@ -998,7 +1014,7 @@
       description: "Add the mail applications"
       selected: true
       packages:
-        - legcord-bin
+        - legcord
         - telegram-desktop-bin
         - zoom
 
@@ -1006,7 +1022,7 @@
       description: "Add the mail applications"
       selected: true
       packages:
-        - skypeforlinux-bin
+        - teams-for-linux
 
     - name: "Passwords / keys applications (base_system) (base_and_developer_edition) (full netinstall)"
       description: "Add the mail applications"