diff --git a/config/gfortran.cfg b/config/gfortran.cfg
index 342acae9..ec72e722 100644
--- a/config/gfortran.cfg
+++ b/config/gfortran.cfg
@@ -13,7 +13,7 @@
 FC           : gfortran -g -ffree-line-length-none -I . -fPIC
 LAPACK_LIB   : -lblas -llapack
 IRPF90       : irpf90
-IRPF90_FLAGS : --ninja --align=32 --assert 
+IRPF90_FLAGS : --ninja --align=32 --assert -DGNU_CHECK_OMP
 
 # Global options
 ################
diff --git a/config/ifort.cfg b/config/ifort.cfg
index 9d8302b8..63c4a5d3 100644
--- a/config/ifort.cfg
+++ b/config/ifort.cfg
@@ -9,7 +9,7 @@
 FC           : ifort -fpic
 LAPACK_LIB   : -mkl=parallel -lirc -lsvml -limf -lipps
 IRPF90       : irpf90
-IRPF90_FLAGS : --ninja --align=32  -DINTEL -DINTEL_CHECK_OMP
+IRPF90_FLAGS : --ninja --align=32  -DINTEL 
 
 # Global options
 ################
diff --git a/config/ifort_2019.cfg b/config/ifort_2019.cfg
new file mode 100644
index 00000000..35cf63f7
--- /dev/null
+++ b/config/ifort_2019.cfg
@@ -0,0 +1,63 @@
+# Common flags
+##############
+#
+# -mkl=[parallel|sequential] : Use the MKL library
+# --ninja                 : Allow the utilisation of ninja. It is mandatory !
+# --align=32                 : Align all provided arrays on a 32-byte boundary
+#
+[COMMON]
+FC           : ifort -fpic
+LAPACK_LIB   : -mkl=parallel -lirc -lsvml -limf -lipps
+IRPF90       : irpf90
+IRPF90_FLAGS : --ninja --align=32  -DINTEL -DINTEL2019_CHECK_OMP
+
+# Global options
+################
+#
+# 1 : Activate
+# 0 : Deactivate
+# 
+[OPTION]
+MODE    : OPT        ; [ OPT | PROFILE | DEBUG ] : Chooses the section below
+CACHE   : 0          ; Enable cache_compile.py
+OPENMP  : 1          ; Append OpenMP flags
+
+# Optimization flags
+####################
+#
+# -xHost                     : Compile a binary optimized for the current architecture
+# -O2                        : O3 not better than O2.
+# -ip                        : Inter-procedural optimizations
+# -ftz                       : Flushes denormal results to zero
+#
+[OPT]
+FC       : -traceback
+FCFLAGS  : -xSSE4.2 -O2 -ip -ftz -g 
+
+# Profiling flags
+#################
+#
+[PROFILE]
+FC       : -p -g
+FCFLAGS  : -xSSE4.2 -O2 -ip -ftz 
+
+# Debugging flags
+#################
+#
+# -traceback   : Activate backtrace on runtime
+# -fpe0        : All floating point exaceptions
+# -C           : Checks uninitialized variables,  array subscripts, etc...
+# -g           : Extra debugging information
+# -xSSE2       : Valgrind needs a very simple x86 executable
+#
+[DEBUG]
+FC      : -g -traceback
+FCFLAGS : -xSSE2 -C -fpe0  -implicitnone
+
+# OpenMP flags
+#################
+#
+[OPENMP]
+FC           : -qopenmp
+IRPF90_FLAGS : --openmp
+
diff --git a/config/ifort_2021.cfg b/config/ifort_2021.cfg
new file mode 100644
index 00000000..78e201f2
--- /dev/null
+++ b/config/ifort_2021.cfg
@@ -0,0 +1,63 @@
+# Common flags
+##############
+#
+# -mkl=[parallel|sequential] : Use the MKL library
+# --ninja                 : Allow the utilisation of ninja. It is mandatory !
+# --align=32                 : Align all provided arrays on a 32-byte boundary
+#
+[COMMON]
+FC           : ifort -fpic
+LAPACK_LIB   : -mkl=parallel -lirc -lsvml -limf -lipps
+IRPF90       : irpf90
+IRPF90_FLAGS : --ninja --align=32  -DINTEL -DINTEL2021_CHECK_OMP
+
+# Global options
+################
+#
+# 1 : Activate
+# 0 : Deactivate
+# 
+[OPTION]
+MODE    : OPT        ; [ OPT | PROFILE | DEBUG ] : Chooses the section below
+CACHE   : 0          ; Enable cache_compile.py
+OPENMP  : 1          ; Append OpenMP flags
+
+# Optimization flags
+####################
+#
+# -xHost                     : Compile a binary optimized for the current architecture
+# -O2                        : O3 not better than O2.
+# -ip                        : Inter-procedural optimizations
+# -ftz                       : Flushes denormal results to zero
+#
+[OPT]
+FC       : -traceback
+FCFLAGS  : -xSSE4.2 -O2 -ip -ftz -g 
+
+# Profiling flags
+#################
+#
+[PROFILE]
+FC       : -p -g
+FCFLAGS  : -xSSE4.2 -O2 -ip -ftz 
+
+# Debugging flags
+#################
+#
+# -traceback   : Activate backtrace on runtime
+# -fpe0        : All floating point exaceptions
+# -C           : Checks uninitialized variables,  array subscripts, etc...
+# -g           : Extra debugging information
+# -xSSE2       : Valgrind needs a very simple x86 executable
+#
+[DEBUG]
+FC      : -g -traceback
+FCFLAGS : -xSSE2 -C -fpe0  -implicitnone
+
+# OpenMP flags
+#################
+#
+[OPENMP]
+FC           : -qopenmp
+IRPF90_FLAGS : --openmp
+
diff --git a/src/utils/intel_check_omp.irp.f b/src/utils/intel_check_omp.irp.f
index 6933377c..af86b131 100644
--- a/src/utils/intel_check_omp.irp.f
+++ b/src/utils/intel_check_omp.irp.f
@@ -4,13 +4,17 @@ subroutine intel_check_omp()
 
   implicit none
 
-  IRP_IF INTEL_CHECK_OMP
+  IRP_IF INTEL2021_CHECK_OMP
     call omp_set_max_active_levels(5)
-    print*,'INTEL_CHECK_OMP: true'
-  IRP_ELSE
+    print*,'INTEL2021_CHECK_OMP: true'
+  IRP_ENDIF
+  IRP_IF INTEL2019_CHECK_OMP
     call omp_set_nested(.True.)
-    !call omp_set_nested(.False.)
-    print*,'INTEL_CHECK_OMP: false'
+    print*,'INTEL2019_CHECK_OMP: true'
+  IRP_ENDIF
+  IRP_IF GNU_CHECK_OMP
+    call omp_set_nested(.True.)
+    print*,'GNU_CHECK_OMP: true'
   IRP_ENDIF
 
 end