diff --git a/Makefile b/Makefile
index 29e7243..009d6a4 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,7 @@
 
 RKE2_K8S_VERSION  ?= v1.23.15+rke2r1
 K8S_VERSION       ?= v1.21.6
+LPP_VERSION       ?= v0.0.24
 
 OAISIM_UE_IMAGE ?= andybavier/lte-uesoftmodem:1.1.0-$(shell uname -r)
 ENABLE_ROUTER ?= true
@@ -258,6 +259,12 @@
 	sudo systemctl start rke2-server.service
 	sudo /var/lib/rancher/rke2/bin/kubectl --kubeconfig /etc/rancher/rke2/rke2.yaml wait nodes --for=condition=Ready --all --timeout=300s
 	sudo /var/lib/rancher/rke2/bin/kubectl --kubeconfig /etc/rancher/rke2/rke2.yaml wait deployment -n kube-system --for=condition=available --all --timeout=300s
+	@$(eval STORAGE_CLASS := $(shell /var/lib/rancher/rke2/bin/kubectl --kubeconfig /etc/rancher/rke2/rke2.yaml get storageclass -o name))
+	@echo "STORAGE_CLASS: ${STORAGE_CLASS}"
+	if [ "$(STORAGE_CLASS)" == "" ]; then \
+		sudo /var/lib/rancher/rke2/bin/kubectl --kubeconfig /etc/rancher/rke2/rke2.yaml apply -f https://raw.githubusercontent.com/rancher/local-path-provisioner/$(LPP_VERSION)/deploy/local-path-storage.yaml --wait=true; \
+		sudo /var/lib/rancher/rke2/bin/kubectl --kubeconfig /etc/rancher/rke2/rke2.yaml patch storageclass local-path -p '{"metadata": {"annotations":{"storageclass.kubernetes.io/is-default-class":"true"}}}'; \
+	fi
 	curl -LO "https://dl.k8s.io/release/$(KUBECTL_VERSION)/bin/linux/amd64/kubectl"
 	sudo chmod +x kubectl
 	sudo mv kubectl /usr/local/bin/
diff --git a/configs/release-2.1 b/configs/release-2.1
index a0582cd..19fc3a8 100644
--- a/configs/release-2.1
+++ b/configs/release-2.1
@@ -5,7 +5,7 @@
 SD_CORE_CHART            := aether/sd-core --version 0.12.5
 
 # For installing the ROC
-AETHER_ROC_UMBRELLA_CHART := aether/aether-roc-umbrella --version 2.1.33
+AETHER_ROC_UMBRELLA_CHART := aether/aether-roc-umbrella --version 2.1.36
 ATOMIX_CHART              := atomix/atomix --version 1.1.2
 ONOS_OPERATOR_CHART       := onosproject/onos-operator --version 0.5.6