diff --git a/etc/bashrc b/etc/bashrc
index b8a6c01783ced765f250b6262cfbac837c7e8aac..c8e659d8fda49b16982d7bff6d2b0253cdaddcca 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -80,7 +80,6 @@ export WM_LABEL_SIZE=32
 
 # [WM_COMPILE_OPTION] - Optimised(default), debug, profiling, other:
 # = Opt | Debug | Prof
-# Other is processor or packaging specific (eg, OptKNL)
 export WM_COMPILE_OPTION=Opt
 
 # [WM_COMPILE_CONTROL] - additional control for compiler rules
diff --git a/etc/config.csh/compiler b/etc/config.csh/compiler
index e8fb26ae402c2fe19b014329f8fd0fb1dbc3601f..73df3611b1ef4c48b816609777d33d9323eedada 100644
--- a/etc/config.csh/compiler
+++ b/etc/config.csh/compiler
@@ -6,7 +6,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2016 OpenFOAM Foundation
-#     Copyright (C) 2016-2021 OpenCFD Ltd.
+#     Copyright (C) 2016-2022 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -26,6 +26,10 @@
 #     I_MPI_CC, I_MPI_CXX environment variables may be defined for the
 #     Intel mpicc/mpicxx wrappers
 #
+# Caveat
+#     Not all compiler versions listed here are necessarily currently tested,
+#     but can generally be expected to work.
+#
 #------------------------------------------------------------------------------
 
 # Initial mpi/compiler associations
@@ -69,6 +73,15 @@ case ThirdParty:
     case Gcc:
         set gcc_version="$default_gcc_version"
         breaksw
+    case Gcc121*:
+        set gcc_version=gcc-12.1.0
+        breaksw
+    case Gcc113*:
+        set gcc_version=gcc-11.3.0
+        breaksw
+    case Gcc112*:
+        set gcc_version=gcc-11.2.0
+        breaksw
     case Gcc111*:
         set gcc_version=gcc-11.1.1
         breaksw
@@ -81,6 +94,12 @@ case ThirdParty:
     case Gcc101*:
         set gcc_version=gcc-10.1.0
         breaksw
+    case Gcc95*:
+        set gcc_version=gcc-9.5.0
+        breaksw
+    case Gcc94*:
+        set gcc_version=gcc-9.4.0
+        breaksw
     case Gcc93*:
         set gcc_version=gcc-9.3.0
         breaksw
@@ -90,6 +109,9 @@ case ThirdParty:
     case Gcc91*:
         set gcc_version=gcc-9.1.0
         breaksw
+    case Gcc85*:
+        set gcc_version=gcc-8.5.0
+        breaksw
     case Gcc84*:
         set gcc_version=gcc-8.4.0
         breaksw
@@ -159,8 +181,14 @@ case ThirdParty:
     case Clang:
         set clang_version="$default_clang_version"
         breaksw
+    case Clang140*:
+        set clang_version=llvm-14.0.5
+        breaksw
+    case Clang130*:
+        set clang_version=llvm-13.0.1
+        breaksw
     case Clang120*:
-        set clang_version=llvm-12.0.0
+        set clang_version=llvm-12.0.1
         breaksw
     case Clang111*:
         set clang_version=llvm-11.1.0
diff --git a/etc/config.sh/compiler b/etc/config.sh/compiler
index b7006a54be6f9299508b86946e7b75abe3dc4b07..4fa14f93e4f10feb75e44c6caf4b814c105189a7 100644
--- a/etc/config.sh/compiler
+++ b/etc/config.sh/compiler
@@ -6,7 +6,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2011-2016 OpenFOAM Foundation
-#     Copyright (C) 2016-2021 OpenCFD Ltd.
+#     Copyright (C) 2016-2022 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -26,6 +26,10 @@
 #     I_MPI_CC, I_MPI_CXX environment variables may be defined for the
 #     Intel mpicc/mpicxx wrappers
 #
+# Caveat
+#     Not all compiler versions listed here are necessarily currently tested,
+#     but can generally be expected to work.
+#
 #------------------------------------------------------------------------------
 
 # Initial mpi/compiler associations
@@ -70,13 +74,19 @@ ThirdParty)
 
     case "$WM_COMPILER" in
     Gcc)    gcc_version="$default_gcc_version" ;;
+    Gcc121*) gcc_version=gcc-12.1.0 ;;
+    Gcc113*) gcc_version=gcc-11.3.0 ;;
+    Gcc112*) gcc_version=gcc-11.2.0 ;;
     Gcc111*) gcc_version=gcc-11.1.1 ;;
     Gcc103*) gcc_version=gcc-10.3.0 ;;
     Gcc102*) gcc_version=gcc-10.2.0 ;;
     Gcc101*) gcc_version=gcc-10.1.0 ;;
+    Gcc95*) gcc_version=gcc-9.5.0 ;;
+    Gcc94*) gcc_version=gcc-9.4.0 ;;
     Gcc93*) gcc_version=gcc-9.3.0 ;;
     Gcc92*) gcc_version=gcc-9.2.0 ;;
     Gcc91*) gcc_version=gcc-9.1.0 ;;
+    Gcc85*) gcc_version=gcc-8.5.0 ;;
     Gcc84*) gcc_version=gcc-8.4.0 ;;
     Gcc83*) gcc_version=gcc-8.3.0 ;;
     Gcc82*) gcc_version=gcc-8.2.0 ;;
@@ -101,7 +111,9 @@ ThirdParty)
     Gcc48*) gcc_version=gcc-4.8.5 ;;
 
     Clang)    clang_version="$default_clang_version" ;;
-    Clang120*) clang_version=llvm-12.0.0 ;;
+    Clang140*) clang_version=llvm-14.0.5 ;;
+    Clang130*) clang_version=llvm-13.0.1 ;;
+    Clang120*) clang_version=llvm-12.0.1 ;;
     Clang111*) clang_version=llvm-11.1.0 ;;
     Clang110*) clang_version=llvm-11.0.1 ;;
     Clang100*) clang_version=llvm-10.0.1 ;;
diff --git a/etc/cshrc b/etc/cshrc
index 6417a1d1988874f3d5e34c926053d7a3c46516ea..f117dad892d70ca1171637844e1a94808d49269c 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -80,7 +80,6 @@ setenv WM_LABEL_SIZE 32
 
 # [WM_COMPILE_OPTION] - Optimised(default), debug, profiling, other:
 # = Opt | Debug | Prof
-# Other is processor or packaging specific (eg, OptKNL)
 setenv WM_COMPILE_OPTION Opt
 
 # [WM_COMPILE_CONTROL] - additional control for compiler rules