diff --git a/src/modules/netinstall/build/_base_and_developer_edition.yaml b/src/modules/netinstall/build/_base_and_developer_edition.yaml
index f048f65..dfce1e5 100644
--- a/src/modules/netinstall/build/_base_and_developer_edition.yaml
+++ b/src/modules/netinstall/build/_base_and_developer_edition.yaml
@@ -839,14 +839,11 @@
         - gimp-help-$LOCALE
         - gvfs
         - gvfs-afc
-        - gvfs-dnssd
         - gvfs-goa
         - gvfs-gphoto2
         - gvfs-mtp
         - gvfs-nfs
-        - gvfs-onedrive
         - gvfs-smb
-        - gvfs-wsdd
         - inkscape
         - libdvdcss
         - libgsf
@@ -974,6 +971,18 @@
         - yarn
         - zed
 
+    - name: "LLM (full netinstall)"
+      description: "Add LLM"
+      selected: false
+      packages:
+        - llm-manager
+        - ocl-icd
+        - ollama
+        - ollama-cuda
+        - ollama-rocm
+        - opencl-amd
+        - opencl-clhpp
+
     - name: "Code IDE and programming language package (full netinstall)"
       description: "Add Code IDE and programming language package"
       selected: false
diff --git a/src/modules/netinstall/build/_base_system.yaml b/src/modules/netinstall/build/_base_system.yaml
index 6c7c321..840b37b 100644
--- a/src/modules/netinstall/build/_base_system.yaml
+++ b/src/modules/netinstall/build/_base_system.yaml
@@ -839,14 +839,11 @@
         - gimp-help-$LOCALE
         - gvfs
         - gvfs-afc
-        - gvfs-dnssd
         - gvfs-goa
         - gvfs-gphoto2
         - gvfs-mtp
         - gvfs-nfs
-        - gvfs-onedrive
         - gvfs-smb
-        - gvfs-wsdd
         - inkscape
         - libdvdcss
         - libgsf
@@ -923,6 +920,7 @@
         - gunicorn
         - hypercorn
         - icu69
+        - intellij-idea-community-edition
         - jdk-openjdk
         - jq
         - kotlin
@@ -973,6 +971,18 @@
         - yarn
         - zed
 
+    - name: "LLM (full netinstall)"
+      description: "Add LLM"
+      selected: false
+      packages:
+        - llm-manager
+        - ocl-icd
+        - ollama
+        - ollama-cuda
+        - ollama-rocm
+        - opencl-amd
+        - opencl-clhpp
+
     - name: "Code IDE and programming language package (full netinstall)"
       description: "Add Code IDE and programming language package"
       selected: false
diff --git a/src/modules/netinstall/build/_netinstall_only.yaml b/src/modules/netinstall/build/_netinstall_only.yaml
index 16345a3..38384fa 100644
--- a/src/modules/netinstall/build/_netinstall_only.yaml
+++ b/src/modules/netinstall/build/_netinstall_only.yaml
@@ -839,14 +839,11 @@
         - gimp-help-$LOCALE
         - gvfs
         - gvfs-afc
-        - gvfs-dnssd
         - gvfs-goa
         - gvfs-gphoto2
         - gvfs-mtp
         - gvfs-nfs
-        - gvfs-onedrive
         - gvfs-smb
-        - gvfs-wsdd
         - inkscape
         - libdvdcss
         - libgsf
@@ -891,7 +888,8 @@
         - android-sdk-build-tools
         - android-sdk-cmdline-tools-latest
         - android-tools
-        - ansible-language-server
+        - android-file-transfer
+        - android-studio
         - apksigcopier
         - arduino-language-server
         - base-devel
@@ -922,6 +920,7 @@
         - gunicorn
         - hypercorn
         - icu69
+        - intellij-idea-community-edition
         - jdk-openjdk
         - jq
         - kotlin
@@ -972,6 +971,18 @@
         - yarn
         - zed
 
+    - name: "LLM (full netinstall)"
+      description: "Add LLM"
+      selected: false
+      packages:
+        - llm-manager
+        - ocl-icd
+        - ollama
+        - ollama-cuda
+        - ollama-rocm
+        - opencl-amd
+        - opencl-clhpp
+
     - name: "Code IDE and programming language package (full netinstall)"
       description: "Add Code IDE and programming language package"
       selected: false
diff --git a/src/modules/netinstall/netinstall.yaml b/src/modules/netinstall/netinstall.yaml
index 8263087..fd539e5 100644
--- a/src/modules/netinstall/netinstall.yaml
+++ b/src/modules/netinstall/netinstall.yaml
@@ -839,14 +839,11 @@
         - gimp-help-$LOCALE
         - gvfs
         - gvfs-afc
-        - gvfs-dnssd
         - gvfs-goa
         - gvfs-gphoto2
         - gvfs-mtp
         - gvfs-nfs
-        - gvfs-onedrive
         - gvfs-smb
-        - gvfs-wsdd
         - inkscape
         - libdvdcss
         - libgsf
@@ -974,6 +971,18 @@
         - yarn
         - zed
 
+    - name: "LLM (full netinstall)"
+      description: "Add LLM"
+      selected: true
+      packages:
+        - llm-manager
+        - ocl-icd
+        - ollama
+        - ollama-cuda
+        - ollama-rocm
+        - opencl-amd
+        - opencl-clhpp
+
     - name: "Code IDE and programming language package (full netinstall)"
       description: "Add Code IDE and programming language package"
       selected: true
diff --git a/src/modules/services-systemd/services-systemd.conf b/src/modules/services-systemd/services-systemd.conf
index 0ab2392..5d80e77 100644
--- a/src/modules/services-systemd/services-systemd.conf
+++ b/src/modules/services-systemd/services-systemd.conf
@@ -210,6 +210,10 @@ units:
      action: "enable"
      mandatory: false
 
+   - name: "ollama"
+     action: "enable"
+     mandatory: false
+
    - name:  "pacman-init"
      action: "disable"
      mandatory:  false