diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0fe357cf..281fb03c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,8 @@
 ## `2.18.1`
 - Bugfix: IARV64 results must be checked for 0x7FFFF000 (#474)
 - Bugfix: SLH should not ABEND when MEMLIMIT is reached (additional NULL check)
-- Bugfix: support cross-memory server parameters longer than 128 characters 
-  (zowe/zss#684)
+- Bugfix: support cross-memory server parameters longer than 128 characters (zowe/zss#684)
+- Bugfix: HEAPPOOLS and HEAPPOOLS64 no longer need to be set to OFF for configmgr (#498)
 
 ## `2.18.0`
 - Minor `components.zss.logLevels._zss.httpserver=5` debug messages enhancement (#471)
diff --git a/build/build_cmgr_xlclang.sh b/build/build_cmgr_xlclang.sh
index b78293f3f..01ba670e5 100755
--- a/build/build_cmgr_xlclang.sh
+++ b/build/build_cmgr_xlclang.sh
@@ -100,6 +100,7 @@ xlclang \
   -D_OPEN_THREADS=1 \
   -DNOIBMHTTP=1 \
   -DUSE_ZOWE_TLS=1 \
+  -DNEW_CAA_LOCATIONS=1 \
   -DCMGRTEST=1 \
   -I "${COMMON}/h" \
   -I "${COMMON}/platform/posix" \