diff --git a/.github/workflows/e2e-test.yaml b/.github/workflows/e2e-test.yaml
index 78a49fda..8b5dd5aa 100644
--- a/.github/workflows/e2e-test.yaml
+++ b/.github/workflows/e2e-test.yaml
@@ -82,7 +82,7 @@ jobs:
 
       - name: Testing
         run: |
-          helm install k6-operator ./charts/ -f ./charts/values.yaml --set manager.image.tag=${{github.sha}}
+          helm install k6-operator ./charts/k6-operator/ -f ./charts/k6-operator/values.yaml --set manager.image.tag=${{github.sha}}
           kubectl cluster-info dump | grep 'nodeInfo' -A 11
           kubectl -n k6-operator-system describe deployment k6-operator-controller-manager
           kubectl create configmap crocodile-stress-test --from-file e2e/test.js
diff --git a/Makefile b/Makefile
index f2430cc4..63054361 100644
--- a/Makefile
+++ b/Makefile
@@ -164,10 +164,10 @@ e2e-helm: deploy-helm
 
 # Deploy controller in the configured Kubernetes cluster in ~/.kube/config
 deploy-helm: manifests helm
-	$(HELM) upgrade --install --wait k6-operator ./charts -f ./charts/values.yaml --set manager.image.name=$(IMG_NAME) --set manager.image.tag=$(IMG_TAG)
+	$(HELM) upgrade --install --wait k6-operator ./charts/k6-operator -f ./charts/k6-operator/values.yaml --set manager.image.name=$(IMG_NAME) --set manager.image.tag=$(IMG_TAG)
 
 helm-template: manifests helm
-	$(HELM) template k6-operator ./charts -f ./charts/values.yaml --set manager.image.name=$(IMG_NAME) --set manager.image.tag=$(IMG_TAG)
+	$(HELM) template k6-operator ./charts/k6-operator -f ./charts/k6-operator/values.yaml --set manager.image.name=$(IMG_NAME) --set manager.image.tag=$(IMG_TAG)
 
 # Delete operator from a cluster
 delete-helm: manifests helm