diff --git a/Makefile b/Makefile
index c58b764..4fca7c8 100644
--- a/Makefile
+++ b/Makefile
@@ -16,11 +16,14 @@ docker-build: ## Build the iqos-xapp docker image
 docker-push: docker-build ## Push image to Docker Hub
 	@docker image push ${IQOS_DOCKER_REPO}:${IQOS_VERSION}
 
-helm-install:
+helm-install: ## Install iqos-xapp on Kubernetes
 	@helm upgrade --install -n riab iqos-xapp ./deploy/helm-chart/iqos-chart
 
-helm-uninstall:
+helm-uninstall: ## Uninstall iqos-xapp on Kubernetes
 	@helm uninstall -n riab iqos-xapp
 
+k8s-logs: ## Gets logs from iqos-xapp pod
+	@kubectl logs -n riab $$(kubectl get pods -n riab --no-headers -o custom-columns=":metadata.name" | grep iqos-xapp) iqos-xapp -f
+
 clean: ## Remove all the build artifacts
 	rm -rf ./build/_output
\ No newline at end of file
diff --git a/cmd/iqos-xapp/iqos-xapp.go b/cmd/iqos-xapp/iqos-xapp.go
index 235cc46..f0f25fa 100644
--- a/cmd/iqos-xapp/iqos-xapp.go
+++ b/cmd/iqos-xapp/iqos-xapp.go
@@ -21,15 +21,15 @@ func main() {
 
 	// set manager configuration
 	cfg := manager.Config{
-		AppID:        "qmai",
-		CAPath:       "/etc/qmai/certs/tls.cacrt",
-		KeyPath:      "/etc/qmai/certs/tls.key",
-		CertPath:     "/etc/qmai/certs/tls.crt",
+		AppID:        "iqos-xapp",
+		CAPath:       "/etc/iqos-xapp/certs/tls.cacrt",
+		KeyPath:      "/etc/iqos-xapp/certs/tls.key",
+		CertPath:     "/etc/iqos-xapp/certs/tls.crt",
 		E2tEndpoint:  "onos-e2t",
 		E2tPort:      5150,
 		TopoEndpoint: "onos-topo",
 		TopoPort:     5150,
-		ConfigPath:   "/etc/qmai/config/config.json",
+		ConfigPath:   "/etc/iqos-xapp/config/config.json",
 		KpmSM: manager.KpmSM{
 			Name:    "oran-e2sm-kpm",
 			Version: "v2",
diff --git a/deploy/helm-chart/README.MD b/deploys/helm-chart/README.MD
similarity index 100%
rename from deploy/helm-chart/README.MD
rename to deploys/helm-chart/README.MD
diff --git a/deploy/helm-chart/TODO b/deploys/helm-chart/TODO
similarity index 100%
rename from deploy/helm-chart/TODO
rename to deploys/helm-chart/TODO
diff --git a/deploy/helm-chart/iqos-chart/.helmignore b/deploys/helm-chart/iqos-chart/.helmignore
similarity index 100%
rename from deploy/helm-chart/iqos-chart/.helmignore
rename to deploys/helm-chart/iqos-chart/.helmignore
diff --git a/deploy/helm-chart/iqos-chart/Chart.yaml b/deploys/helm-chart/iqos-chart/Chart.yaml
similarity index 100%
rename from deploy/helm-chart/iqos-chart/Chart.yaml
rename to deploys/helm-chart/iqos-chart/Chart.yaml
diff --git a/deploy/helm-chart/iqos-chart/templates/NOTES.txt b/deploys/helm-chart/iqos-chart/templates/NOTES.txt
similarity index 100%
rename from deploy/helm-chart/iqos-chart/templates/NOTES.txt
rename to deploys/helm-chart/iqos-chart/templates/NOTES.txt
diff --git a/deploy/helm-chart/iqos-chart/templates/_helpers.tpl b/deploys/helm-chart/iqos-chart/templates/_helpers.tpl
similarity index 100%
rename from deploy/helm-chart/iqos-chart/templates/_helpers.tpl
rename to deploys/helm-chart/iqos-chart/templates/_helpers.tpl
diff --git a/deploy/helm-chart/iqos-chart/templates/hpa.yaml b/deploys/helm-chart/iqos-chart/templates/hpa.yaml
similarity index 100%
rename from deploy/helm-chart/iqos-chart/templates/hpa.yaml
rename to deploys/helm-chart/iqos-chart/templates/hpa.yaml
diff --git a/deploy/helm-chart/iqos-chart/templates/ingress.yaml b/deploys/helm-chart/iqos-chart/templates/ingress.yaml
similarity index 100%
rename from deploy/helm-chart/iqos-chart/templates/ingress.yaml
rename to deploys/helm-chart/iqos-chart/templates/ingress.yaml
diff --git a/deploy/helm-chart/iqos-chart/templates/service.yaml b/deploys/helm-chart/iqos-chart/templates/service.yaml
similarity index 100%
rename from deploy/helm-chart/iqos-chart/templates/service.yaml
rename to deploys/helm-chart/iqos-chart/templates/service.yaml
diff --git a/deploy/helm-chart/iqos-chart/templates/serviceaccount.yaml b/deploys/helm-chart/iqos-chart/templates/serviceaccount.yaml
similarity index 100%
rename from deploy/helm-chart/iqos-chart/templates/serviceaccount.yaml
rename to deploys/helm-chart/iqos-chart/templates/serviceaccount.yaml
diff --git a/deploy/helm-chart/iqos-chart/templates/statefulset.yaml b/deploys/helm-chart/iqos-chart/templates/statefulset.yaml
similarity index 100%
rename from deploy/helm-chart/iqos-chart/templates/statefulset.yaml
rename to deploys/helm-chart/iqos-chart/templates/statefulset.yaml
diff --git a/deploy/helm-chart/iqos-chart/values.yaml b/deploys/helm-chart/iqos-chart/values.yaml
similarity index 100%
rename from deploy/helm-chart/iqos-chart/values.yaml
rename to deploys/helm-chart/iqos-chart/values.yaml