diff --git a/scripts/setup/stellopt/make_scluster.inc b/scripts/setup/stellopt/make_scluster.inc
index 959c2bb..ea32134 100644
--- a/scripts/setup/stellopt/make_scluster.inc
+++ b/scripts/setup/stellopt/make_scluster.inc
@@ -17,7 +17,7 @@
 #######################################################################
 #            Define Compiler Flags
 #######################################################################
-  FLAGS_R = -O2 -fexternal-blas -fbacktrace -march=native
+  FLAGS_R = -O2 -fexternal-blas -fbacktrace -march=core-avx2 -mtune=generic
   FLAGS_D = -g -O0 -fexternal-blas -fcheck=all
   # Use OpenBLAS (includes LAPACK)
   OPENBLAS_DIR = $(CODE_ROOT)/external/OpenBLAS-0.3.28/install
diff --git a/scripts/setup/stellopt/make_vsc5.inc b/scripts/setup/stellopt/make_vsc5.inc
index 34ed47b..29a73c9 100644
--- a/scripts/setup/stellopt/make_vsc5.inc
+++ b/scripts/setup/stellopt/make_vsc5.inc
@@ -17,7 +17,7 @@
 #######################################################################
 #            Define Compiler Flags
 #######################################################################
-  FLAGS_R = -O2 -fexternal-blas -fbacktrace -march=native
+  FLAGS_R = -O2 -fexternal-blas -fbacktrace -march=core-avx2 -mtune=generic
   FLAGS_D = -g -O0 -fexternal-blas -fcheck=all
   # Use MKL for BLAS/LAPACK
   LIBS = -L$(MKLROOT)/lib/intel64 -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm -ldl