diff --git a/app/arch/bzip2/ympbuild b/app/arch/bzip2/ympbuild
index f5f00cd6..c23d7e1f 100644
--- a/app/arch/bzip2/ympbuild
+++ b/app/arch/bzip2/ympbuild
@@ -11,7 +11,7 @@ source=("https://sourceware.org/pub/bzip2/bzip2-${version}.tar.gz"
 md5sums=('67e051268d0c475ea773822f7500d0e5'
          'SKIP')
 group=(app.arch)
-
+arch=(x86_64)
 cd $name-$version
 
 setup(){
diff --git a/app/arch/libarchive/ympbuild b/app/arch/libarchive/ympbuild
index aec0c1b9..89191eb8 100644
--- a/app/arch/libarchive/ympbuild
+++ b/app/arch/libarchive/ympbuild
@@ -23,6 +23,7 @@ lz4_depends=(lz4)
 lzo_depends=(lzo)
 nettle_depends=(nettle)
 zstd_depends=(zstd)
+arch=(x86_64)
 
 cd $name-$version
 
diff --git a/sys/apps/file/ympbuild b/sys/apps/file/ympbuild
index eb266af8..9c826adb 100644
--- a/sys/apps/file/ympbuild
+++ b/sys/apps/file/ympbuild
@@ -16,6 +16,7 @@ zlib_depends=(zlib)
 lzma_depends=(xz-utils)
 bzip2_depends=(bzip2)
 seccomp_depends=(libseccomp)
+arch=(x86_64)
 
 cd $name-$version
 
diff --git a/sys/base/glibc/ympbuild b/sys/base/glibc/ympbuild
index b0ee6d3e..c3724ecc 100644
--- a/sys/base/glibc/ympbuild
+++ b/sys/base/glibc/ympbuild
@@ -32,8 +32,8 @@ md5sums=('00e9b89e043340f688bc93ec03239b57'
 uses=(multilib)
 group=(sys.base)
 
-export CFLAGS="-O3 ${debug:+-g} -s -mno-tls-direct-seg-refs -mtune=generic -DSULIX"
-export CXXFLAGS="-O3 ${debug:+-g} -s -mno-tls-direct-seg-refs -mtune=generic -DSULIX"
+export CFLAGS="-O2 ${debug:+-g} -s -mtune=generic -DSULIX"
+export CXXFLAGS="-O2 ${debug:+-g} -s -mtune=generic -DSULIX"
 
 cd "$name-$version"
 setup(){
@@ -44,16 +44,14 @@ setup(){
         --mandir=/usr/share/man
         --infodir=/usr/share/info
         --with-bugurl=http://gitlab.com/sulix/main/issues
-        --enable-add-ons
         --enable-bind-now
-        --enable-lock-elision
         --enable-cet
+        --enable-kernel=5.10
         --enable-multi-arch
-        --enable-static-pie
-        --enable-stack-protector=all
-        --enable-kernel=5.10.0
-        --enable-stackguard-randomization
-        --without-selinux
+        --enable-stack-protector=strong
+        --enable-systemtap
+        --disable-crypt
+        --disable-profile
         --disable-werror
 
     )