diff --git a/nshms.yml b/nshms.yml
index 2d794b6cd2c3b47bfcde7d55d126dfffe89a1751..580fc5a25a8424e586dd7b85a188d6102d025455 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -54,7 +54,7 @@ nshms:
   # Alaska 2023 NSHM
   -
     repo: 'nshm-alaska'
-    tag: '3.b.9'
+    tag: '3.0.0-rc-1'
     year: 2023
     deployment:
       baseHref: '/ws/nshmp/alaska-2023/dynamic'
@@ -65,7 +65,7 @@ nshms:
           type: 'LAMBDA'
         production:
           type: 'LAMBDA'
-      label: '2023 Alaska Dynamic Services (beta)'
+      label: '2023 Alaska Dynamic Services'
       model: 'ALASKA_2023'
       test:
         site:
@@ -142,7 +142,7 @@ nshms:
   # PRVI 2025 NSHM
   -
     repo: 'nshm-prvi'
-    tag: '2.a.1'
+    tag: '2.b.2'
     year: 2025
     deployment:
       baseHref: '/ws/nshmp/prvi-2025/dynamic'
@@ -151,8 +151,8 @@ nshms:
           type: 'LAMBDA'
         staging:
           type: 'LAMBDA'
-        production:
-          type: 'LAMBDA'
+       # production:
+       #   type: 'LAMBDA'
       label: '2025 PRVI Dynamic Services'
       model: 'PRVI_2025'
       test:
