diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b1b3fe0d5298d48854971056b2efcbab414e63e..d2069a3827b5962239dbb2ff480dc66b87701e41 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -239,6 +239,14 @@ Markdown Lint:
     - cat ${JACOCO_HTML_DIR}/index.html
   stage: test
 
+
+.alaska-sites: &alaska-sites
+  - TEST_SITE: ANCHORAGE_AK
+  - TEST_SITE: FAIRBANKS_AK
+  - TEST_SITE: JUNEAU_AK
+  - TEST_SITE: KODIAK_AK
+  - TEST_SITE: VALDEZ_AK
+
 Alaska 2007 NSHM Test:
   extends:
     - .nshm-test
@@ -248,25 +256,29 @@ Alaska 2007 NSHM Test:
 Alaska 2023 NSHM Test:
   extends:
     - .nshm-test
-  variables:
-    CMD: testAlaska2023
+  parallel:
+    matrix:
+      *alaska-sites
   script:
-    - ./gradlew testAlaska2007 --info
+    - ./gradlew testAlaksa2023 -DTEST_SITE=${TEST_SITE} --info
+
+.conus-sites: &conus-sites
+  - TEST_SITE: LOS_ANGELES_CA
+  - TEST_SITE: SAN_FRANCISCO_CA
+  - TEST_SITE: SEATTLE_WA
+  - TEST_SITE: SALT_LAKE_CITY_UT
+  - TEST_SITE: RENO_NV
+  - TEST_SITE: NEW_MADRID_MO
+  - TEST_SITE: BOSTON_MA
+  - TEST_SITE: NEW_YORK_NY
+  - TEST_SITE: CHICAGO_IL
 
 CONUS 2018 NSHM Test:
   extends:
     - .nshm-test
   parallel:
     matrix:
-      - TEST_SITE: LOS_ANGELES_CA
-      - TEST_SITE: SAN_FRANCISCO_CA
-      - TEST_SITE: SEATTLE_WA
-      - TEST_SITE: SALT_LAKE_CITY_UT
-      - TEST_SITE: RENO_NV
-      - TEST_SITE: NEW_MADRID_MO
-      - TEST_SITE: BOSTON_MA
-      - TEST_SITE: NEW_YORK_NY
-      - TEST_SITE: CHICAGO_IL
+      *conus-sites
   script:
     - ./gradlew testConus2018 -DTEST_SITE=${TEST_SITE} --info
 
@@ -275,18 +287,16 @@ CONUS 2023 NSHM Test:
     - .nshm-test
   parallel:
     matrix:
-      - TEST_SITE: LOS_ANGELES_CA
-      - TEST_SITE: SAN_FRANCISCO_CA
-      - TEST_SITE: SEATTLE_WA
-      - TEST_SITE: SALT_LAKE_CITY_UT
-      - TEST_SITE: RENO_NV
-      - TEST_SITE: NEW_MADRID_MO
-      - TEST_SITE: BOSTON_MA
-      - TEST_SITE: NEW_YORK_NY
-      - TEST_SITE: CHICAGO_IL
+      *conus-sites
   script:
     - ./gradlew testConus2023 -DTEST_SITE=${TEST_SITE} --info
 
+Hawaii 2021 NSHM Test:
+  extends:
+    - .nshm-test
+  script:
+    - ./gradlew testHawaii2021 --info
+
 YAML Lint:
   allow_failure: true
   needs: []