diff --git a/gf180mcu/Makefile.in b/gf180mcu/Makefile.in
index 04fbb94..1ab2565 100644
--- a/gf180mcu/Makefile.in
+++ b/gf180mcu/Makefile.in
@@ -869,19 +869,17 @@
 	./custom/scripts/fix_xschemrc.py ${XSCHEM_STAGING_$*}/xschemrc \
 		${GF180MCU$*} 2>&1 | tee -a ${GF180MCU$*}_make.log || true
 
-librelane-%: librelane/config.tcl librelane/gf180mcu_fd_sc_mcu7t5v0/config.tcl librelane/gf180mcu_fd_sc_mcu9t5v0/config.tcl librelane/gf180mcu_as_sc_mcu7t3v3/config.tcl librelane/gf180mcu_osu_sc_gp9t3v3/config.tcl librelane/gf180mcu_osu_sc_gp12t3v3/config.tcl librelane/gf180mcu_fd_io/config.tcl librelane/gf180mcu_ocd_io/config.tcl
+librelane-%: librelane/config.tcl librelane/gf180mcu_fd_sc_mcu7t5v0/config.tcl librelane/gf180mcu_fd_sc_mcu9t5v0/config.tcl librelane/gf180mcu_osu_sc_gp9t3v3/config.tcl librelane/gf180mcu_osu_sc_gp12t3v3/config.tcl librelane/gf180mcu_fd_io/config.tcl librelane/gf180mcu_ocd_io/config.tcl
 	mkdir -p ${LIBRELANETOP_STAGING_$*}
 	mkdir -p ${LIBRELANE_STAGING_$*}
 	rm -rf ${LIBRELANE_STAGING_$*}/gf180mcu_fd_sc_mcu7t5v0
 	rm -rf ${LIBRELANE_STAGING_$*}/gf180mcu_fd_sc_mcu9t5v0
-	rm -rf ${LIBRELANE_STAGING_$*}/gf180mcu_as_sc_mcu7t3v3
 	rm -rf ${LIBRELANE_STAGING_$*}/gf180mcu_osu_sc_gp9t3v3
 	rm -rf ${LIBRELANE_STAGING_$*}/gf180mcu_osu_sc_gp12t3v3
 	rm -rf ${LIBRELANE_STAGING_$*}/gf180mcu_fd_io
 	rm -rf ${LIBRELANE_STAGING_$*}/gf180mcu_ocd_io
 	mkdir ${LIBRELANE_STAGING_$*}/gf180mcu_fd_sc_mcu7t5v0
 	mkdir ${LIBRELANE_STAGING_$*}/gf180mcu_fd_sc_mcu9t5v0
-	mkdir ${LIBRELANE_STAGING_$*}/gf180mcu_as_sc_mcu7t3v3
 	mkdir ${LIBRELANE_STAGING_$*}/gf180mcu_osu_sc_gp9t3v3
 	mkdir ${LIBRELANE_STAGING_$*}/gf180mcu_osu_sc_gp12t3v3
 	mkdir ${LIBRELANE_STAGING_$*}/gf180mcu_fd_io
@@ -893,9 +891,6 @@
 		rm -f ${LIBRELANE_STAGING_$*}/gf180mcu_fd_sc_mcu9t5v0/$$file ; \
 	done
 	for file in ${LIBRELANE_COMMON} ; do \
-		rm -f ${LIBRELANE_STAGING_$*}/gf180mcu_as_sc_mcu7t3v3/$$file ; \
-	done
-	for file in ${LIBRELANE_COMMON} ; do \
 		rm -f ${LIBRELANE_STAGING_$*}/gf180mcu_osu_sc_gp9t3v3/$$file ; \
 	done
 	for file in ${LIBRELANE_COMMON} ; do \
@@ -918,10 +913,6 @@
 			${LIBRELANE_STAGING_$*}/gf180mcu_fd_sc_mcu9t5v0/$$file ; \
 	done
 	for file in ${LIBRELANE_COMMON} ; do \