diff --git a/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json b/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json
index 8b326a5cb607b737716b4ce9a97674bbca3fa034..9634a92de17e83a0bea3f678503d69ff89061369 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json
@@ -23,26 +23,26 @@
       1.6428726885203377
     ],
     "ys": [
-      1.8705720787448923,
-      1.4693007131669655,
-      1.125049272734369,
-      0.8355877902487033,
-      0.600897527295964,
-      0.41809959123337714,
-      0.28147440165354026,
-      0.18247291997213066,
-      0.1146321457368578,
-      0.06974604464886365,
-      0.0412193345364642,
-      0.0230832410334528,
-      0.012325240034643236,
-      0.005991702350122454,
-      0.0026091602423358577,
-      9.706495394890241E-4,
-      2.9628733345530965E-4,
-      6.918535190630059E-5,
-      1.13631932099536E-5,
-      1.1051926173257164E-6
+      1.86537128039736,
+      1.4680685575571253,
+      1.125854899194775,
+      0.8364974108459654,
+      0.6004321130309654,
+      0.41560076365716253,
+      0.2771289852626191,
+      0.17704073420420985,
+      0.10911318077355052,
+      0.06500302783581018,
+      0.03772884624085792,
+      0.020922058175812108,
+      0.011196547216284611,
+      0.005518953572338956,
+      0.0024570083967795876,
+      9.397720524308231E-4,
+      2.963234713128231E-4,
+      7.188696787986308E-5,
+      1.2354563857029189E-5,
+      1.2695893549514058E-6
     ]
   },
   "SA0P2": {
@@ -69,26 +69,26 @@
       1.998773638612381
     ],
     "ys": [
-      2.3212622501475533,
-      1.883797224536734,
-      1.4859437242963538,
-      1.143344527750667,
-      0.8496973700362391,
-      0.6163672294847234,
-      0.43313038136973386,
-      0.29405681312261595,
-      0.19351790322377654,
-      0.12324530113867646,
-      0.07611322220864682,
-      0.04547555409017356,
-      0.026114204051183542,
-      0.014235244388960107,
-      0.007227768813406812,
-      0.0033250868968394084,
-      0.0013534810474718712,
-      4.727646093869442E-4,
-      1.3473536443700385E-4,
-      2.9396669346552435E-5
+      2.313615467553467,
+      1.8805285041499282,
+      1.485548666480146,
+      1.1440623961564047,
+      0.8499324016222813,
+      0.6150780644430669,
+      0.43000355403988005,
+      0.2894467101438675,
+      0.1882194793060897,
+      0.11814623935181671,
+      0.07190870021241431,
+      0.04249644762043164,
+      0.024318492970696822,
+      0.01333593605509394,
+      0.006871998370115783,
+      0.0032294979285499943,
+      0.0013485486034349435,
+      4.84930539668427E-4,
+      1.4300714649588601E-4,
+      3.255307970363809E-5
     ]
   },
   "SA1P0": {
@@ -115,26 +115,26 @@
       1.7119945007591926
     ],
     "ys": [
-      1.4217924848762236,
-      1.0661096930571168,
-      0.7752489683278124,
-      0.5456235249053838,
-      0.37368716842107064,
-      0.24671771572790188,
-      0.16024384554439344,
-      0.10082166505252219,
-      0.06184777396021051,
-      0.03656611628717803,
-      0.020644281357099715,
-      0.010984803444777032,
-      0.005410292031544486,
-      0.002409261284003777,
-      9.447115945534841E-4,
-      3.1943280531448147E-4,
-      8.673260376905151E-5,
-      1.803653504247259E-5,
-      2.799179550215747E-6,
-      3.0130286215852437E-7
+      1.4050450912406602,
+      1.0557695453869955,
+      0.7694482878138794,
+      0.5421499775672375,
+      0.3705476114244101,
+      0.24271371680673165,
+      0.155240444121858,
+      0.09544472237798884,
+      0.05698971867591635,
+      0.03286571752330993,
+      0.018262423728289068,
+      0.009691431393390104,
+      0.004822290161067459,
+      0.00218920471469155,
+      8.790634766955874E-4,
+      3.04504022174731E-4,
+      8.463313324675068E-5,
+      1.7863015690533797E-5,
+      2.7991384837637937E-6,
+      3.013028621585244E-7
     ]
   },
   "SA5P0": {
@@ -161,21 +161,21 @@
       0.7929925155296614
     ],
     "ys": [
-      0.3743563237012538,
-      0.2683070239187083,
-      0.18680146590712338,
-      0.125867025047675,
-      0.08144980480785237,
-      0.050689251986068336,
-      0.029983268557567968,
-      0.016914064347652132,
-      0.009033002036013477,
-      0.004477239141872161,
-      0.0020197895020143894,
-      8.047433977280893E-4,
-      2.7109083388956843E-4,
-      7.577409257805477E-5,
-      1.5204642255166092E-5,
+      0.36102947849181455,
+      0.2602235936953246,
+      0.1813682956919268,
+      0.12154920793020506,
+      0.07771191093604424,
+      0.04757267919907394,
+      0.027673559180412886,
+      0.015439764583414365,
+      0.008237260858320387,
+      0.004123076384749882,
+      0.0018925655445114521,
+      7.694805952212941E-4,
+      2.643229532812583E-4,
+      7.50454267948338E-5,
+      1.5173624824634097E-5,
       2.0834669490803287E-6,
       1.2179452997819203E-7,
       1.6583407068056797E-9,
diff --git a/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json b/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json
index d42e2848e36c87824034f6b50ed3320a23fbe394..94e0b43c6c8b46eb0a14d3139996419e1a7bc4dd 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json
@@ -23,22 +23,22 @@
       1.6428726885203377
     ],
     "ys": [
-      0.7773363477181338,
-      0.6003840325958942,
-      0.45055098032683905,
-      0.3262528937674043,
-      0.2269614347990729,
-      0.15115041754251668,
-      0.09610152313700995,
-      0.05775237099873535,
-      0.03280148544350099,
-      0.0174489484607918,
-      0.008686801575601803,
-      0.00391819205935686,
-      0.0016202106347294348,
-      5.761432215081969E-4,
-      1.7147886181828977E-4,
-      3.930733643504221E-5,
+      0.7413454562537559,
+      0.5732103580051757,
+      0.4313341663150548,
+      0.3137677604396843,
+      0.2196438296606776,
+      0.14736045626560315,
+      0.09441420455672744,
+      0.05714504867071313,
+      0.032642875571851235,
+      0.017432420280676326,
+      0.008696567253520538,
+      0.003925046332241897,
+      0.0016226096562368657,
+      5.766518336814356E-4,
+      1.7154638244151171E-4,
+      3.9311542247349416E-5,
       6.153671546077199E-6,
       4.937329485744405E-7,
       1.4273015899612117E-8,
@@ -69,26 +69,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.9550587948539366,
-      0.7607079626104937,
-      0.5875165087949122,
-      0.4414444268506858,
-      0.3187770396058406,
-      0.2233481340289824,
-      0.15023731621676764,
-      0.09647689993888293,
-      0.059140877570135766,
-      0.03433144364079493,
-      0.01878340744994322,
-      0.009610357374287415,
-      0.004554898432719949,
-      0.0019696598942599585,
-      7.574636690845085E-4,
-      2.486091633904046E-4,
-      6.665082282288701E-5,
-      1.3516522756392186E-5,
+      0.9151178167044538,
+      0.7292609228954626,
+      0.5641256143179942,
+      0.42512551976104246,
+      0.3083842434128814,
+      0.21729871341672652,
+      0.14711458635245728,
+      0.09509476419933151,
+      0.058639065891087916,
+      0.034200226878707954,
+      0.018771088074701747,
+      0.009620443557942652,
+      0.004562166423754759,
+      0.0019724293713622473,
+      7.581718797045818E-4,
+      2.487299671874945E-4,
+      6.666411461981848E-5,
+      1.3516879455522539E-5,
       1.714509035399869E-6,
-      1.0436138874114598E-7
+      1.0436138874114596E-7
     ]
   },
   "SA1P0": {
@@ -115,21 +115,21 @@
       1.7119945007591926
     ],
     "ys": [
-      0.6303279044484461,
-      0.47140253760135636,
-      0.33955312733256793,
-      0.23359028528589149,
-      0.15307360339790496,
-      0.09366384250667532,
-      0.05445046109508423,
-      0.029426507354198585,
-      0.01493987060379095,
-      0.007063915898809767,
-      0.0030992499446853075,
-      0.0012486794584624082,
-      4.545983491944361E-4,
-      1.456377497174315E-4,
-      3.9537361410059104E-5,
+      0.578981911734087,
+      0.43079808370849015,
+      0.3093213263935183,
+      0.2127123682060868,
+      0.13982473642346568,
+      0.0861760087082051,
+      0.050650930016206186,
+      0.027767423910071865,
+      0.014320784377543826,
+      0.006874685878414836,
+      0.003054461936363804,
+      0.0012415003015853222,
+      4.539846275355528E-4,
+      1.4563429612514161E-4,
+      3.95373997059962E-5,
       8.687897425612776E-6,
       1.3269042742265163E-6,
       1.2619367548125488E-7,
@@ -161,18 +161,18 @@
       0.7929925155296614
     ],
     "ys": [
-      0.20234497756882108,
-      0.14032012807885652,
-      0.09209924841527953,
-      0.05699943985922447,
-      0.03301634712166945,
-      0.017962534116277122,
-      0.009036396321927025,
-      0.004206626817847342,
-      0.0017874421618739114,
-      6.752575716348747E-4,
-      2.230424682608342E-4,
-      6.266782923990367E-5,
+      0.16501818015733039,
+      0.1155472279111058,
+      0.07701915543381477,
+      0.04868645326458193,
+      0.028960705631143644,
+      0.016231681367287466,
+      0.008414537762243539,
+      0.004022015179846292,
+      0.001744571511526829,
+      6.682865525458333E-4,
+      2.2229431580430607E-4,
+      6.264645925779574E-5,
       1.4393259611992817E-5,
       2.7373717183159915E-6,
       3.724995664757733E-7,
diff --git a/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json b/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json
index f58979a0d38d432c35cf98fd96a418db07861896..c4016c51a676a0b35ede6a036414e1cef0ecf895 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json
@@ -23,26 +23,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.44739800710395544,
-      0.33196185479930534,
-      0.23334698129423287,
-      0.1538626212119859,
-      0.0942391995250784,
-      0.05314474945373546,
-      0.027521014724691668,
-      0.012999598323445903,
-      0.005691328688626938,
-      0.002362076124921025,
-      9.773638767789973E-4,
-      4.0366859421564943E-4,
-      1.694791920725093E-4,
-      6.539278295747254E-5,
+      0.4451601238441924,
+      0.33134428409116934,
+      0.2334776751447411,
+      0.15421447737795002,
+      0.09455558795897556,
+      0.05335022176632333,
+      0.027628606192763933,
+      0.013045765320286423,
+      0.005707642075211248,
+      0.0023666970299469512,
+      9.783768295037226E-4,
+      4.0381529676539955E-4,
+      1.694908544017202E-4,
+      6.539298470249424E-5,
       2.1894897377050026E-5,
       5.854897732511005E-6,
       1.1481806468811457E-6,
       1.3857130577662447E-7,
       7.674264133978933E-9,
-      4.082286883282843E-12
+      4.082286883282842E-12
     ]
   },
   "SA0P2": {
@@ -69,25 +69,25 @@
       1.998773638612381
     ],
     "ys": [
-      0.5412927190961767,
-      0.4217538249311484,
-      0.31141040387934493,
-      0.218164511697433,
-      0.14229419101956967,
-      0.08707148594959255,
-      0.04911558084188856,
-      0.02537667663849169,
-      0.01214402410589105,
-      0.005447150825642762,
-      0.0023673368054522,
-      0.001030851807066269,
-      4.542778712691582E-4,
-      1.9831822940340378E-4,
-      8.14475060518514E-5,
+      0.5376902930539541,
+      0.42023941940496373,
+      0.31107129878060413,
+      0.21834449519454932,
+      0.14260900039918425,
+      0.08733797221126804,
+      0.0492861476896946,
+      0.025465606210232774,
+      0.012182733550837859,
+      0.005461083011974774,
+      0.0023714077862097647,
+      0.0010317737484768152,
+      4.544251755665165E-4,
+      1.983314213392452E-4,
+      8.144782713567071E-5,
       2.9514021319872702E-5,
       8.988357941346196E-6,
       2.163646785544322E-6,
-      3.6621414692757996E-7,
+      3.662141469275799E-7,
       3.63015145137678E-8
     ]
   },
