diff --git a/.github/workflows/pr-workflow.yaml b/.github/workflows/pr-workflow.yaml
index 3b1f244..efb0488 100644
--- a/.github/workflows/pr-workflow.yaml
+++ b/.github/workflows/pr-workflow.yaml
@@ -20,7 +20,7 @@ jobs:
 
       - name: Helm lint (CRDs)
         run: |
-          helm lint charts/qdrant-operator-crds
+          helm lint charts/qdrant-kubernetes-api
 
       - name: Check Go Formatting
         run: |
diff --git a/.github/workflows/release-workflow.yaml b/.github/workflows/release-workflow.yaml
index f1ed891..e6ce7ae 100644
--- a/.github/workflows/release-workflow.yaml
+++ b/.github/workflows/release-workflow.yaml
@@ -39,9 +39,7 @@ jobs:
       - name: Package helm chart (CRDs)
         run: |
           # Ensure correct versions in Chart.yaml
-          sed -i "s/version:.*/version: ${{ steps.extract_build_info.outputs.tag }}/g" charts/qdrant-operator-crds/Chart.yaml
-          sed -i "s/appVersion:.*/appVersion: ${{ steps.extract_build_info.outputs.tag }}/g" charts/qdrant-operator-crds/Chart.yaml
-          helm package charts/qdrant-operator-crds/
+          helm package --app-version ${{ steps.extract_build_info.outputs.tag }} --version ${{ steps.extract_build_info.outputs.tag }} charts/qdrant-kubernetes-api/
 
       - name: Tag Release
         shell: bash
@@ -66,7 +64,7 @@ jobs:
           HARBOR_TOKEN: ${{ secrets.HARBOR_TOKEN }}
         run: |
           helm registry login registry.cloud.qdrant.io -u "${HARBOR_USERNAME}" --password "${HARBOR_TOKEN}"
