diff --git a/src/cp2k_info.F b/src/cp2k_info.F
index 78478aba4b..edc16f0248 100644
--- a/src/cp2k_info.F
+++ b/src/cp2k_info.F
@@ -116,15 +116,6 @@ CONTAINS
 #if defined(__ELPA)
       flags = TRIM(flags)//" elpa"
 #endif
-#if defined(__ELPA_NVIDIA_GPU)
-      flags = TRIM(flags)//" elpa_nvidia_gpu"
-#endif
-#if defined(__ELPA_AMD_GPU)
-      flags = TRIM(flags)//" elpa_amd_gpu"
-#endif
-#if defined(__ELPA_INTEL_GPU)
-      flags = TRIM(flags)//" elpa_intel_gpu"
-#endif
 #if defined(__parallel)
 #if defined(__SCALAPACK_NO_WA)
       flags = TRIM(flags)//" parallel scalapack"
diff --git a/src/fm/cp_fm_elpa.F b/src/fm/cp_fm_elpa.F
index 6572700806..15efec63e5 100644
--- a/src/fm/cp_fm_elpa.F
+++ b/src/fm/cp_fm_elpa.F
@@ -222,13 +222,13 @@ CONTAINS
          END IF
 
          ! Prefer GPU kernel if available.
-#if defined (__ELPA_NVIDIA_GPU)
+#if defined (__OFFLOAD_CUDA)
          elpa_kernel = ELPA_2STAGE_REAL_NVIDIA_GPU
 #endif
-#if defined (__ELPA_AMD_GPU)
+#if defined (__OFFLOAD_HIP)
          elpa_kernel = ELPA_2STAGE_REAL_AMD_GPU
 #endif
-#if defined (__ELPA_INTEL_GPU)
+#if defined (__OFFLOAD_OPENCL)
          elpa_kernel = ELPA_2STAGE_REAL_INTEL_GPU_SYCL
 #endif
 
diff --git a/tools/precommit/check_file_properties.py b/tools/precommit/check_file_properties.py
index 01bc53988f..c698d3c506 100755
--- a/tools/precommit/check_file_properties.py
+++ b/tools/precommit/check_file_properties.py
@@ -88,9 +88,6 @@ FLAG_EXCEPTIONS = (
     r"__NO_STATM_ACCESS",
     r"__STATM_RESIDENT",
     r"__STATM_TOTAL",
-    r"__ELPA_AMD_GPU",
-    r"__ELPA_INTEL_GPU",
-    r"__ELPA_NVIDIA_GPU",
     r"__CRAY_PM_ACCEL_ENERGY",
     r"__CRAY_PM_ENERGY",
     r"__OFFLOAD_PROFILING",