@@ -115,20 +115,20 @@
       1.7119945007591926
     ],
     "ys": [
-      0.3776630573027078,
-      0.27749246364092756,
-      0.1947965629495508,
-      0.1287631408254406,
-      0.0793016390045022,
-      0.04411765453022639,
-      0.022532654125961622,
-      0.010286487228242205,
-      0.004273812500714076,
-      0.0016208977866554034,
-      5.776426645577924E-4,
-      1.9872861857138076E-4,
-      6.823005284740019E-5,
-      2.3251769378972825E-5,
+      0.36685267258663784,
+      0.2716012407420742,
+      0.19206099056752104,
+      0.1277834194370568,
+      0.07911648712391599,
+      0.04419876884129993,
+      0.022640269603313473,
+      0.010354521480761776,
+      0.004304780500404212,
+      0.0016316526941955877,
+      5.804422104700494E-4,
+      1.9923132944414413E-4,
+      6.828237000985974E-5,
+      2.325348390754156E-5,
       7.514188693753363E-6,
       2.1213215816591875E-6,
       4.5544638086643076E-7,
@@ -161,18 +161,18 @@
       0.7929925155296614
     ],
     "ys": [
-      0.13711213933119312,
-      0.09426214514784478,
-      0.060747150151760035,
-      0.03656651350761967,
-      0.020378463613699962,
-      0.010504825437473313,
-      0.004888037130827023,
-      0.002044506147590009,
-      7.562728552245487E-4,
-      2.4308078953655876E-4,
-      6.901714663477101E-5,
-      1.8223732019732375E-5,
+      0.12704790283547693,
+      0.0894502950119163,
+      0.05877850314400082,
+      0.03591454797163728,
+      0.020230255211990594,
+      0.010498178151441294,
+      0.004901650685990384,
+      0.0020522144708843486,
+      7.587217567106908E-4,
+      2.4357587696500409E-4,
+      6.907692885262202E-5,
+      1.8225569153113977E-5,
       4.897967342053475E-6,
       1.3783636623081346E-6,
       3.190626395541543E-7,
diff --git a/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json b/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json
index 48b3e0f50327521cd5e6680d5bf7febf56a6e965..c7a307d844ec0da9e26be4ed8b0f507fd2090adc 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json
@@ -23,26 +23,26 @@
       1.6428726885203377
     ],
     "ys": [
-      1.7539168552957063,
-      1.2771547077611043,
-      0.9006011391115294,
-      0.6166399166916504,
-      0.4133923857372829,
-      0.2737719087729423,
-      0.18041675013452887,
-      0.11820337873805294,
-      0.0773569158534343,
-      0.05007822693923032,
-      0.0316944941484999,
-      0.018992940190418403,
-      0.010840370957037467,
-      0.005693614175017112,
-      0.002725215870003345,
-      0.0011441794011480383,
-      4.071493331280477E-4,
-      1.1671697539151646E-4,
-      2.5475347189104065E-5,
-      3.6126001839969187E-6
+      1.7424224876405945,
+      1.2715230563980773,
+      0.898197142039649,
+      0.6149857497906484,
+      0.4105782981140706,
+      0.26879806250109733,
+      0.17322428367689563,
+      0.10943194740519559,
+      0.06806993987057035,
+      0.041398946515659216,
+      0.024502641540689204,
+      0.013783224447331367,
+      0.007537677568137644,
+      0.003913378943125446,
+      0.0019124157792771276,
+      8.395317832912123E-4,
+      3.1685947781360065E-4,
+      9.726483534610771E-5,
+      2.2771708300085948E-5,
+      3.4710751417204553E-6
     ]
   },
   "SA0P2": {
@@ -69,26 +69,26 @@
       1.998773638612381
     ],
     "ys": [
-      2.2773638630816997,
-      1.7376099749687057,
-      1.2731754122119532,
-      0.90450442422708,
-      0.6201089089233712,
-      0.41967953242493283,
-      0.2801155148896824,
-      0.18510978758895058,
-      0.12199243087631684,
-      0.07992511075084574,
-      0.051724936367726564,
-      0.03254620926247212,
-      0.01955908099515115,
-      0.01107114916033017,
-      0.005837932622178771,
-      0.0028189959542069777,
-      0.0012282929657390807,
-      4.722118276095392E-4,
-      1.5374544872757655E-4,
-      4.070995698337155E-5
+      2.2621100099359106,
+      1.7288994579291828,
+      1.268844432654749,
+      0.902212180973359,
+      0.6178076081838898,
+      0.4159436428495113,
+      0.27434011028902555,
+      0.17745577239578467,
+      0.11320569950957826,
+      0.07101616201054373,
+      0.04367826438287917,
+      0.02606840223916125,
+      0.014935479132496607,
+      0.008169645492984523,
+      0.004252851054878925,
+      0.0020757158756674276,
+      9.321190796554619E-4,
+      3.7404706329642465E-4,
+      1.279419498874282E-4,
+      3.5697362822065774E-5
     ]
   },
   "SA1P0": {
@@ -115,25 +115,25 @@
       1.7119945007591926
     ],
     "ys": [
-      1.3701794674919505,
-      0.9670615239471806,
-      0.6650128923278658,
-      0.4477538795980312,
-      0.29836104135764735,
-      0.19533325315683017,
-      0.1282368428974874,
-      0.08278943009244252,
-      0.0524463276587141,
-      0.03195289571139475,
-      0.018462683424597212,
-      0.009996352479757975,
-      0.005007730845776507,
-      0.0022792779297490895,
-      9.217133523627738E-4,
-      3.2515464946741715E-4,
-      9.394380975728929E-5,
-      2.1190014820001016E-5,
-      3.484520277155361E-6,
+      1.3412821587988961,
+      0.9482171087330228,
+      0.6535202119718609,
+      0.4404689073582168,
+      0.29239669352060965,
+      0.18879046141994202,
+      0.12054443952505643,
+      0.07447255422294183,
+      0.04459986244327047,
+      0.025568165708542097,
+      0.014002320387368374,
+      0.007334863120269536,
+      0.003662012959499224,
+      0.0017100563414546497,
+      7.249953965559676E-4,
+      2.713472693518485E-4,
+      8.372282916598866E-5,
+      2.0026903228588352E-5,
+      3.44120542708863E-6,
       4.559925657574019E-7
     ]
   },
