diff --git a/Makefile b/Makefile
index 9ac1bdd49..1b40241c5 100644
--- a/Makefile
+++ b/Makefile
@@ -107,7 +107,7 @@ uninstall: manifests kustomize
 # Generate manifests e.g. CRD, RBAC etc.
 manifests: controller-gen
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) webhook paths="./..." output:crd:artifacts:config=$(CRD_BASES)
-	cp ./config/crd/bases/* ./deployment/sriov-network-operator/crds/
+	cp ./config/crd/bases/* ./deployment/sriov-network-operator-chart/crds/
 
 check-manifests: manifests
 	@set +e; git diff --quiet config; \
@@ -274,4 +274,3 @@ chart-prepare-release: | $(YQ) ; ## prepare chart for release
 .PHONY: chart-push-release
 chart-push-release: ## push release chart
 	@GITHUB_TAG=$(GITHUB_TAG) GITHUB_TOKEN=$(GITHUB_TOKEN) GITHUB_REPO_OWNER=$(GITHUB_REPO_OWNER) hack/release/chart-push.sh
-
diff --git a/deployment/sriov-network-operator/.helmignore b/deployment/sriov-network-operator-chart/.helmignore
similarity index 100%
rename from deployment/sriov-network-operator/.helmignore
rename to deployment/sriov-network-operator-chart/.helmignore
diff --git a/deployment/sriov-network-operator/Chart.yaml b/deployment/sriov-network-operator-chart/Chart.yaml
similarity index 91%
rename from deployment/sriov-network-operator/Chart.yaml
rename to deployment/sriov-network-operator-chart/Chart.yaml
index 4fffae29a..3e784f9ae 100644
--- a/deployment/sriov-network-operator/Chart.yaml
+++ b/deployment/sriov-network-operator-chart/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: sriov-network-operator
+name: sriov-network-operator-chart
 version: 1.2.0
 kubeVersion: '>= 1.16.0-0'
 appVersion: 1.2.0
diff --git a/deployment/sriov-network-operator/README.md b/deployment/sriov-network-operator-chart/README.md
similarity index 100%
rename from deployment/sriov-network-operator/README.md
rename to deployment/sriov-network-operator-chart/README.md
diff --git a/deployment/sriov-network-operator/crds/k8s.cni.cncf.io_networkattachmentdefinitions_crd.yaml b/deployment/sriov-network-operator-chart/crds/k8s.cni.cncf.io_networkattachmentdefinitions_crd.yaml
similarity index 100%
rename from deployment/sriov-network-operator/crds/k8s.cni.cncf.io_networkattachmentdefinitions_crd.yaml
rename to deployment/sriov-network-operator-chart/crds/k8s.cni.cncf.io_networkattachmentdefinitions_crd.yaml
diff --git a/deployment/sriov-network-operator/crds/sriovnetwork.openshift.io_ovsnetworks.yaml b/deployment/sriov-network-operator-chart/crds/sriovnetwork.openshift.io_ovsnetworks.yaml
similarity index 100%
rename from deployment/sriov-network-operator/crds/sriovnetwork.openshift.io_ovsnetworks.yaml
rename to deployment/sriov-network-operator-chart/crds/sriovnetwork.openshift.io_ovsnetworks.yaml
diff --git a/deployment/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovibnetworks.yaml b/deployment/sriov-network-operator-chart/crds/sriovnetwork.openshift.io_sriovibnetworks.yaml
similarity index 100%
rename from deployment/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovibnetworks.yaml
rename to deployment/sriov-network-operator-chart/crds/sriovnetwork.openshift.io_sriovibnetworks.yaml
diff --git a/deployment/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml b/deployment/sriov-network-operator-chart/crds/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml
similarity index 100%
rename from deployment/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml
rename to deployment/sriov-network-operator-chart/crds/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml
diff --git a/deployment/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovnetworknodestates.yaml b/deployment/sriov-network-operator-chart/crds/sriovnetwork.openshift.io_sriovnetworknodestates.yaml
similarity index 100%
rename from deployment/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovnetworknodestates.yaml
rename to deployment/sriov-network-operator-chart/crds/sriovnetwork.openshift.io_sriovnetworknodestates.yaml
diff --git a/deployment/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovnetworkpoolconfigs.yaml b/deployment/sriov-network-operator-chart/crds/sriovnetwork.openshift.io_sriovnetworkpoolconfigs.yaml
similarity index 100%
rename from deployment/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovnetworkpoolconfigs.yaml
rename to deployment/sriov-network-operator-chart/crds/sriovnetwork.openshift.io_sriovnetworkpoolconfigs.yaml
diff --git a/deployment/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovnetworks.yaml b/deployment/sriov-network-operator-chart/crds/sriovnetwork.openshift.io_sriovnetworks.yaml
similarity index 100%
rename from deployment/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovnetworks.yaml
rename to deployment/sriov-network-operator-chart/crds/sriovnetwork.openshift.io_sriovnetworks.yaml
diff --git a/deployment/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovoperatorconfigs.yaml b/deployment/sriov-network-operator-chart/crds/sriovnetwork.openshift.io_sriovoperatorconfigs.yaml
similarity index 100%
rename from deployment/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovoperatorconfigs.yaml
rename to deployment/sriov-network-operator-chart/crds/sriovnetwork.openshift.io_sriovoperatorconfigs.yaml
diff --git a/deployment/sriov-network-operator/templates/NOTES.txt b/deployment/sriov-network-operator-chart/templates/NOTES.txt
similarity index 100%
rename from deployment/sriov-network-operator/templates/NOTES.txt
rename to deployment/sriov-network-operator-chart/templates/NOTES.txt
diff --git a/deployment/sriov-network-operator/templates/_helpers.tpl b/deployment/sriov-network-operator-chart/templates/_helpers.tpl
similarity index 100%
rename from deployment/sriov-network-operator/templates/_helpers.tpl
rename to deployment/sriov-network-operator-chart/templates/_helpers.tpl
diff --git a/deployment/sriov-network-operator/templates/certificate.yaml b/deployment/sriov-network-operator-chart/templates/certificate.yaml
similarity index 100%
rename from deployment/sriov-network-operator/templates/certificate.yaml
rename to deployment/sriov-network-operator-chart/templates/certificate.yaml
diff --git a/deployment/sriov-network-operator/templates/clusterrole.yaml b/deployment/sriov-network-operator-chart/templates/clusterrole.yaml
similarity index 100%
rename from deployment/sriov-network-operator/templates/clusterrole.yaml
rename to deployment/sriov-network-operator-chart/templates/clusterrole.yaml
diff --git a/deployment/sriov-network-operator/templates/clusterrolebinding.yaml b/deployment/sriov-network-operator-chart/templates/clusterrolebinding.yaml
similarity index 100%
rename from deployment/sriov-network-operator/templates/clusterrolebinding.yaml
rename to deployment/sriov-network-operator-chart/templates/clusterrolebinding.yaml
diff --git a/deployment/sriov-network-operator/templates/configmap.yaml b/deployment/sriov-network-operator-chart/templates/configmap.yaml
similarity index 100%
rename from deployment/sriov-network-operator/templates/configmap.yaml
rename to deployment/sriov-network-operator-chart/templates/configmap.yaml
diff --git a/deployment/sriov-network-operator/templates/operator.yaml b/deployment/sriov-network-operator-chart/templates/operator.yaml
similarity index 100%
rename from deployment/sriov-network-operator/templates/operator.yaml
rename to deployment/sriov-network-operator-chart/templates/operator.yaml
diff --git a/deployment/sriov-network-operator/templates/role.yaml b/deployment/sriov-network-operator-chart/templates/role.yaml
similarity index 100%
rename from deployment/sriov-network-operator/templates/role.yaml
rename to deployment/sriov-network-operator-chart/templates/role.yaml
diff --git a/deployment/sriov-network-operator/templates/rolebinding.yaml b/deployment/sriov-network-operator-chart/templates/rolebinding.yaml
similarity index 100%
rename from deployment/sriov-network-operator/templates/rolebinding.yaml
rename to deployment/sriov-network-operator-chart/templates/rolebinding.yaml
diff --git a/deployment/sriov-network-operator/templates/serviceaccount.yaml b/deployment/sriov-network-operator-chart/templates/serviceaccount.yaml
similarity index 100%
rename from deployment/sriov-network-operator/templates/serviceaccount.yaml
rename to deployment/sriov-network-operator-chart/templates/serviceaccount.yaml
diff --git a/deployment/sriov-network-operator/templates/sriovoperatorconfig.yaml b/deployment/sriov-network-operator-chart/templates/sriovoperatorconfig.yaml
similarity index 100%
rename from deployment/sriov-network-operator/templates/sriovoperatorconfig.yaml
rename to deployment/sriov-network-operator-chart/templates/sriovoperatorconfig.yaml
diff --git a/deployment/sriov-network-operator/values.yaml b/deployment/sriov-network-operator-chart/values.yaml
similarity index 100%
rename from deployment/sriov-network-operator/values.yaml
rename to deployment/sriov-network-operator-chart/values.yaml
diff --git a/hack/release/chart-push.sh b/hack/release/chart-push.sh
index 09666cc8f..2aa23548f 100755
--- a/hack/release/chart-push.sh
+++ b/hack/release/chart-push.sh
@@ -9,9 +9,9 @@ GITHUB_TOKEN=${GITHUB_TOKEN:-}
 GITHUB_TAG=${GITHUB_TAG:-}
 
 BASE=${PWD}
-HELM_CHART=${BASE}/deployment/sriov-network-operator
+HELM_CHART=${BASE}/deployment/sriov-network-operator-chart
 HELM_CHART_VERSION=${GITHUB_TAG#"v"}
-HELM_CHART_TARBALL="sriov-network-operator-${HELM_CHART_VERSION}.tgz"
+HELM_CHART_TARBALL="sriov-network-operator-chart-${HELM_CHART_VERSION}.tgz"
 
 # make sure helm is installed
 set +e
diff --git a/hack/release/chart-update.sh b/hack/release/chart-update.sh
index fb8247b82..f6f4093ab 100755
--- a/hack/release/chart-update.sh
+++ b/hack/release/chart-update.sh
@@ -10,8 +10,8 @@ GITHUB_REPO_OWNER=${GITHUB_REPO_OWNER:-}
 
 BASE=${PWD}
 YQ_CMD="${BASE}/bin/yq"
-HELM_VALUES=${BASE}/deployment/sriov-network-operator/values.yaml
-HELM_CHART=${BASE}/deployment/sriov-network-operator/Chart.yaml
+HELM_VALUES=${BASE}/deployment/sriov-network-operator-chart/values.yaml
+HELM_CHART=${BASE}/deployment/sriov-network-operator-chart/Chart.yaml
 
 
 if [ -z "$GITHUB_TAG" ]; then