-		${CPP} -quiet ${GF180MCU$*_DEFS} librelane/gf180mcu_as_sc_mcu7t3v3/$$file \
-			${LIBRELANE_STAGING_$*}/gf180mcu_as_sc_mcu7t3v3/$$file ; \
-	done
-	for file in ${LIBRELANE_COMMON} ; do \
 		${CPP} -quiet ${GF180MCU$*_DEFS} librelane/gf180mcu_osu_sc_gp9t3v3/$$file \
 			${LIBRELANE_STAGING_$*}/gf180mcu_osu_sc_gp9t3v3/$$file ; \
 	done
@@ -1386,6 +1377,13 @@
 	mkdir -p ${STAGING_PATH}/${GF180MCU$*}/libs.ref/gf180mcu_as_sc_mcu7t3v3/spice
 	cp -rp ${AVALON_REF_SOURCE}/spice ${STAGING_PATH}/${GF180MCU$*}/libs.ref/gf180mcu_as_sc_mcu7t3v3
 
+	# This library is done the right way and has its own librelane setup.
+	mkdir -p ${LIBRELANETOP_STAGING_$*}
+	mkdir -p ${LIBRELANE_STAGING_$*}
+	rm -rf ${LIBRELANE_STAGING_$*}/gf180mcu_as_sc_mcu7t3v3
+	mkdir ${LIBRELANE_STAGING_$*}/gf180mcu_as_sc_mcu7t3v3
+	cp -rp ${AVALON_TECH_SOURCE}/librelane/gf180mcu_as_sc_mcu7t3v3 ${LIBRELANE_STAGING_$*}
+
 digital-efuse-%:
         # Install eFuse non-volatile memory macros from vendor files
 	# NOTE: The repository is in open_pdks format and mainly just needs to
diff --git a/gf180mcu/gf180mcu.json b/gf180mcu/gf180mcu.json
index b47cff0..1f4c67a 100644
--- a/gf180mcu/gf180mcu.json
+++ b/gf180mcu/gf180mcu.json
@@ -106,7 +106,7 @@
         "gf180mcu_fd_sc_mcu7t5v0": "5641d172662a7d9086e5b99c5d54506c05e65cee",
         "gf180mcu_fd_sc_mcu9t5v0": "e0e80f5a6522f10b82165d3aeab9b8ee28e89849",
         "gf180mcu_fd_ip_sram": "b98653230f05be17867c70870ecacfa6a6bca7ff",
-        "gf180mcu_as_sc_mcu7t3v3": "74a31bc2ea7fe3f00df4069ef2302af687295f60",
+        "gf180mcu_as_sc_mcu7t3v3": "8f8c3c4e2eaefda6e408e9f92322431f7bedfbe2",
         "gf180mcu_re_efuse": "9941e38e7670a12f3f3a744bea4f9d2f04e6a669",
         "gf180mcu_ocd_io": "53582c591ff7f2ca2529889e8e869f38ff4da39e",
         "gf180mcu_ocd_alpha": "0597ebd5732987dbcd149e02c38525c1c5bf2a58",