@@ -161,22 +161,22 @@
       0.7929925155296614
     ],
     "ys": [
-      0.33966773124927746,
-      0.24059339208417826,
-      0.16776744586534828,
-      0.11484372092101569,
-      0.07627968876475939,
-      0.04876729901156463,
-      0.02938239018929548,
-      0.016655276358749364,
-      0.008835955948880297,
-      0.0043224268250552905,
-      0.0019176398520676346,
-      7.50212379187797E-4,
-      2.463028185638768E-4,
-      6.60115283969021E-5,
-      1.1908279342082692E-5,
-      1.2870098414063422E-6,
+      0.3163959142439965,
+      0.2256040345089443,
+      0.15735984113010995,
+      0.1066146620253896,
+      0.06923838085756955,
+      0.042858458973674525,
+      0.024879814967457992,
+      0.01364461389582481,
+      0.007103909132275225,
+      0.003485068232260372,
+      0.0015843722394303036,
+      6.442594473747591E-4,
+      2.213796958893642E-4,
+      6.214161871224039E-5,
+      1.165333415465413E-5,
+      1.2870098414063424E-6,
       3.103489305140823E-8,
       1.6551032765075596E-12,
       0.0,
diff --git a/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json b/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json
index 853e1dde8b81e9682d7b2c493cf07215a3abfc00..015fbe54b8dbb4ee9c534f301e9d6148c845e0af 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json
@@ -23,26 +23,26 @@
       1.6428726885203377
     ],
     "ys": [
-      1.13612812490378,
-      0.8634258320708791,
-      0.6364698895061537,
-      0.45277092437546257,
-      0.3117934619567573,
-      0.2093567313279522,
-      0.13823886758497494,
-      0.08990014681820703,
-      0.05808763086710577,
-      0.03723828601027987,
-      0.023672902384353846,
-      0.014530124098875444,
-      0.00859871498492178,
-      0.004701227460019762,
-      0.0023445722791201992,
-      0.001030009314187364,
-      3.880155039964674E-4,
-      1.2030800910213905E-4,
-      2.9730431311127667E-5,
-      4.964851901415382E-6
+      1.1531683653098985,
+      0.882688762866454,
+      0.6557400012179911,
+      0.46975035414954885,
+      0.3246026532477518,
+      0.21702200199990263,
+      0.14085713404749925,
+      0.08839817263935114,
+      0.05395497070299413,
+      0.032037040153066215,
+      0.018700259039575572,
+      0.010616244300270836,
+      0.005986552863078212,
+      0.003241218954560459,
+      0.0016594863106489505,
+      7.672476428304222E-4,
+      3.084458299056743E-4,
+      1.0277009123418002E-4,
+      2.7235092700884325E-5,
+      4.830966416679418E-6
     ]
   },
   "SA0P2": {
@@ -69,26 +69,26 @@
       1.998773638612381
     ],
     "ys": [
-      1.4165029012967847,
-      1.103623895860091,
-      0.8327337626254228,
-      0.6106818097356347,
-      0.43125464886569254,
-      0.2984691201333978,
-      0.20194133640489634,
-      0.13396951775896548,
-      0.08779204712814682,
-      0.05681028045414311,
-      0.03634547715991093,
-      0.022880433521435452,
-      0.014025753870832307,
-      0.008237909470217934,
-      0.0045469031945372445,
-      0.0023053508790117144,
-      0.0010568061417254037,
-      4.295210459453282E-4,
-      1.5012263320190344E-4,
-      4.367914305900831E-5
+      1.4316716321243992,
+      1.1216317431413063,
+      0.8517875265835035,
+      0.6287317366976839,
+      0.44630038443348535,
+      0.309177373675295,
+      0.20777427677053265,
+      0.1352670981585789,
+      0.08563067577323663,
+      0.05258876881214441,
+      0.03145292193161046,
+      0.018396928568953634,
+      0.010567037521396481,
+      0.005952423979935137,
+      0.0032503919409542837,
+      0.0016787344384291243,
+      8.004514298637626E-4,
+      3.4238671686558347E-4,
+      1.266163222360059E-4,
+      3.89978750710098E-5
     ]
   },
   "SA1P0": {
@@ -115,25 +115,25 @@
       1.7119945007591926
     ],
     "ys": [
-      1.006534481140087,
-      0.7550451246273431,
-      0.5462617606792711,
-      0.37828738937983447,
-      0.25155705026574776,
-      0.15954786002686006,
-      0.099663904439175,
-      0.061065439499448516,
-      0.03730622208949512,
-      0.022492325168624996,
-      0.013193730639039976,
-      0.0073921974541036745,
-      0.003877912545537198,
-      0.0018628826394743332,
-      7.991185330105418E-4,
-      3.0064756442050184E-4,
-      9.405414536145298E-5,
-      2.3919112611967832E-5,
-      4.347770805088602E-6,
+      1.0138377442927295,
+      0.7671148729425643,
+      0.5607013179479812,
+      0.39229156291115386,
+      0.26260656088635315,
+      0.16600706661345266,
+      0.10149252219067308,
+      0.05930371103404216,
+      0.033698645803257696,
+      0.018642433841580073,
+      0.010114704270315144,
+      0.005404249448049615,
+      0.002819817613229076,
+      0.0013986844116130278,
+      6.340277977176126E-4,
+      2.543555702450956E-4,
+      8.504670175714209E-5,
+      2.2876479733891083E-5,
+      4.307422586780544E-6,
       6.504792547924437E-7
     ]
   },
