diff --git a/VERSION b/VERSION
index fc4d3ab..04e9b00 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.559
+1.0.561
diff --git a/gf180mcu/gf180mcu.json b/gf180mcu/gf180mcu.json
index d8c07ce..13fcce1 100644
--- a/gf180mcu/gf180mcu.json
+++ b/gf180mcu/gf180mcu.json
@@ -95,8 +95,8 @@
         "magic": "MAGIC_COMMIT"
     },
     "reference": {
-        "open_pdks": "0da75e73164cb90ca1eb1cab4803922e384e2b9d",
-        "magic": "c87e5baff4df799bec95f05406f7e97ab67e2c4f",
+        "open_pdks": "486fb8633c3d95ae475a5ccd68d0066c25919bb5",
+        "magic": "441d93314836f2443e9d5786912b6f3e2a2a705a",
         "gf180mcu_pdk": "a897aa30369d3bcec87d9d50ce9b01f320f854ef",
         "gf180mcu_fd_pr": "739f508876db86bd7d3403f1fe056dedfeaabdab",
         "gf180mcu_fd_pv": "50cc2fe338c81925e24a6ac4907ddaab534c1312",
@@ -105,9 +105,9 @@
         "gf180mcu_fd_sc_mcu9t5v0": "e0e80f5a6522f10b82165d3aeab9b8ee28e89849",
         "gf180mcu_fd_ip_sram": "9c411928870ce15226228fa52ddb6ecc0ea4ffbe",
         "gf180mcu_as_sc_mcu7t3v3": "51f4e2a6d9692f3f8982dffaf7c012272a4b4ca3",
-        "gf180mcu_ocd_io": "289e06e35aea55761b998cb6d13f7e70694f05fe",
+        "gf180mcu_ocd_io": "b1c2327a23cd0b08a76a0ce9234c36799bd0ec98",
         "gf180mcu_ocd_alpha": "076bab7ac11118e1aa810ccf75e5c297b5501fcc",
-        "gf180mcu_ocd_ip_sram": "94c94dc6bad6140c22ff00bdd4f92266db432343",
+        "gf180mcu_ocd_ip_sram": "f91d74cc332f2947b7da10c96baab1b41d8529ae",
         "gf180mcu_osu_sc_gf12t3v3": "aa2fa8cd1bcb8fe98669acd05c0b0c65879268b3",
         "gf180mcu_osu_sc_gf9t3v3": "aa2fa8cd1bcb8fe98669acd05c0b0c65879268b3"
     }
diff --git a/gf180mcu/magic/gf180mcu.tech b/gf180mcu/magic/gf180mcu.tech
index 4553062..e0b5df0 100644
--- a/gf180mcu/magic/gf180mcu.tech
+++ b/gf180mcu/magic/gf180mcu.tech
@@ -654,8 +654,8 @@
   compose srampfet poly srampdiff
   compose sramnfet poly sramndiff
 
+  decompose hvpfet poly mvpdiff
   decompose hvnfet poly mvndiff
-  decompose hvpfet poly mvndiff
   
 #ifdef MIM
 #ifdef METALS3
@@ -2203,6 +2203,17 @@
  and SBLK
  and DUALGATE
 
+ layer hvnfet DIFF
+ and POLY
+ and-not PPLUS
+ and NPLUS
+ and-not NAT
+ and-not nwelldef
+ and DUALGATE
+ and-not MOSCAP
+ and-not FET5VDEF
+ and-not sramexpand
+
  layer mvnfet DIFF
  and POLY
  and-not PPLUS
@@ -2211,6 +2222,7 @@
  and-not nwelldef
  and DUALGATE
  and-not MOSCAP
+ and FET5VDEF
  and-not sramexpand
 
  layer srammvnfet DIFF
diff --git a/sky130/sky130.json b/sky130/sky130.json
index 78c9de0..d8873c5 100644
--- a/sky130/sky130.json
+++ b/sky130/sky130.json
@@ -94,8 +94,8 @@
         "magic": "MAGIC_COMMIT"
     },
     "reference": {
-        "open_pdks": "0da75e73164cb90ca1eb1cab4803922e384e2b9d",
-        "magic": "c87e5baff4df799bec95f05406f7e97ab67e2c4f",
+        "open_pdks": "486fb8633c3d95ae475a5ccd68d0066c25919bb5",
+        "magic": "441d93314836f2443e9d5786912b6f3e2a2a705a",
         "sky130_fd_pr": "c996d0e7417d7574714079050e2768da70f7fdca",
         "sky130_fd_io": "e60737bf624df95c211fe99c007ddec78e3e081d",
         "sky130_fd_sc_hs": "c4cfcd760f1964f1670a1ed99c71c7c12b7ad49f",