diff --git a/packages/linux-elaina/.SRCINFO b/packages/linux-elaina/.SRCINFO
index b8a3ee2..5c63dcf 100644
--- a/packages/linux-elaina/.SRCINFO
+++ b/packages/linux-elaina/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-elaina
 	pkgdesc = Linux kernel for Elaina, based on Xanmod stable and edited some config
 	pkgver = 6.11.6_xanmod1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.xanmod.org/
 	arch = x86_64
 	license = GPL-2.0-only
@@ -19,7 +19,6 @@ pkgbase = linux-elaina
 	source = linux-6.11.tar.xz::https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.11.tar.xz
 	source = linux-6.11.tar.sign::https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.11.tar.sign
 	source = xanmod-patch-6.11.6_xanmod1.xz::https://sourceforge.net/projects/xanmod/files/releases/main/6.11.6-xanmod1/patch-6.11.6-xanmod1.xz/download
-	source = choose-gcc-optimization.bash
 	source = config.bash
 	source = elaina.bash
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
@@ -27,15 +26,13 @@ pkgbase = linux-elaina
 	sha512sums = 329c1f94008742e3f0c2ce7e591a16316d1b2cb9ea4596d4f45604097e07b7aa2f64afa40630a07f321a858455c77aa32ba57b271932ddcf4dc27863f9081cea
 	sha512sums = SKIP
 	sha512sums = 3ff6cd094bf69a3888af2bc572f197be66e2a04ce2eb589198a9c6e23643382223a3a01f96623c09c8ec98c9a939a891daae8530ab17ab13e350a61a916fc064
-	sha512sums = 225017227219809ec19458f3c4a9def7d22c2a6cead53f3b10d7e8e6722ec49ab5905576bffd0c50784dee99648815f5bbc65146c5d2d7bcd82b72b52f498aa7
-	sha512sums = d9130cfa01319836bb5d506a7a9abc818f49b988705eb2697c36424182fd52c2caa868052c43be0d2aff211d99128c45b199f4f2531e8772a28746d7de3f3dc3
-	sha512sums = d69ab6d45fda910e4c427b5c7824d5076fc8a83434d11ca36d188f0ba5b7aedab7712e10a2e84ff0ae418d933b540da0432d79fb6224661f3d972450ed5aca15
+	sha512sums = 16cf008929ecb71ac8907feb2a3a4b2a06fed378915bf4d65db353235c1204df0a18939c9b66fcdf6d61736f063057a7a6e6bac846ed9904161a214d0562443a
+	sha512sums = a59199ae02019b6f05030ec64907b80f1042440752ab3be2f34317e27b622095138eb78d6c7e198004e62e87806d662f5c0778b285ecf0d8b9d4eed615b247fa
 	b2sums = e7750c0878d71a56a0ce52d4c4c912199dad5bf5e2e8f872585a6494afbb37cbd852e612a6858936d2dc9b7776a3933818f540db408d57e90d18ea5249bba7ab
 	b2sums = SKIP
 	b2sums = 996eaf8fa95e2dbbce8bd0700afb085c00ee15652add756f824409b5bfb7fb60c16aa32179a556954046bba18866d48d7f06e4d3e07d8f9f259d417c4f1baa3b
-	b2sums = 72b9fa70c5e3ce27ecc6a5790cd76c0a5b646248e43e990d1df2e43215adfb9d9fb8cce01adef700e39bef8300af367fc0381ab5d0c774f014351d333a11a5db
-	b2sums = 32187bdf99e86a7758b65110cd20830d65937dab09c0d32982b6d0c8bfabdf0aa453730e17042590f421d608687b38ed230100ad880d53e2833e54199321455b
-	b2sums = 1dbaaab7cbaeb2be86abae4a245315571e5c0d4ac45ff236677a725432c92f0cedb9e9de906c5868820c77c2dbd573ae8b2ce5a45f553d008f8802f209fd9e4c
+	b2sums = 331c754b0814eaa931cf58d4d5a68c5e4a7f345b6139459a38cb4c452ee5e6ead00424673596f4822d7b2e4ebb35022b474c66612f91b07d3222215b211fdd4f
+	b2sums = 9fbfdd6ab77e7ece87452fef5b9578cf148dc0962efe23079cae51e33492ddb01e39a5d7f583f5b2a9ac60ed5255a0acc9cddc7283e6a30d9d49da145863512f
 
 pkgname = linux-elaina
 	pkgdesc = The Elaina kernel and modules