@@ -161,24 +161,24 @@
       0.7929925155296614
     ],
     "ys": [
-      0.33076083180119564,
-      0.2352499440080847,
-      0.1603465698610067,
-      0.10483469308040093,
-      0.06551041453631141,
-      0.03937101794461602,
-      0.022596837072806887,
-      0.012500145909930111,
-      0.006649031652235888,
-      0.0033460293439095054,
-      0.0015595102576016848,
-      6.49465712841082E-4,
-      2.2955602096397197E-4,
-      6.743345969174902E-5,
-      1.4107940103572502E-5,
-      1.7831017390912254E-6,
+      0.3367028815751903,
+      0.24285528868122067,
+      0.1666463210597857,
+      0.10834581694320608,
+      0.06620497918711363,
+      0.03820390590815863,
+      0.020733001787451286,
+      0.010810828877526468,
+      0.00550121748984928,
+      0.0027298079815522014,
+      0.001295941862017259,
+      5.610759178247993E-4,
+      2.0784401565292367E-4,
+      6.39427218673884E-5,
+      1.3875018456783492E-5,
+      1.7831073374631758E-6,
       6.069083084964396E-8,
-      2.645622377055003E-12,
+      2.6456223770550025E-12,
       0.0,
       0.0
     ]
diff --git a/src/test/resources/e2e/nshm-prvi-2025/SAN_JUAN_PR.json b/src/test/resources/e2e/nshm-prvi-2025/SAN_JUAN_PR.json
index d63ce6356b15ed9408c18554e7ffff877c90666f..1b6d29ea3a794c0526eaf7bcd0c9d2abf2b77a21 100644
--- a/src/test/resources/e2e/nshm-prvi-2025/SAN_JUAN_PR.json
+++ b/src/test/resources/e2e/nshm-prvi-2025/SAN_JUAN_PR.json
@@ -23,26 +23,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.9100967755453667,
-      0.6755274996128332,
-      0.48391394764970497,
-      0.33247900600281405,
-      0.21847393366483714,
-      0.13701006884893108,
-      0.08192036352296404,
-      0.04638867539774388,
-      0.025092700568478263,
-      0.012984711288360162,
-      0.006488967272432372,
-      0.0030588603016201725,
-      0.0013860628495818656,
-      5.777256943832912E-4,
-      2.2125049276964896E-4,
-      7.525366557631453E-5,
-      2.233206747375521E-5,
-      5.665265525323787E-6,
-      1.2511450837221482E-6,
-      2.2694333578329093E-7
+      1.012403345498766,
+      0.7496807002765421,
+      0.5321342419706432,
+      0.35929534733455,
+      0.2297535786377085,
+      0.13894841228320842,
+      0.07980977410257689,
+      0.043568927726170895,
+      0.022925489703938408,
+      0.0115996366667207,
+      0.005621437746770678,
+      0.002495425982859972,
+      0.0010168776368162714,
+      3.589928354975165E-4,
+      1.1138032854605583E-4,
+      3.0850049079625486E-5,
+      8.090391026315872E-6,
+      2.0107436173364324E-6,
+      4.461946201922317E-7,
+      7.344499151483148E-8
     ]
   },
   "SA0P2": {
@@ -69,26 +69,26 @@
       1.998773638612381
     ],
     "ys": [
-      1.2044030615681947,
-      0.9353809555197352,
-      0.6987596147727709,
-      0.5036919712952665,
-      0.34581153237686235,
-      0.2290210000244498,
-      0.14479574186239821,
-      0.08703521722850752,
-      0.04995882984713672,
-      0.027343448068674052,
-      0.014333422756536356,
-      0.0072022103891063545,
-      0.003460843947170409,
-      0.0015786307667305538,
-      6.757205425854971E-4,
-      2.670580103920038E-4,
-      9.694382392879655E-5,
-      3.212925557009286E-5,
-      9.655377887072045E-6,
-      2.6672115271474727E-6
+      1.368941049667723,
+      1.071578921711665,
+      0.8035105611339395,
+      0.5783626406259136,
+      0.3936762691070828,
+      0.2560237339628529,
+      0.15720752247391395,
+      0.0910872128877078,
+      0.05043849513373243,
+      0.02680094882163691,
+      0.013698243598625075,
+      0.006665716473773451,
+      0.0030289764168966895,
+      0.0012511311729470765,
+      4.5784483320284635E-4,
+      1.477703296129754E-4,
+      4.45064029700006E-5,
+      1.3356141413911851E-5,
+      3.923568710652895E-6,
+      1.0472748247692665E-6
     ]
   },
   "SA1P0": {
@@ -115,26 +115,26 @@
       1.7119945007591926
     ],
     "ys": [
-      0.5707865995826802,
-      0.39160408417702025,
-      0.2584721260403715,
-      0.1634393585817664,
-      0.09906806475299583,
-      0.056297616824740083,
-      0.030616252824421396,
-      0.015598819665575634,
-      0.007585300280481742,
-      0.003519850168660882,
-      0.0015681115877464876,
-      6.689038891857706E-4,
-      2.6997170365564534E-4,
-      1.0115570319269991E-4,
-      3.444240726350007E-5,
-      1.0488009472318914E-5,
-      2.713561955997951E-6,
-      6.007236750665009E-7,
-      1.0542300000673484E-7,
-      1.4596860967124675E-8
+      0.6124290481703737,
+      0.4105185318748162,
+      0.2623884234087815,
+      0.15878097470159133,
+      0.09084578859880649,
+      0.04814140704288673,
+      0.02452373194715147,
+      0.011948589588494665,
+      0.0057331670088175204,
+      0.002682563013476732,
+      0.0012026507901890405,
+      5.040051835646538E-4,
+      1.9432332879322365E-4,
+      6.894619613153587E-5,
+      2.273059558653607E-5,
+      7.0499185451291055E-6,
+      1.9511256017352223E-6,
+      4.789693318289788E-7,
+      1.022777549876472E-7,
+      1.928757096377857E-8
     ]
   },
   "SA5P0": {
@@ -161,24 +161,24 @@
       0.7929925155296614
     ],
     "ys": [
-      0.09779696897375159,
-      0.06344670726958232,
-      0.039266461071760905,
-      0.022993884911884054,
-      0.0126222483851046,
-      0.006547968906671401,
-      0.0031880369656747927,
-      0.0014774831075764709,
-      6.498382192141003E-4,
-      2.672601720864216E-4,
-      1.0152584853169425E-4,
-      3.471390626754962E-5,
-      1.0204558413992004E-5,
-      2.536787140369459E-6,
-      4.6234028087528965E-7,
-      4.958499084937277E-8,
-      9.175588344297641E-10,
-      1.5973820383963869E-12,
+      0.11785427262244752,
+      0.07499103342622812,
+      0.045060559661146624,
+      0.02543939193418698,
+      0.013463712156139774,
+      0.006806361927051139,
+      0.003288535118366801,
+      0.001535660380521615,
+      6.793188976176056E-4,
+      2.7319624562436955E-4,
+      9.663253249160884E-5,
+      2.905269648551138E-5,
+      7.030092041815457E-6,
+      1.3458372606552684E-6,
+      1.8148868012340965E-7,
+      5.433174449806984E-9,
+      6.2923726091665365E-12,
+      0.0,
       0.0,
       0.0
     ]