diff --git a/modulefiles/maven/.common b/modulefiles/maven/.common
new file mode 100644
index 0000000..d86c199
--- /dev/null
+++ b/modulefiles/maven/.common
@@ -0,0 +1,9 @@
+module-whatis https://maven.apache.org/
+
+conflict maven
+
+source [file dirname $ModulesCurrentModulefile]/../util/functions.tcl
+
+setenv MAVEN_HOME [home]/noarch/maven/$version
+prepend-path PATH $env(MAVEN_HOME)/bin
+
diff --git a/modulefiles/maven/3.9.0 b/modulefiles/maven/3.9.0
deleted file mode 100644
index e36b3e5..0000000
--- a/modulefiles/maven/3.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-#%Module1.0
-module-whatis https://maven.apache.org/
-
-conflict maven
-
-set version 3.9.0
-
-source [file dirname $ModulesCurrentModulefile]/../util/functions.tcl
-
-setenv MAVEN_HOME [home]/noarch/maven/$version
-prepend-path PATH $env(MAVEN_HOME)/bin
-
diff --git a/modulefiles/maven/3.9.0 b/modulefiles/maven/3.9.0
new file mode 120000
index 0000000..46e3662
--- /dev/null
+++ b/modulefiles/maven/3.9.0
@@ -0,0 +1 @@
+../util/.generic
\ No newline at end of file
diff --git a/modulefiles/maven/3.9.6 b/modulefiles/maven/3.9.6
deleted file mode 100644
index 975d839..0000000
--- a/modulefiles/maven/3.9.6
+++ /dev/null
@@ -1,12 +0,0 @@
-#%Module1.0
-module-whatis https://maven.apache.org/
-
-conflict maven
-
-set version 3.9.6
-
-source [file dirname $ModulesCurrentModulefile]/../util/functions.tcl
-
-setenv MAVEN_HOME [home]/noarch/maven/$version
-prepend-path PATH $env(MAVEN_HOME)/bin
-
diff --git a/modulefiles/maven/3.9.6 b/modulefiles/maven/3.9.6
new file mode 120000
index 0000000..46e3662
--- /dev/null
+++ b/modulefiles/maven/3.9.6
@@ -0,0 +1 @@
+../util/.generic
\ No newline at end of file
diff --git a/modulefiles/maven/3.9.9 b/modulefiles/maven/3.9.9
new file mode 120000
index 0000000..46e3662
--- /dev/null
+++ b/modulefiles/maven/3.9.9
@@ -0,0 +1 @@
+../util/.generic
\ No newline at end of file