diff --git a/Makefile b/Makefile
index c32f9d3e..413934b2 100644
--- a/Makefile
+++ b/Makefile
@@ -58,16 +58,14 @@ $(SKY130_PDKS_DIR): check-pdk-root
 	@echo "Cloning skywater PDK..."
 	@[ -d $(PDK_ROOT)/skywater-pdk ] || \
 		git clone https://github.com/google/skywater-pdk.git $(PDK_ROOT)/skywater-pdk
-	@cd $(SKY130_PDKS_DIR) && \
-		git checkout main && git pull && \
-		git checkout -qf $(SKY130_PDKS_GIT_COMMIT) && \
-		git submodule update --init libraries/sky130_fd_pr/latest libraries/sky130_fd_sc_hd/latest
+	@git -C $(SKY130_PDKS_DIR) checkout $(SKY130_PDKS_GIT_COMMIT) && \
+		git -C $(SKY130_PDKS_DIR) submodule update --init libraries/sky130_fd_pr/latest libraries/sky130_fd_sc_hd/latest
 
 $(OPEN_PDKS_DIR): $(SKY130_PDKS_DIR)
 	@echo "Cloning open_pdks..."
 	@[ -d $(OPEN_PDKS_DIR) ] || \
 		git clone $(OPEN_PDKS_GIT_REPO) $(OPEN_PDKS_DIR)
-	@cd $(OPEN_PDKS_DIR) && git pull && git checkout $(OPEN_PDKS_GIT_COMMIT)
+	@git -C $(OPEN_PDKS_DIR) checkout $(OPEN_PDKS_GIT_COMMIT)
 
 $(SKY130_PDK): $(OPEN_PDKS_DIR) $(SKY130_PDKS_DIR)
 	@echo "Installing open_pdks..."
@@ -80,9 +78,9 @@ $(SKY130_PDK): $(OPEN_PDKS_DIR) $(SKY130_PDKS_DIR)
 
 $(SRAM_LIB_DIR): check-pdk-root
 	@echo "Cloning SRAM library..."
-	@[ -d $(SRAM_LIB_DIR) ] || (\
-		git clone $(SRAM_LIB_GIT_REPO) $(SRAM_LIB_DIR) && \
-		cd $(SRAM_LIB_DIR) && git pull && git checkout $(SRAM_LIB_GIT_COMMIT))
+	@[ -d $(SRAM_LIB_DIR) ] || \
+		git clone $(SRAM_LIB_GIT_REPO) $(SRAM_LIB_DIR)
+	@git -C $(SRAM_LIB_DIR) checkout $(SRAM_LIB_GIT_COMMIT)
 
 install: $(SRAM_LIB_DIR)
 	@[ -d $(PDK_ROOT)/sky130A ] || \
@@ -227,4 +225,4 @@ build-library:
 # Build and install the openram library
 library: build-library
 	@python3 -m pip install --find-links=dist openram --force
-.PHONY: library
\ No newline at end of file
+.PHONY: library
diff --git a/docs/source/basic_setup.md b/docs/source/basic_setup.md
index 2b649d95..543e9692 100644
--- a/docs/source/basic_setup.md
+++ b/docs/source/basic_setup.md
@@ -80,14 +80,15 @@ entire [FreePDK45 PDK here][FreePDK45].
 
 ### Sky130 Setup
 
-To install [Sky130], you must have the open\_pdks files installed in $PDK\_ROOT. 
+To install [Sky130], you must have open\_pdks installed in $PDK\_ROOT. We highly recommend that you
+use the version tagged in the Makefile as others have not been verified.
 To install this automatically, you can run:
 ```
 cd $HOME/OpenRAM
 make pdk
 ```
 
-Then you must also install the [Sky130] SRAM build space and the appropriate cell views
+Then you must also install the [Sky130] SRAM build space with the appropriate cell views into the OpenRAM technology directory
 by running:
 ```
 cd $HOME/OpenRAM