diff --git a/Makefile b/Makefile
index 01645ab..e56b0fe 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ MAKEFLAGS += --warn-undefined-variables
 
 export CARAVEL_ROOT?=$(PWD)/caravel
 export UPRJ_ROOT?=$(PWD)
-PRECHECK_ROOT?=${PWD}/mpw_precheck
+PRECHECK_ROOT?=${HOME}/mpw_precheck
 export MCW_ROOT?=$(PWD)/mgmt_core_wrapper
 SIM?=RTL
 
@@ -212,6 +212,7 @@ uninstall:
 
 
 # Install Pre-check
+# Default installs to the user home directory, override by "export PRECHECK_ROOT=<precheck-installation-path>"
 .PHONY: precheck
 precheck:
 	if [ -d "$(PRECHECK_ROOT)" ]; then\
diff --git a/openlane/Makefile b/openlane/Makefile
index 17c488f..4fbc98d 100644
--- a/openlane/Makefile
+++ b/openlane/Makefile
@@ -27,7 +27,7 @@ ifeq ($(origin LIBRELANE_RUN_TAG), undefined)
 export LIBRELANE_RUN_TAG := $(shell date '+%y_%m_%d_%H_%M')
 endif
 ifeq ($(origin CF_LIBRELANE_TAG), undefined)
-export CF_LIBRELANE_TAG := CC2509c
+export CF_LIBRELANE_TAG := CI2511
 endif
 
 export CARAVEL_ROOT := $(CARAVEL_ROOT)
@@ -57,8 +57,12 @@ docker_mounts += -m $(MCW_ROOT)
 endif
 
 ifeq ($(LIBRELANE_USE_NIX),1)
+ifeq ($(origin UPSTREAM_LIBRELANE_TAG), undefined)
 librelane_run = nix run github:chipfoundry/openlane-2/$(CF_LIBRELANE_TAG) --
 else
+librelane_run = nix run github:librelane/librelane/$(UPSTREAM_LIBRELANE_TAG) --
+endif
+else
 librelane_docker_args = $(shell test -t 0 || echo "--docker-no-tty")
 librelane_run = $(PROJECT_ROOT)/openlane/.venv/bin/python3 -m librelane $(docker_mounts) $(librelane_docker_args) --dockerized 
 endif