diff --git a/packages/linux-elaina/PKGBUILD b/packages/linux-elaina/PKGBUILD
index 33ef07d..8a3f7f8 100644
--- a/packages/linux-elaina/PKGBUILD
+++ b/packages/linux-elaina/PKGBUILD
@@ -4,7 +4,7 @@ _major=6
 _minor=11
 _patch=6
 _xanmod=1
-_elaina=1
+_elaina=2
 
 _xanmod_branch='main'
 
@@ -28,22 +28,19 @@ options=('!debug' '!strip')
 source=("${_srcname}.tar.xz"::"https://cdn.kernel.org/pub/linux/kernel/v${_major}.x/${_srcname}.tar.xz"
         "${_srcname}.tar.sign"::"https://cdn.kernel.org/pub/linux/kernel/v${_major}.x/${_srcname}.tar.sign"
         "xanmod-patch-${_to_xanmod}.xz"::"https://sourceforge.net/projects/xanmod/files/releases/${_xanmod_branch}/${_to_xanmod//_/-}/patch-${_to_xanmod//_/-}.xz/download"
-        'choose-gcc-optimization.bash'
         'config.bash'
         'elaina.bash')
 
 sha512sums=('329c1f94008742e3f0c2ce7e591a16316d1b2cb9ea4596d4f45604097e07b7aa2f64afa40630a07f321a858455c77aa32ba57b271932ddcf4dc27863f9081cea'
             'SKIP'
             '3ff6cd094bf69a3888af2bc572f197be66e2a04ce2eb589198a9c6e23643382223a3a01f96623c09c8ec98c9a939a891daae8530ab17ab13e350a61a916fc064'
-            '225017227219809ec19458f3c4a9def7d22c2a6cead53f3b10d7e8e6722ec49ab5905576bffd0c50784dee99648815f5bbc65146c5d2d7bcd82b72b52f498aa7'
-            'd9130cfa01319836bb5d506a7a9abc818f49b988705eb2697c36424182fd52c2caa868052c43be0d2aff211d99128c45b199f4f2531e8772a28746d7de3f3dc3'
-            'd69ab6d45fda910e4c427b5c7824d5076fc8a83434d11ca36d188f0ba5b7aedab7712e10a2e84ff0ae418d933b540da0432d79fb6224661f3d972450ed5aca15')
+            '16cf008929ecb71ac8907feb2a3a4b2a06fed378915bf4d65db353235c1204df0a18939c9b66fcdf6d61736f063057a7a6e6bac846ed9904161a214d0562443a'
+            'a59199ae02019b6f05030ec64907b80f1042440752ab3be2f34317e27b622095138eb78d6c7e198004e62e87806d662f5c0778b285ecf0d8b9d4eed615b247fa')
 b2sums=('e7750c0878d71a56a0ce52d4c4c912199dad5bf5e2e8f872585a6494afbb37cbd852e612a6858936d2dc9b7776a3933818f540db408d57e90d18ea5249bba7ab'
         'SKIP'
         '996eaf8fa95e2dbbce8bd0700afb085c00ee15652add756f824409b5bfb7fb60c16aa32179a556954046bba18866d48d7f06e4d3e07d8f9f259d417c4f1baa3b'
-        '72b9fa70c5e3ce27ecc6a5790cd76c0a5b646248e43e990d1df2e43215adfb9d9fb8cce01adef700e39bef8300af367fc0381ab5d0c774f014351d333a11a5db'
-        '32187bdf99e86a7758b65110cd20830d65937dab09c0d32982b6d0c8bfabdf0aa453730e17042590f421d608687b38ed230100ad880d53e2833e54199321455b'
-        '1dbaaab7cbaeb2be86abae4a245315571e5c0d4ac45ff236677a725432c92f0cedb9e9de906c5868820c77c2dbd573ae8b2ce5a45f553d008f8802f209fd9e4c')
+        '331c754b0814eaa931cf58d4d5a68c5e4a7f345b6139459a38cb4c452ee5e6ead00424673596f4822d7b2e4ebb35022b474c66612f91b07d3222215b211fdd4f'
+        '9fbfdd6ab77e7ece87452fef5b9578cf148dc0962efe23079cae51e33492ddb01e39a5d7f583f5b2a9ac60ed5255a0acc9cddc7283e6a30d9d49da145863512f')
 
 validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linux Torvalds
               '647F28654894E3BD457199BE38DBBDC86092693E') # Greg Kroah-Hartman
