diff --git a/macros/Makefile b/macros/Makefile
index 2014cb96..5da8d7ef 100644
--- a/macros/Makefile
+++ b/macros/Makefile
@@ -4,7 +4,7 @@ include $(TOP_DIR)/openram.mk
 
 .DEFAULT_GOAL := all
 
-SKY130_PDK ?= $(PDK_ROOT)/share/pdk/sky130A
+SKY130_PDK ?= $(PDK_ROOT)/sky130A
 
 OPENRAM_OPTS := $(OPENRAM_OPTS)
 # Define `OPENRAM_FULL` in your environment to run a full characterize
diff --git a/technology/sky130/__init__.py b/technology/sky130/__init__.py
index 3df3f555..409f0032 100644
--- a/technology/sky130/__init__.py
+++ b/technology/sky130/__init__.py
@@ -25,9 +25,9 @@ if 'PDK_ROOT' in os.environ:
 else:
     raise SystemError("Unable to find open_pdks tech file. Set PDK_ROOT.")
 
-spice_model_dir = os.path.join(open_pdks, "SIMULATOR",)
+# The ngspice models work with Xyce too now
+spice_model_dir = os.path.join(open_pdks, "ngspice")
 sky130_lib_ngspice = os.path.join(open_pdks, "ngspice", "sky130.lib.spice")
-# We may end up using Xyce but check if at least ngspice exists
 if not os.path.exists(sky130_lib_ngspice):
     raise SystemError("Did not find {} under {}".format(sky130_lib_ngspice, open_pdks))
 os.environ["SPICE_MODEL_DIR"] = spice_model_dir