diff --git a/.gitmodules b/.gitmodules
index ab72b60a64..c4f2d57f39 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,8 +40,10 @@
   branch = develop
 [submodule "AQM"]
   path = AQM
-  url = https://github.com/NOAA-EMC/AQM
-  branch = develop
+  #url = https://github.com/NOAA-EMC/AQM
+  #branch = develop
+  url = https://github.com/noaa-oar-arl/AQM
+  branch = feature/cmaq54
 [submodule "NOAHMP"]
   path = NOAHMP-interface/noahmp
   url = https://github.com/NOAA-EMC/noahmp
diff --git a/AQM b/AQM
index 37cbb7d684..584637b390 160000
--- a/AQM
+++ b/AQM
@@ -1 +1 @@
-Subproject commit 37cbb7d6840ae7515a9a8f0dfd4d89461b3396d1
+Subproject commit 584637b390efba3d267dca95fc81d8460d7ba65f