diff --git a/packages/linux-elaina/choose-gcc-optimization.bash b/packages/linux-elaina/choose-gcc-optimization.bash
deleted file mode 100755
index d769e47..0000000
--- a/packages/linux-elaina/choose-gcc-optimization.bash
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/bash
-
-answer=$1
-
-case $answer in
-     1) Microarchitecture=CONFIG_MK8 ;;             # AMD Opteron/Athlon64/Hammer/K8
-     2) Microarchitecture=CONFIG_MK8SSE3 ;;         # AMD Opteron/Athlon64/Hammer/K8 with SSE3
-     3) Microarchitecture=CONFIG_MK10 ;;            # AMD 61xx/7x50/PhenomX3/X4/II/K10
-     4) Microarchitecture=CONFIG_MBARCELONA ;;      # AMD Family 10h (Barcelona)
-     5) Microarchitecture=CONFIG_MBOBCAT ;;         # AMD Family 14h (Bobcat)
-     6) Microarchitecture=CONFIG_MJAGUAR ;;         # AMD Family 16h (Jaguar)
-     7) Microarchitecture=CONFIG_MBULLDOZER ;;      # AMD Family 15h (Bulldozer)
-     8) Microarchitecture=CONFIG_MPILEDRIVER ;;     # AMD Family 15h (Piledriver)
-     9) Microarchitecture=CONFIG_MSTEAMROLLER ;;    # AMD Family 15h (Steamroller)
-    10) Microarchitecture=CONFIG_MEXCAVATOR ;;      # AMD Family 15h (Excavator)
-    11) Microarchitecture=CONFIG_MZEN ;;            # AMD Family 17h (Zen)
-    12) Microarchitecture=CONFIG_MZEN2 ;;           # AMD Family 17h (Zen 2)
-    13) Microarchitecture=CONFIG_MZEN3 ;;           # AMD Family 19h (Zen 3)
-    14) Microarchitecture=CONFIG_MZEN4 ;;           # AMD Family 19h (Zen 4)
-    15) Microarchitecture=CONFIG_MPSC ;;            # Intel P4 / older Netburst based Xeon
-    16) Microarchitecture=CONFIG_MCORE2 ;;          # Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and 53xx)
-    17) Microarchitecture=CONFIG_MATOM ;;           # Intel Atom
-    18) Microarchitecture=CONFIG_MNEHALEM ;;        # Intel 1st Gen Core i3/i5/i7-family (Nehalem)
-    19) Microarchitecture=CONFIG_MWESTMERE ;;       # Intel 1.5 Gen Core i3/i5/i7-family (Westmere)
-    20) Microarchitecture=CONFIG_MSILVERMONT ;;     # Intel Silvermont
-    21) Microarchitecture=CONFIG_MGOLDMONT ;;       # Intel Goldmont (Apollo Lake and Denverton)
-    22) Microarchitecture=CONFIG_MGOLDMONTPLUS ;;   # Intel Goldmont Plus (Gemini Lake)
-    23) Microarchitecture=CONFIG_MSANDYBRIDGE ;;    # Intel 2nd Gen Core i3/i5/i7-family (Sandybridge)
-    24) Microarchitecture=CONFIG_MIVYBRIDGE ;;      # Intel 3rd Gen Core i3/i5/i7-family (Ivybridge)
-    25) Microarchitecture=CONFIG_MHASWELL ;;        # Intel 4th Gen Core i3/i5/i7-family (Haswell)
-    26) Microarchitecture=CONFIG_MBROADWELL ;;      # Intel 5th Gen Core i3/i5/i7-family (Broadwell)
-    27) Microarchitecture=CONFIG_MSKYLAKE ;;        # Intel 6th Gen Core i3/i5/i7-family (Skylake)
-    28) Microarchitecture=CONFIG_MSKYLAKEX ;;       # Intel 6th Gen Core i7/i9-family (Skylake X)
-    29) Microarchitecture=CONFIG_MCANNONLAKE ;;     # Intel 8th Gen Core i3/i5/i7-family (Cannon Lake)
-    30) Microarchitecture=CONFIG_MICELAKE ;;        # Intel 8th Gen Core i7/i9-family (Ice Lake)
-    31) Microarchitecture=CONFIG_MCASCADELAKE ;;    # Xeon processors in the Cascade Lake family
-    32) Microarchitecture=CONFIG_MCOOPERLAKE ;;     # Intel Xeon (Cooper Lake)
-    33) Microarchitecture=CONFIG_MTIGERLAKE ;;      # Intel 3rd Gen 10nm++ i3/i5/i7/i9-family (Tiger Lake)
-    34) Microarchitecture=CONFIG_MSAPPHIRERAPIDS ;; # Intel Sapphire Rapids
-    35) Microarchitecture=CONFIG_MROCKETLAKE ;;     # Intel Rocket Lake
-    36) Microarchitecture=CONFIG_MALDERLAKE ;;      # Intel Alder Lake
-    91) Microarchitecture=CONFIG_GENERIC_CPU ;;     # Generic-x86-64-v1 (LEGACY < 2003. Not supported by XanMod project)
-    92) Microarchitecture=CONFIG_GENERIC_CPU2 ;;    # Generic-x86-64-v2 (Nehalem and newer)
-    93) Microarchitecture=CONFIG_GENERIC_CPU3 ;;    # Generic-x86-64-v3 (Haswell and newer)
-    94) Microarchitecture=CONFIG_GENERIC_CPU4 ;;    # Generic-x86-64-v4 (AVX512 CPUs)
-    98) Microarchitecture=CONFIG_MNATIVE_INTEL ;;   # Intel-Native optimizations autodetected by GCC
-    99) Microarchitecture=CONFIG_MNATIVE_AMD ;;     # AMD-Native optimizations autodetected by GCC
-     *) default=CONFIG_GENERIC_CPU2 ;;              # Generic x64-v2 (default)
-esac
-
-_defaultmicro=$(grep ^CONFIG_LOCALVERSION .config)
-if [ -z "${default}" ]; then
-    _localversion=$(echo ${Microarchitecture,,} | sed -e 's/config_m/-/g' -e 's/config_generic_cpu/-x64v/g')
-    sed -e "s|^$_defaultmicro|CONFIG_LOCALVERSION=\"$_localversion\"|g" -i .config
-fi
-
-sed -e 's|^CONFIG_GENERIC_CPU=y|# CONFIG_GENERIC_CPU is not set|g' -i .config
-sed -e 's|^CONFIG_GENERIC_CPU2=y|# CONFIG_GENERIC_CPU2 is not set|g' -i .config
-sed -e 's|^CONFIG_GENERIC_CPU3=y|# CONFIG_GENERIC_CPU3 is not set|g' -i .config
-sed -e 's|^CONFIG_GENERIC_CPU4=y|# CONFIG_GENERIC_CPU4 is not set|g' -i .config
-sed -e "s|^# $Microarchitecture is not set|$Microarchitecture=y|g" -i .config
diff --git a/packages/linux-elaina/config.bash b/packages/linux-elaina/config.bash
index 843b571..46db778 100644
--- a/packages/linux-elaina/config.bash
+++ b/packages/linux-elaina/config.bash
@@ -42,8 +42,3 @@ setConfig() {
     msg2 'setConfig: %s' $1
     cp -f "CONFIGS/xanmod/gcc/${1}" .config
 }
-
-setOptimization() {
-    msg2 'setOptimization: %s' $1
-    source "${srcdir}/choose-gcc-optimization.bash" $1
-}
diff --git a/packages/linux-elaina/elaina.bash b/packages/linux-elaina/elaina.bash
index 33e28e7..af4a12a 100644
--- a/packages/linux-elaina/elaina.bash
+++ b/packages/linux-elaina/elaina.bash
@@ -2,11 +2,8 @@
 
 source "${srcdir}/config.bash"
 
-# Set config as x86-64_v2
-setConfig config_x86-64-v2
-
-# Set GCC optimization level as x86-64_v2
-setOptimization 92
+# Set config as x86-64_v3
+setConfig config_x86-64-v3
 
 # AUR package linux-xanmod defaulted
 enableAll \