diff --git a/linux-6.6.11-460.bee b/linux-6.6.35-477.bee
old mode 100755
new mode 100644
similarity index 75%
rename from linux-6.6.11-460.bee
rename to linux-6.6.35-477.bee
index dd1364e5e..fa1792930
--- a/linux-6.6.11-460.bee
+++ b/linux-6.6.35-477.bee
@@ -9,8 +9,7 @@ KERNELVERSION=${KERNELVERSION}${PKGEXTRAVERSION_DASH}
 
 echo $KERNELVERSION
 
-#SRCURL[0]="https://github.molgen.mpg.de/mariux64/linux/archive/refs/tags/mariux-$KERNELVERSION-$PKGREVISION.tar.gz"
-SRCURL[0]="https://beehive.molgen.mpg.de/a55a2f53e758309780c015df3bf7378c/mariux-6.6.11-460.tar.gz"
+SRCURL[0]="https://github.molgen.mpg.de/mariux64/linux/archive/refs/tags/mariux-$KERNELVERSION-$PKGREVISION.tar.gz"
 
 KERNELLOCAL=".mx64.${PKGREVISION}"
 FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}"
@@ -21,10 +20,6 @@ same_revision_files=$(ls ${BEE_PKGDIR}/linux-[0-9].[0-9]*-${PKGREVISION}.x86_64.
     && echo "A kernel with revision ${PKGREVISION} has already been build: $same_revision_files" \
     && exit
 
-mee_patch() {
-    echo "PATCH $@"
-    bee_patch $@
-}
 
 mee_configure() {
     echo "configure $@"
@@ -44,7 +39,7 @@ mee_install() {
     make modules_install  INSTALL_MOD_PATH=${D}
     make install          INSTALL_PATH=${D}/boot
 
-    rm -v ${D}/lib/modules/${FULLKERNELVERSION}/build
+    rm -rf ${D}/lib/modules/${FULLKERNELVERSION}/{source,build}
 
     ln -sv bzImage-${FULLKERNELVERSION} ${D}/boot/mariux.${PKGREVISION}
 }
diff --git a/nvidia_linux-6.1.52-456-510.108.03-0.bee b/nvidia_linux-6.1.52-456-510.108.03-0.bee
deleted file mode 100755
index f5dfd34df..000000000
--- a/nvidia_linux-6.1.52-456-510.108.03-0.bee
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/env beesh
-
-NVIDIA_ARCHIVE="NVIDIA-Linux-x86_64-${PKGVERSION}.run"
-
-#SRCURL[0]="https://de.download.nvidia.com/XFree86/Linux-x86_64/$PKGVERSION/NVIDIA-Linux-x86_64-$PKGVERSION.run"
-SRCURL[0]="https://beehive.molgen.mpg.de/a225bcb0373cbf6c552ed906bc5c614e/NVIDIA-Linux-x86_64-510.108.03.run"
-
-PATCHURL+=()
-
-LINUXPKG=${PKGEXTRANAME}.${ARCH}
-
-LINUXKLOCALVER=$(beeversion --format "%v.mx64.%r" "${LINUXPKG}")
-
-# '4.4.mx64.75' to '4.4.0.mx64.75'
-if [[ $LINUXKLOCALVER =~ ^([0-9]+\.[0-9]+)(\.mx64.*) ]]; then
-    LINUXKLOCALVER="${BASH_REMATCH[1]}.0${BASH_REMATCH[2]}"
-fi
-
-
-build_in_sourcedir
-sourcesubdir_append kernel
-
-: ${BEE_TMP_TMPDIR:=/tmp}
-
-# fix tar option for user namespace usage (`unshare -U -r BEEFILE`)
-export TAR_OPTIONS=--no-same-owner
-
-mee_extract() {
-    LINUXBUILDARCHIVE="${BEE_BUILDARCHIVEDIR}/${LINUXPKG}.beebuild.tar.bz2"
-
-    print_info "extracting nvidia archive .."
-
-    start_cmd rmdir ${S}
-    start_cmd sh ${F}/${NVIDIA_ARCHIVE} -x --target ${S}
-
-    if [ -d "/usr/src/linux/${LINUXPKG}/source" ] ; then
-        LINUXSRCDIR="/usr/src/linux/${LINUXPKG}/source"
-    elif [ -d "${BEE_TMP_TMPDIR}/${LINUXPKG}/source" ] ; then
-        LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source"
-    else
-        print_info "extracting linux build ${LINUXPKG} .."
-        start_cmd gtar -xf "${LINUXBUILDARCHIVE}" -C ${BEE_TMP_TMPDIR}
-        LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source"
-    fi
-
-    print_info "using kernel sources from ${LINUXSRCDIR} .."
-}
-
-mee_build_pre() {
-    ln -s ${LINUXSRCDIR}/include ${S}/include
-}
-
-mee_build() {
-    IGNORE_CC_MISMATCH=1 \
-    make SYSSRC=${LINUXSRCDIR} module
-}
-
-mee_install() {
-    mkdir -pv ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION}
-
-    cp -v *.ko ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/${PKGVERSION}/
-
-    ln -s ${PKGVERSION} ${D}${DATAROOTDIR}/nvidia/kernel/${LINUXKLOCALVER}/current
-}
diff --git a/nvidia_linux-6.6.11-460-535.104.05-0.bee b/nvidia_linux-6.6.35-477-535.104.05-0.bee
old mode 100755
new mode 100644
similarity index 59%
rename from nvidia_linux-6.6.11-460-535.104.05-0.bee
rename to nvidia_linux-6.6.35-477-535.104.05-0.bee
index eaa23d541..1b112e3b3
--- a/nvidia_linux-6.6.11-460-535.104.05-0.bee
+++ b/nvidia_linux-6.6.35-477-535.104.05-0.bee
@@ -26,33 +26,17 @@ sourcesubdir_append kernel
 export TAR_OPTIONS=--no-same-owner
 
 mee_extract() {
-    LINUXBUILDARCHIVE="${BEE_BUILDARCHIVEDIR}/${LINUXPKG}.beebuild.tar.bz2"
-
-    print_info "extracting nvidia archive .."
-
-    start_cmd rmdir ${S}
+    rmdir ${S}
     start_cmd sh ${F}/${NVIDIA_ARCHIVE} -x --target ${S}
 
-    if [ -d "/usr/src/linux/${LINUXPKG}/source" ] ; then
-        LINUXSRCDIR="/usr/src/linux/${LINUXPKG}/source"
-    elif [ -d "${BEE_TMP_TMPDIR}/${LINUXPKG}/source" ] ; then
-        LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source"
-    else
-        print_info "extracting linux build ${LINUXPKG} .."
-        start_cmd gtar -xf "${LINUXBUILDARCHIVE}" -C ${BEE_TMP_TMPDIR}
-        LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source"
+    if [ ! -d "${BEE_TMP_TMPDIR}/${LINUXPKG}/source" ] ; then
+        start_cmd gtar -xf ${BEE_BUILDARCHIVEDIR}/${LINUXPKG}.beebuild.tar.bz2 -C ${BEE_TMP_TMPDIR}
     fi
-
-    print_info "using kernel sources from ${LINUXSRCDIR} .."
-}
-
-mee_build_pre() {
-    ln -s ${LINUXSRCDIR}/include ${S}/include
+    LINUXSRCDIR="${BEE_TMP_TMPDIR}/${LINUXPKG}/source"
 }
 
 mee_build() {
-    IGNORE_CC_MISMATCH=1 \
-    make SYSSRC=${LINUXSRCDIR} module
+    make SYSSRC=${LINUXSRCDIR} CC=gcc module
 }
 
 mee_install() {