diff --git a/.github/workflows/user_project_ci.yml b/.github/workflows/user_project_ci.yml
index c3b83cd..04a6409 100644
--- a/.github/workflows/user_project_ci.yml
+++ b/.github/workflows/user_project_ci.yml
@@ -31,7 +31,7 @@
           sudo chown -R $USER:$USER ${{ env.PDK_ROOT }}
           make install
           make openlane
-          make pdk
+          make pdk-with-volare
 
       - name: Tarball PDK
         run: |
diff --git a/Makefile b/Makefile
index 1814648..e95876a 100644
--- a/Makefile
+++ b/Makefile
@@ -40,26 +40,6 @@
 	CARAVEL_TAG := $(MPW_TAG)
 endif
 
-pdk-with-sram: pdk
-.PHONY: pdk
-pdk: check-env run_volare gen-sources
-
-.PHONY: clean-pdk
-clean-pdk:
-	rm -rf $(PDK_ROOT)
-
-.PHONY: run_volare
-run_volare:
-	@volare enable -f $(OPENLANE_ROOT)/dependencies/tool_metadata.yml
-
-.PHONY: gen-sources
-gen-sources:
-	@touch $(PDK_ROOT)/sky130A/SOURCES
-	@printf "skywater-pdk " >> $(PDK_ROOT)/sky130A/SOURCES
-	@echo $(SKYWATER_COMMIT) >> $(PDK_ROOT)/sky130A/SOURCES
-	@printf "open_pdks " >> $(PDK_ROOT)/sky130A/SOURCES
-	@echo $(OPEN_PDKS_COMMIT) >> $(PDK_ROOT)/sky130A/SOURCES
-
 # Include Caravel Makefile Targets
 .PHONY: % : check-caravel
 %:
@@ -80,7 +60,7 @@
 	docker pull efabless/dv_setup:latest
 
 .PHONY: setup
-setup: install check-env install_mcw openlane pdk
+setup: install check-env install_mcw openlane pdk-with-volare
 
 # Openlane
 blocks=$(shell cd openlane && find * -maxdepth 0 -type d)
@@ -217,15 +197,11 @@
 		exit 1; \
 	fi
 
-.PHONY: check-env
-check-env:
-ifndef PDK_ROOT
-	$(error PDK_ROOT is undefined, please export it before running make)
-endif
-ifeq ($(shell which volare),)
-	echo "volare is not found, Installing it..."
-	python3 -m pip install volare
-endif
+check-pdk:
+	@if [ ! -d "$(PDK_ROOT)" ]; then \
+		echo "PDK Root: "$(PDK_ROOT)" doesn't exists, please export the correct path before running make. "; \
+		exit 1; \
+	fi
 
 .PHONY: help
 help:
@@ -233,4 +209,3 @@
 	@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$'
 
 
-
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 052fcf7..abdd055 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -163,19 +163,15 @@
 Building the PDK 
 ================
 
-Make sure you have `Magic VLSI Layout Tool <http://opencircuitdesign.com/magic/index.html>`__ installed on your machine before building the pdk. 
-The pdk build is tested with magic version ``8.3.265``. 
+For more information about volare click `here <https://github.com/efabless/volare>`__
 
 .. code:: bash
 
     # set PDK_ROOT to the path you wish to use for the pdk
     export PDK_ROOT=<pdk-installation-path>
 
-    # you can optionally specify skywater-pdk and open-pdks commit used
-    # by setting and exporting SKYWATER_COMMIT and OPEN_PDKS_COMMIT
-    # if you do not set them, they default to the last verfied commits tested for this project
-
-    make pdk
+    # use volare to download the pdk
+    make pdk-with-volare
 
 Running Full Chip Simulation
 ============================