diff --git a/gf180mcu/librelane/gf180mcu_as_sc_mcu7t3v3/config.tcl b/gf180mcu/librelane/gf180mcu_as_sc_mcu7t3v3/config.tcl
deleted file mode 100644
index 52f4d8c..0000000
--- a/gf180mcu/librelane/gf180mcu_as_sc_mcu7t3v3/config.tcl
+++ /dev/null
@@ -1,73 +0,0 @@
-set current_folder [file dirname [file normalize [info script]]]
-# Technology lib
-
-set ::env(CELL_LIBS) [dict create]
-dict set ::env(CELL_LIBS) *_tt_025C_3v30 "\
-    $::env(PDK_ROOT)/$::env(PDK)/libs.ref/$::env(STD_CELL_LIBRARY)/lib/$::env(STD_CELL_LIBRARY)__tt_025C_3v30.lib\
-"
-dict set ::env(CELL_LIBS) *_ff_n40C_3v60 "\
-    $::env(PDK_ROOT)/$::env(PDK)/libs.ref/$::env(STD_CELL_LIBRARY)/lib/$::env(STD_CELL_LIBRARY)__ff_n40C_3v60.lib\
-"
-dict set ::env(CELL_LIBS) *_ss_125C_3v00 "\
-    $::env(PDK_ROOT)/$::env(PDK)/libs.ref/$::env(STD_CELL_LIBRARY)/lib/$::env(STD_CELL_LIBRARY)__ss_125C_3v00.lib\
-"
-
-set ::env(STA_CORNERS) "\
-    nom_tt_025C_3v30 \
-    min_tt_025C_3v30 \
-    max_tt_025C_3v30 \
-    nom_ff_n40C_3v60 \
-    min_ff_n40C_3v60 \
-    max_ff_n40C_3v60 \
-    nom_ss_125C_3v00 \
-    min_ss_125C_3v00 \
-    max_ss_125C_3v00 \
-"
-set ::env(DEFAULT_CORNER) "nom_tt_025C_3v30"
-
-# MUX2 mapping
-set ::env(SYNTH_MUX_MAP) "$::env(PDK_ROOT)/$::env(PDK)/libs.tech/librelane/$::env(STD_CELL_LIBRARY)/mux2_map.v"
-
-# Placement site for core cells
-# This can be found in the technology lef
-set ::env(PLACE_SITE) "unithd"
-
-# welltap and endcap cell
-set ::env(WELLTAP_CELL) "$::env(STD_CELL_LIBRARY)__tap_2"
-set ::env(ENDCAP_CELL) "$::env(STD_CELL_LIBRARY)__tap_2"
-
-# defaults (can be overridden by designs):
-set ::env(SYNTH_DRIVING_CELL) "$::env(STD_CELL_LIBRARY)__inv_2/Y"
-set ::env(SYNTH_CLK_DRIVING_CELL) "$::env(STD_CELL_LIBRARY)__inv_4/Y"
-
-# update these
-set ::env(OUTPUT_CAP_LOAD) "72.91" ; # femtofarad from pin I in liberty file
-set ::env(SYNTH_BUFFER_CELL) "$::env(STD_CELL_LIBRARY)__buff_2/A/Y"
-set ::env(SYNTH_TIEHI_CELL) "$::env(STD_CELL_LIBRARY)__tieh_4/ONE"
-set ::env(SYNTH_TIELO_CELL) "$::env(STD_CELL_LIBRARY)__tiel_4/ZERO"
-
-# Fillcell insertion
-set ::env(FILL_CELLS) "$::env(STD_CELL_LIBRARY)__fill_*"
-set ::env(DECAP_CELLS) "$::env(STD_CELL_LIBRARY)__fillcap_*"
-
-# Diode Insertion
-# A fake diode has to be created, for now don't use any strategy that uses fake diode
-# set ::env(FAKEDIODE_CELL) ""
-set ::env(DIODE_CELL) "$::env(STD_CELL_LIBRARY)__diode_2/DIODE"
-
-set ::env(CELL_PAD_EXCLUDE) "$::env(STD_CELL_LIBRARY)__tap_2 $::env(STD_CELL_LIBRARY)__fill_*"
-
-# TritonCTS configurations
-set ::env(CTS_ROOT_BUFFER) "$::env(STD_CELL_LIBRARY)__clkbuff_12"
-set ::env(CTS_CLK_BUFFER_LIST) "$::env(STD_CELL_LIBRARY)__clkbuff_4 $::env(STD_CELL_LIBRARY)__clkbuff_8 $::env(STD_CELL_LIBRARY)__clkbuff_12"
-
-set ::env(FP_PDN_RAIL_WIDTH) 0.6
-
-set ::env(MAX_TRANSITION_CONSTRAINT) 1.5
-set ::env(MAX_FANOUT_CONSTRAINT) 9
-set ::env(MAX_CAPACITANCE_CONSTRAINT) 0.2
-
-set ::env(GPL_CELL_PADDING) {0}
-set ::env(DPL_CELL_PADDING) {0}
-
-set ::env(TRISTATE_CELLS) "$::env(STD_CELL_LIBRARY)__invz*"
diff --git a/gf180mcu/librelane/gf180mcu_as_sc_mcu7t3v3/drc_exclude.cells b/gf180mcu/librelane/gf180mcu_as_sc_mcu7t3v3/drc_exclude.cells
deleted file mode 100644
index e69de29..0000000
--- a/gf180mcu/librelane/gf180mcu_as_sc_mcu7t3v3/drc_exclude.cells
+++ /dev/null
diff --git a/gf180mcu/librelane/gf180mcu_as_sc_mcu7t3v3/mux2_map.v b/gf180mcu/librelane/gf180mcu_as_sc_mcu7t3v3/mux2_map.v
deleted file mode 100644
index 2d4f5b3..0000000
--- a/gf180mcu/librelane/gf180mcu_as_sc_mcu7t3v3/mux2_map.v
+++ /dev/null
@@ -1,13 +0,0 @@
-module \$_MUX_ (
-    output Y,
-    input A,
-    input B,
-    input S
-    );
-  gf180mcu_as_sc_mcu7t3v3__mux2_2 _TECHMAP_MUX (
-      .Y(Y),
-      .A(A),
-      .B(B),
-      .S(S)
-  );
-endmodule
diff --git a/gf180mcu/librelane/gf180mcu_as_sc_mcu7t3v3/pnr_exclude.cells b/gf180mcu/librelane/gf180mcu_as_sc_mcu7t3v3/pnr_exclude.cells
deleted file mode 100644
index e69de29..0000000
--- a/gf180mcu/librelane/gf180mcu_as_sc_mcu7t3v3/pnr_exclude.cells
+++ /dev/null
diff --git a/gf180mcu/librelane/gf180mcu_as_sc_mcu7t3v3/synth_exclude.cells b/gf180mcu/librelane/gf180mcu_as_sc_mcu7t3v3/synth_exclude.cells
deleted file mode 100644
index c85daa5..0000000
--- a/gf180mcu/librelane/gf180mcu_as_sc_mcu7t3v3/synth_exclude.cells
+++ /dev/null
@@ -1,5 +0,0 @@
-gf180mcu_as_sc_mcu7t3v3__diode_2
-gf180mcu_as_sc_mcu7t3v3__clkbuff_4
-gf180mcu_as_sc_mcu7t3v3__clkbuff_8
-gf180mcu_as_sc_mcu7t3v3__clkbuff_12
-gf180mcu_as_sc_mcu7t3v3__hcf_7
diff --git a/gf180mcu/librelane/gf180mcu_as_sc_mcu7t3v3/tracks.info b/gf180mcu/librelane/gf180mcu_as_sc_mcu7t3v3/tracks.info
deleted file mode 100644
index 16f592e..0000000
--- a/gf180mcu/librelane/gf180mcu_as_sc_mcu7t3v3/tracks.info
+++ /dev/null
@@ -1,10 +0,0 @@
-Metal1 X 0.28 0.56
-Metal1 Y 0.28 0.56
-Metal2 X 0.28 0.56
-Metal2 Y 0.28 0.56
-Metal3 X 0.28 0.56
-Metal3 Y 0.28 0.56
-Metal4 X 0.28 0.56
-Metal4 Y 0.28 0.56
-Metal5 X 0.45 0.90
-Metal5 Y 0.45 0.90