diff --git a/CLAUDE.md b/CLAUDE.md
index c8e2d80..3bdc345 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -70,7 +70,6 @@ ${CLIENT_SOFTWARE_DST}/install.sh 0010_kwallet
 
 - `ks.cfg` — the primary kickstart used for production installs (Fedora 43, KDE, x86_64, German locale/keyboard)
 - `ks_base_profiles/kde_fullsetup.cfg` — an alternate/reference profile generated by Anaconda
-- `ks_base_profiles/minimal_setup.cfg`, `part_sda.cfg` — additional profile fragments
 - `ks_pc_prof/` — per-machine kickstart overrides, named by system UUID suffix (e.g. `pc-9cdb93ef7c20.cfg`)
 
 ## Sudo rule required for logon_script
diff --git a/ks_base_profiles/kde_fullsetup.cfg b/ks_base_profiles/kde_fullsetup.cfg
index 21445f6..1006d75 100644
--- a/ks_base_profiles/kde_fullsetup.cfg
+++ b/ks_base_profiles/kde_fullsetup.cfg
@@ -1,47 +1,116 @@
-# Generated by Anaconda 43.44
+#Basic settings:
+graphical
+text
 
-%pre
-/bin/sh /mnt/tmp/ks_base_profiles/basic_pre_script.inc
-%end
+# Configure installation method
+url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-43&arch=x86_64"
+repo --name=fedora-updates --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f43&arch=x86_64" --cost=0
+repo --name=fedora-cisco-openh264 --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-cisco-openh264-43&arch=x86_64" --install
+repo --name=rpmfusion-free --mirrorlist="https://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-43&arch=x86_64"
+repo --name=rpmfusion-free-updates --mirrorlist="https://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-43&arch=x86_64" --cost=0
+repo --name=rpmfusion-nonfree --mirrorlist="https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-43&arch=x86_64"
+repo --name=rpmfusion-nonfree-updates --mirrorlist="https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-43&arch=x86_64" --cost=0
 
 # Keyboard layouts
 keyboard --vckeymap=de-nodeadkeys --xlayouts='de (nodeadkeys)'
 # System language
 lang de_DE.UTF-8
+# System timezone
+timezone Europe/Berlin --utc
+
+%pre --log=/root/ks-pre.log
+mkdir /mnt/anaconda_pre
+mount -L OEMDRV /mnt/anaconda_pre
+/bin/sh /mnt/anaconda_pre/ks_base_profiles/basic_pre_script.inc
+%end
 
 %packages
 @^kde-desktop-environment
+@core
 @admin-tools
-@development-tools
 @domain-client
-@editors
-@firefox
-@kde-apps
-@kde-desktop
+@system-tools
 @kde-media
 @kde-spin-initial-setup
 @libreoffice
 @office
 @sound-and-video
-@system-tools
+libva-utils
+libavcodec-freeworld
+mesa-va-drivers-freeworld
+ffmpeg
 @vlc
-
+python-vlc
+#@development-tools
+#@editors
+@firefox
+thunderbird
+openssh-server
+bash
+sudo
+gocryptfs
+htop
+mc
+mediawriter
+python-pip
+pykickstart
+xrdp
+xorgxrdp
+libxcb-doc
+plasma-workspace-x11
+xterm
+wmctrl
+flatpak
+btrfs-assistant
+btrbk
+ktorrent
+cadaver
+kdevelop
+git
+diffuse
+remmina
+android-tools
+-kpat
+-kmines
+#Annoying plasmoids
+-kdeplasma-addons
+#Search - Powerful, but slow
+-akonadi-server
+-akonadi-server-mysql
+-dragon
+-kdeconnectd
+-kde-connect
+-samba
+-samba-client
+-samba-usershares
+-BackupPC
+#Needed by SSSD
+oddjob-mkhomedir
+nss-pam-ldapd
 %end
 
 # System authorization information
 authselect enable-feature with-fingerprint
 
-# Run the Setup Agent on first boot
-firstboot --enable
 
-timesource --ntp-server=_gateway
-# System timezone
-timezone Europe/Berlin --utc
+# Generated using Blivet version 3.12.1
+ignoredisk --only-use=sda
+# Partition clearing information
+#clearpart --none --initlabel
+clearpart --none
+autopart --type=btrfs
 
 # Root password
 # This Password is completely unknown to anyone. After installation, the PC should be Member of Domain and the users may use sudo to become superuser.
 rootpw --iscrypted $y$j9T$jpKVkxaFqL6GH6GAgB0Yb/$oc.rfZgnHNlTAIj/boJeI.ZFf1QHvMF7fymZww9bzE3
+#user --name=none
 
-%post
-/bin/sh /mnt/tmp/system_setup/setup_system_full.sh install
+# Do not run the Setup Agent on first boot because it will complain about missing user account which we dont want
+firstboot --disable
+
+%post --log=/root/ks-post.log
+mkdir /opt/sys_config
+mount -L OEMDRV /opt/sys_config
+/bin/sh /opt/sys_config/system_setup/setup_system_full.sh install
+umount /opt/sys_config
 %end
diff --git a/ks_base_profiles/minimal_setup.cfg b/ks_base_profiles/minimal_setup.cfg
deleted file mode 100644
index ab8e1e3..0000000
--- a/ks_base_profiles/minimal_setup.cfg
+++ /dev/null
@@ -1,50 +0,0 @@
-# Generated by Anaconda 43.44
-# Keyboard layouts
-keyboard --vckeymap=de-nodeadkeys --xlayouts='de (nodeadkeys)'
-# System language
-lang de_DE.UTF-8
-
-%packages
-@^kde-desktop-environment
-@admin-tools
-@development-tools
-@domain-client
-@editors
-@firefox
-@kde-apps
-@kde-desktop
-@kde-media
-@kde-spin-initial-setup
-@libreoffice
-@office
-@sound-and-video
-@system-tools
-@vlc
-
-%end
-
-# System authorization information
-authselect enable-feature with-fingerprint
-
-# Run the Setup Agent on first boot
-firstboot --enable
-
-# Generated using Blivet version 3.12.1
-ignoredisk --only-use=nvme0n1
-# Partition clearing information
-clearpart --none --initlabel
-# Disk partitioning information
-part /boot/efi --fstype="efi" --ondisk=nvme0n1 --size=600 --fsoptions="umask=0077,shortname=winnt"
-part /sys_config --fstype="ext4" --noformat --onpart=UUID=3f9837da-5a46-4da1-a98b-62a8899e63cb --label=OEMDRV
-part /boot --fstype="ext4" --ondisk=nvme0n1 --size=2048
-part btrfs.115 --fstype="btrfs" --ondisk=nvme0n1 --size=485249
-btrfs none --label=fedora_fedora btrfs.115
-btrfs / --subvol --name=root LABEL=fedora_fedora
-btrfs /home --subvol --name=home LABEL=fedora_fedora
-
-timesource --ntp-server=_gateway
-# System timezone
-timezone Europe/Berlin --utc
-
-# Root password
-rootpw --iscrypted $y$j9T$SYQgSGCnU.FUaT7BKMEI9TKz$nLPf1uHlzpoBCmEndvVRK2FnY67wUY2TyxiMUIufH7A
\ No newline at end of file
diff --git a/ks_pc_prof/pc-9cdb93ef7c20.cfg b/ks_pc_prof/pc-9cdb93ef7c20.cfg
deleted file mode 100644
index 9f0cc95..0000000
--- a/ks_pc_prof/pc-9cdb93ef7c20.cfg
+++ /dev/null
@@ -1 +0,0 @@
-%include ../ks_base_profiles/kde_fullsetup.cfg