diff --git a/cells/tap/sky130_fd_sc_hs__tap_1.lef b/cells/tap/sky130_fd_sc_hs__tap_1.lef
index 6b671a0..9fa39ec 100644
--- a/cells/tap/sky130_fd_sc_hs__tap_1.lef
+++ b/cells/tap/sky130_fd_sc_hs__tap_1.lef
@@ -19,7 +19,7 @@
 BUSBITCHARS "[]" ;
 DIVIDERCHAR "/" ;
 MACRO sky130_fd_sc_hs__tap_1
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   SOURCE USER ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.480000 BY  3.330000 ;
diff --git a/cells/tap/sky130_fd_sc_hs__tap_1.magic.lef b/cells/tap/sky130_fd_sc_hs__tap_1.magic.lef
index dd828e1..4b8d7ac 100644
--- a/cells/tap/sky130_fd_sc_hs__tap_1.magic.lef
+++ b/cells/tap/sky130_fd_sc_hs__tap_1.magic.lef
@@ -23,7 +23,7 @@
   DATABASE MICRONS 200 ;
 END UNITS
 MACRO sky130_fd_sc_hs__tap_1
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hs__tap_1 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.480000 BY  3.330000 ;
diff --git a/cells/tap/sky130_fd_sc_hs__tap_2.lef b/cells/tap/sky130_fd_sc_hs__tap_2.lef
index 46ef8eb..84fa12c 100644
--- a/cells/tap/sky130_fd_sc_hs__tap_2.lef
+++ b/cells/tap/sky130_fd_sc_hs__tap_2.lef
@@ -19,7 +19,7 @@
 BUSBITCHARS "[]" ;
 DIVIDERCHAR "/" ;
 MACRO sky130_fd_sc_hs__tap_2
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   SOURCE USER ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.960000 BY  3.330000 ;
diff --git a/cells/tap/sky130_fd_sc_hs__tap_2.magic.lef b/cells/tap/sky130_fd_sc_hs__tap_2.magic.lef
index 8c36970..03f0590 100644
--- a/cells/tap/sky130_fd_sc_hs__tap_2.magic.lef
+++ b/cells/tap/sky130_fd_sc_hs__tap_2.magic.lef
@@ -23,7 +23,7 @@
   DATABASE MICRONS 200 ;
 END UNITS
 MACRO sky130_fd_sc_hs__tap_2
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hs__tap_2 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.960000 BY  3.330000 ;
diff --git a/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.lef b/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.lef
index 2caff48..9e8c769 100644
--- a/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.lef
+++ b/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.lef
@@ -19,7 +19,7 @@
 BUSBITCHARS "[]" ;
 DIVIDERCHAR "/" ;
 MACRO sky130_fd_sc_hs__tapmet1_2
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   SOURCE USER ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.960000 BY  3.330000 ;
diff --git a/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.magic.lef b/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.magic.lef
index 713ae68..8d67e68 100644
--- a/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.magic.lef
+++ b/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.magic.lef
@@ -23,7 +23,7 @@
   DATABASE MICRONS 200 ;
 END UNITS
 MACRO sky130_fd_sc_hs__tapmet1_2
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hs__tapmet1_2 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.960000 BY  3.330000 ;
diff --git a/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.lef b/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.lef
index 641adbc..3289534 100644
--- a/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.lef
+++ b/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.lef
@@ -19,7 +19,7 @@
 BUSBITCHARS "[]" ;
 DIVIDERCHAR "/" ;
 MACRO sky130_fd_sc_hs__tapvgnd_1
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   SOURCE USER ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.480000 BY  3.330000 ;
diff --git a/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.magic.lef b/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.magic.lef
index 666ba77..b8358dd 100644
--- a/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.magic.lef
+++ b/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.magic.lef
@@ -23,7 +23,7 @@
   DATABASE MICRONS 200 ;
 END UNITS
 MACRO sky130_fd_sc_hs__tapvgnd_1
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hs__tapvgnd_1 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.480000 BY  3.330000 ;
diff --git a/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.lef b/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.lef
index 3490761..e27468b 100644
--- a/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.lef
+++ b/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.lef
@@ -19,7 +19,7 @@
 BUSBITCHARS "[]" ;
 DIVIDERCHAR "/" ;
 MACRO sky130_fd_sc_hs__tapvgnd2_1
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   SOURCE USER ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.480000 BY  3.330000 ;
diff --git a/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.magic.lef b/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.magic.lef
index 4b5aedb..7e2698b 100644
--- a/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.magic.lef
+++ b/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.magic.lef
@@ -23,7 +23,7 @@
   DATABASE MICRONS 200 ;
 END UNITS
 MACRO sky130_fd_sc_hs__tapvgnd2_1
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hs__tapvgnd2_1 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.480000 BY  3.330000 ;
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.lef b/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.lef
index 022ff1f..99ed836 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.lef
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.lef
@@ -19,7 +19,7 @@
 BUSBITCHARS "[]" ;
 DIVIDERCHAR "/" ;
 MACRO sky130_fd_sc_hs__tapvpwrvgnd_1
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   SOURCE USER ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.480000 BY  3.330000 ;
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.magic.lef b/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.magic.lef
index c315114..d317769 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.magic.lef
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.magic.lef
@@ -23,7 +23,7 @@
   DATABASE MICRONS 200 ;
 END UNITS
 MACRO sky130_fd_sc_hs__tapvpwrvgnd_1
-  CLASS CORE ;
+  CLASS CORE WELLTAP ;
   FOREIGN sky130_fd_sc_hs__tapvpwrvgnd_1 ;
   ORIGIN  0.000000  0.000000 ;
   SIZE  0.480000 BY  3.330000 ;