diff --git a/.gitmodules b/.gitmodules
index fc34afe..0a15a15 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -100,9 +100,6 @@
 [submodule "pkg/mauikit-git"]
 	path = pkg/mauikit-git
 	url = https://aur.archlinux.org/mauikit-git.git
-[submodule "pkg/meta-group-base-devel"]
-	path = pkg/meta-group-base-devel
-	url = https://aur.archlinux.org/meta-group-base-devel.git
 [submodule "pkg/mkcue"]
 	path = pkg/mkcue
 	url = https://aur.archlinux.org/mkcue.git
@@ -289,3 +286,6 @@
 [submodule "pkg/librespeed-cli-bin"]
 	path = pkg/librespeed-cli-bin
 	url = https://aur.archlinux.org/librespeed-cli-bin.git
+[submodule "pkg/base-devel-meta"]
+	path = pkg/base-devel-meta
+	url = https://aur.archlinux.org/base-devel-meta.git
diff --git a/build-pkg/pkglist-AUR.txt b/build-pkg/pkglist-AUR.txt
index 300a44e..57d1001 100644
--- a/build-pkg/pkglist-AUR.txt
+++ b/build-pkg/pkglist-AUR.txt
@@ -1,3 +1,3 @@
-adwaita-qt aurutils balena-etcher calindori-git chili-sddm-theme chromaprint-fftw crema davs2 decklink-sdk discord_arch_electron firefox-profile-switcher-connector flite1-patched forklift-git gnome-meta gnome-shell-extension-appindicator-git handbrake-full holo iio-sensor-proxy-git intellij-idea-ultimate-edition jellyfin-bin jexiftoolgui kirigami-addons-git lensfun-git lib32-ncurses5-compat-libs libklvanc-git libopenmpt-svn librespeed-cli-bin librist libwacom-surface mauikit-git meta-group-base-devel mkcue mrwriter-git mozilla-common mugshot ncurses5-compat-libs nextcloud-client-git nodejs-markdown-toc nordic-kde-git opencl-amd openh264 phantomjs portfolio-file-manager pycharm-professional pyspread python2-beaker python2-markupsafe python-mpv qt4 qt-installer-framework sddm-theme-deepin-git shine signal-desktop-beta-bin softmaker-office-2021-bin sphinxbase tagspaces-bin timeshift toggle-bluetooth ttf-material-design-icons-git ttf-unifont uavs3d uavs3d-git umldesigner vo-amrwbenc vobcopy vulkan-headers-git wkhtmltopdf-static woeusb x264-git xavs xavs2 xfce4-meta xfce4-theme-switcher xml2 xorg-meta xournalpp-git yay youtube-dlp zoom zotero
+adwaita-qt aurutils balena-etcher base-devel-meta calindori-git chili-sddm-theme chromaprint-fftw crema davs2 decklink-sdk discord_arch_electron firefox-profile-switcher-connector flite1-patched forklift-git gnome-meta gnome-shell-extension-appindicator-git handbrake-full holo iio-sensor-proxy-git intellij-idea-ultimate-edition jellyfin-bin jexiftoolgui kirigami-addons-git lensfun-git lib32-ncurses5-compat-libs libklvanc-git libopenmpt-svn librespeed-cli-bin librist libwacom-surface mauikit-git mkcue mrwriter-git mozilla-common mugshot ncurses5-compat-libs nextcloud-client-git nodejs-markdown-toc nordic-kde-git opencl-amd openh264 phantomjs portfolio-file-manager pycharm-professional pyspread python2-beaker python2-markupsafe python-mpv qt4 qt-installer-framework sddm-theme-deepin-git shine signal-desktop-beta-bin softmaker-office-2021-bin sphinxbase tagspaces-bin timeshift toggle-bluetooth ttf-material-design-icons-git ttf-unifont uavs3d uavs3d-git umldesigner vo-amrwbenc vobcopy vulkan-headers-git wkhtmltopdf-static woeusb x264-git xavs xavs2 xfce4-meta xfce4-theme-switcher xml2 xorg-meta xournalpp-git yay youtube-dlp zoom zotero
 adwaita-qt4 aosp-devel kclock nodejs-markdown-pdf pocketsphinx python2-mako riseup-vpn youplay zoom-firejail
 ffmpeg-amd-full lineageos-devel riseup-vpn-terminal
diff --git a/pkg/base-devel-meta b/pkg/base-devel-meta
new file mode 160000
index 0000000..17a6a53
--- /dev/null
+++ b/pkg/base-devel-meta
@@ -0,0 +1 @@
+Subproject commit 17a6a531748e849c57870ede53cff8d1ac44b3aa
diff --git a/pkg/de-p1st-base/PKGBUILD b/pkg/de-p1st-base/PKGBUILD
index 2cd5718..581dddc 100644
--- a/pkg/de-p1st-base/PKGBUILD
+++ b/pkg/de-p1st-base/PKGBUILD
@@ -15,7 +15,7 @@ depends=('de-p1st-kernel')
 # lz4 enabled mkinitcpio
 depends+=('de-p1st-mkinitcpio')
 # basic stuff
-depends+=('base' 'meta-group-base-devel' 'linux-firmware' 'man-db' 'man-pages' 'de-p1st-nano')
+depends+=('base' 'base-devel-meta' 'linux-firmware' 'man-db' 'man-pages' 'de-p1st-nano')
 # CPU vendor specific microcode
 depends+=('de-p1st-ucode')
 # filesystems: luks, btrfs, ext4, f2fs
diff --git a/pkg/meta-group-base-devel b/pkg/meta-group-base-devel
deleted file mode 160000
index 4be461d..0000000
--- a/pkg/meta-group-base-devel
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4be461d13c5bacaa5a75bdfcee00bc050fb576ea