-          push_output=$(helm push qdrant-operator-crds-${{ steps.extract_build_info.outputs.tag }}.tgz oci://registry.cloud.qdrant.io/qdrant-charts 2>&1)
+          push_output=$(helm push qdrant-kubernetes-api-${{ steps.extract_build_info.outputs.tag }}.tgz oci://registry.cloud.qdrant.io/qdrant-charts 2>&1)
           echo $push_output
           digest=$(echo $push_output | grep -oP '(?<=Digest: ).*')
           echo $digest
@@ -79,7 +77,7 @@ jobs:
           HARBOR_TOKEN: ${{ secrets.HARBOR_TOKEN }}
         run: |
           helm registry login registry.cloud.qdrant.io -u "${HARBOR_USERNAME}" --password "${HARBOR_TOKEN}"
-          push_output=$(helm push qdrant-operator-crds-${{ steps.extract_build_info.outputs.tag }}.tgz oci://registry.cloud.qdrant.io/library 2>&1)
+          push_output=$(helm push qdrant-kubernetes-api-${{ steps.extract_build_info.outputs.tag }}.tgz oci://registry.cloud.qdrant.io/library 2>&1)
           echo $push_output
           public_digest=$(echo $push_output | grep -oP '(?<=Digest: ).*')
           echo $public_digest
@@ -89,12 +87,12 @@ jobs:
         run: |
           cosign sign --yes "${TAGS}@${DIGEST}"
         env:
-          TAGS: registry.cloud.qdrant.io/qdrant-charts/qdrant-operator-crds:${{ steps.extract_build_info.outputs.tag }}
+          TAGS: registry.cloud.qdrant.io/qdrant-charts/qdrant-kubernetes-api:${{ steps.extract_build_info.outputs.tag }}
           DIGEST: ${{ steps.push-helm-chart-crds.outputs.digest }}
 
       - name: Sign helm chart (CRDs) at registry.cloud.qdrant.io in public repo
         run: |
           cosign sign --yes "${TAGS}@${DIGEST}"
         env:
-          TAGS: registry.cloud.qdrant.io/library/qdrant-operator-crds:${{ steps.extract_build_info.outputs.tag }}
+          TAGS: registry.cloud.qdrant.io/library/qdrant-kubernetes-api:${{ steps.extract_build_info.outputs.tag }}
           DIGEST: ${{ steps.push-helm-chart-crds-public.outputs.public_digest }}
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 89e3744..c521800 100644
--- a/Makefile
+++ b/Makefile
@@ -9,10 +9,11 @@ GCI ?= $(LOCALBIN)/gci
 
 CONTROLLER_TOOLS_VERSION ?= v0.16.1
 CRD_REF_DOCS_VERSION ?= v0.0.12
+CHART_DIR ?= charts/qdrant-kubernetes-api
 
 lint:
 	bash -c 'files=$$(gofmt -l .) && echo $$files && [ -z "$$files" ]'
-	helm lint charts/qdrant-operator-crds
+	helm lint $(CHART_DIR)
 	golangci-lint run
 
 .PHONY: gen
@@ -20,20 +21,20 @@ gen: manifests generate format vet ## Generate code containing DeepCopy, DeepCop
 
 .PHONY: manifests
 manifests: controller-gen ## Generate CustomResourceDefinition objects.
-	rm charts/qdrant-operator-crds/templates/management-crds/*.yaml
-	rm charts/qdrant-operator-crds/templates/region-crds/*.yaml
-	$(CONTROLLER_GEN) crd paths="./..." output:crd:artifacts:config=charts/qdrant-operator-crds/templates
-	mv charts/qdrant-operator-crds/templates/qdrant.io_qdrantreleases.yaml charts/qdrant-operator-crds/templates/management-crds/
-	mv charts/qdrant-operator-crds/templates/qdrant*.yaml charts/qdrant-operator-crds/templates/region-crds/
-	for file in charts/qdrant-operator-crds/templates/management-crds/*.yaml; do \
+	rm $(CHART_DIR)/templates/management-crds/*.yaml
+	rm $(CHART_DIR)/templates/region-crds/*.yaml
+	$(CONTROLLER_GEN) crd paths="./..." output:crd:artifacts:config=$(CHART_DIR)/templates
+	mv $(CHART_DIR)/templates/qdrant.io_qdrantreleases.yaml $(CHART_DIR)/templates/management-crds/
+	mv $(CHART_DIR)/templates/qdrant*.yaml $(CHART_DIR)/templates/region-crds/
+	for file in $(CHART_DIR)/templates/management-crds/*.yaml; do \
 		echo "{{ if .Values.includeManagementCRDs }}" | cat - $$file > temp && mv temp $$file; \
 		echo "{{ end }}" >> $$file; \
 	done
-	for file in charts/qdrant-operator-crds/templates/region-crds/*.yaml; do \
+	for file in $(CHART_DIR)/templates/region-crds/*.yaml; do \
 		echo "{{ if .Values.includeRegionCRDs }}" | cat - $$file > temp && mv temp $$file; \
 		echo "{{ end }}" >> $$file; \
 	done
-	helm lint charts/qdrant-operator-crds
+	helm lint $(CHART_DIR)
 
 .PHONY: generate
 generate: controller-gen crd-ref-docs ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
diff --git a/charts/qdrant-operator-crds/Chart.yaml b/charts/qdrant-kubernetes-api/Chart.yaml
similarity index 57%
rename from charts/qdrant-operator-crds/Chart.yaml
rename to charts/qdrant-kubernetes-api/Chart.yaml
index 9fc6700..dbe0acc 100644
--- a/charts/qdrant-operator-crds/Chart.yaml
+++ b/charts/qdrant-kubernetes-api/Chart.yaml
@@ -1,11 +1,11 @@
 apiVersion: v2
-name: qdrant-operator-crds
-description: Operator CRDs used to manage Qdrant databases inside of Kubernetes # Used by both the operator and agent.
+name: qdrant-kubernetes-api
+description: Kubernetes API (CRDs) used to manage Qdrant databases inside of Kubernetes cluster # Used by both the operator and agent.
 home: https://qdrant.tech
 type: application
 version: 0.1.0
 sources:
-  - https://github.com/qdrant/operator
+  - https://github.com/qdrant/kubernetes-api
 keywords:
   - vector database
 maintainers:
diff --git a/charts/qdrant-operator-crds/templates/management-crds/qdrant.io_qdrantreleases.yaml b/charts/qdrant-kubernetes-api/templates/management-crds/qdrant.io_qdrantreleases.yaml
similarity index 100%
rename from charts/qdrant-operator-crds/templates/management-crds/qdrant.io_qdrantreleases.yaml
rename to charts/qdrant-kubernetes-api/templates/management-crds/qdrant.io_qdrantreleases.yaml
diff --git a/charts/qdrant-operator-crds/templates/region-crds/qdrant.io_qdrantcloudregions.yaml b/charts/qdrant-kubernetes-api/templates/region-crds/qdrant.io_qdrantcloudregions.yaml
similarity index 100%
rename from charts/qdrant-operator-crds/templates/region-crds/qdrant.io_qdrantcloudregions.yaml
rename to charts/qdrant-kubernetes-api/templates/region-crds/qdrant.io_qdrantcloudregions.yaml
diff --git a/charts/qdrant-operator-crds/templates/region-crds/qdrant.io_qdrantclusterrestores.yaml b/charts/qdrant-kubernetes-api/templates/region-crds/qdrant.io_qdrantclusterrestores.yaml
similarity index 100%
rename from charts/qdrant-operator-crds/templates/region-crds/qdrant.io_qdrantclusterrestores.yaml
rename to charts/qdrant-kubernetes-api/templates/region-crds/qdrant.io_qdrantclusterrestores.yaml
diff --git a/charts/qdrant-operator-crds/templates/region-crds/qdrant.io_qdrantclusters.yaml b/charts/qdrant-kubernetes-api/templates/region-crds/qdrant.io_qdrantclusters.yaml
similarity index 100%
rename from charts/qdrant-operator-crds/templates/region-crds/qdrant.io_qdrantclusters.yaml
rename to charts/qdrant-kubernetes-api/templates/region-crds/qdrant.io_qdrantclusters.yaml
diff --git a/charts/qdrant-operator-crds/templates/region-crds/qdrant.io_qdrantclusterscheduledsnapshots.yaml b/charts/qdrant-kubernetes-api/templates/region-crds/qdrant.io_qdrantclusterscheduledsnapshots.yaml
similarity index 100%
rename from charts/qdrant-operator-crds/templates/region-crds/qdrant.io_qdrantclusterscheduledsnapshots.yaml
rename to charts/qdrant-kubernetes-api/templates/region-crds/qdrant.io_qdrantclusterscheduledsnapshots.yaml
diff --git a/charts/qdrant-operator-crds/templates/region-crds/qdrant.io_qdrantclustersnapshots.yaml b/charts/qdrant-kubernetes-api/templates/region-crds/qdrant.io_qdrantclustersnapshots.yaml
similarity index 100%
rename from charts/qdrant-operator-crds/templates/region-crds/qdrant.io_qdrantclustersnapshots.yaml
rename to charts/qdrant-kubernetes-api/templates/region-crds/qdrant.io_qdrantclustersnapshots.yaml
diff --git a/charts/qdrant-operator-crds/values.yaml b/charts/qdrant-kubernetes-api/values.yaml
similarity index 100%
rename from charts/qdrant-operator-crds/values.yaml
rename to charts/qdrant-kubernetes-api/values.yaml