Merge "Add support of K8S 1.18"
diff --git a/Makefile b/Makefile
index 5a543d6..b02a8b8 100644
--- a/Makefile
+++ b/Makefile
@@ -139,14 +139,12 @@
 	helm upgrade --install $(HELM_GLOBAL_ARGS) \
 		--namespace omec \
 		--values $(AIABVALUES) \
-		--set images.pullPolicy=Always \
 		omec-control-plane \
 		$(WORKSPACE)/cord/aether-helm-charts/omec/omec-control-plane && \
 	kubectl rollout status -n omec statefulset spgwc && \
 	helm upgrade --install $(HELM_GLOBAL_ARGS) \
 		--namespace omec \
 		--values $(AIABVALUES) \
-		--set images.pullPolicy=Always \
 		omec-user-plane \
 		$(WORKSPACE)/cord/aether-helm-charts/omec/omec-user-plane && \
 	kubectl rollout status -n omec statefulset upf
@@ -194,7 +192,8 @@
 	helm delete --purge oaisim || true
 	helm delete --purge omec-control-plane || true
 	helm delete --purge omec-user-plane || true
-	cd $(M); rm -f oaisim omec
+	kubectl delete po router || true
+	cd $(M); rm -f oaisim omec fabric
 
 clean: reset-test
 	helm delete --purge $(shell helm ls -q) || true