diff --git a/sky130/Makefile.in b/sky130/Makefile.in
index 38d000f..7870243 100644
--- a/sky130/Makefile.in
+++ b/sky130/Makefile.in
@@ -471,6 +471,10 @@
 		-gds %l/gds/*.gds \
 		-lef %l/lef/*.lef compile-only rename=sky130_ef_io \
 		-library general sky130_fd_io |& tee -a ${SKY130A}_install.log
+	# Add a maskhint set for the GPIO pad .mag view to prevent problems writing
+	# when writing HVI to GDS during hierarchical adjustments.
+	${ADDPROP} ${STAGING_PATH}/${SKY130A} sky130_fd_io sky130_fd_io__top_gpiov2 \
+		"MASKHINTS_HVI 1346 17198 5828 19224 13700 1890 15920 2360 24 17522 1778 20612" -mag
 	# Install SkyWater I/O pad library
 	${STAGE} -source ${SKYWATER_PATH} -target ${STAGING_PATH}/${SKY130A} \
 		-spice %l/latest/cells/*/*.spice compile-only \
diff --git a/sky130/magic/sky130.tech b/sky130/magic/sky130.tech
index de7b737..2dc5417 100644
--- a/sky130/magic/sky130.tech
+++ b/sky130/magic/sky130.tech
@@ -23,7 +23,7 @@
 version
  version REVISION
  description "SkyWater SKY130: Open Source rules and DRC"
- requires magic-8.3.107
+ requires magic-8.3.111
 end
 
 #------------------------------------------------------------------------
@@ -722,16 +722,6 @@
  layer 	BOUND CELLBOUND
 	calma 235 4
 
-# Create a boundary outside of an abutment box, so that layers
-# can be made to stretch to the abutment box edges.  First strink
-# so that any box that would be so small as to interact with
-# itself will be removed.
-
- templayer CELLRING CELLBOUND
-	shrink 345
-	grow 545
-	and-not CELLBOUND
-
 #----------------------------------------------------------------
 # DNWELL
 #----------------------------------------------------------------
@@ -812,10 +802,9 @@
 	bloat-or allnactivetap * 125 allpactivenontap 0
 	bloat-or allnactivenontap * 125 allpactivetap 0
 
- templayer extendPSDM  basePSDM,CELLRING
+ templayer extendPSDM  basePSDM
 	bridge	380 380
 	and-not baseNSDM
-	and-not	CELLRING
 
  layer PSDM basePSDM,extendPSDM 
 	grow	185
@@ -824,10 +813,9 @@
 	mask-hints PSDM
 	calma	94 20
 
- templayer extendNSDM  baseNSDM,CELLRING
+ templayer extendNSDM  baseNSDM
 	bridge	380 380
 	and-not basePSDM
-	and-not	CELLRING
 
  layer NSDM baseNSDM,extendNSDM
 	grow	185
@@ -1023,17 +1011,10 @@
 	# (HVI min width rule is 0.6 but CNTM min width rule is 0.84um)
 	grow-min 840
 
- templayer baseHVI 	thkox_area,small_ptap_mv
+ layer HVI 	thkox_area,small_ptap_mv
 	bridge	700 600
  	grow 	345
  	shrink 	345
-
- templayer extendHVI	baseHVI,CELLRING
- 	grow 	345
- 	shrink 	345
-	and-not	CELLRING
-
- layer HVI	baseHVI,extendHVI
 	mask-hints HVI
  	calma 	75 20