diff --git a/.github/workflows/helm-chart-release.yml b/.github/workflows/helm-chart-release.yml
index 95eed96..9fe0528 100644
--- a/.github/workflows/helm-chart-release.yml
+++ b/.github/workflows/helm-chart-release.yml
@@ -26,7 +26,5 @@ jobs:
 
       - name: Run chart-releaser
         uses: helm/chart-releaser-action@v1.3.0
-        with:
-          charts_dir: .
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/README.md b/README.md
index 08ef133..6b9f668 100644
--- a/README.md
+++ b/README.md
@@ -171,7 +171,7 @@ Install from git repository:
 git clone https://github.com/nokia/koredump.git
 cd koredump
 oc new-project koredump
-helm install koredump .
+helm install koredump charts/koredump/
 watch kubectl get all
 ```
 
diff --git a/Chart.yaml b/charts/koredump/Chart.yaml
similarity index 100%
rename from Chart.yaml
rename to charts/koredump/Chart.yaml
diff --git a/charts/koredump/LICENSE b/charts/koredump/LICENSE
new file mode 100644
index 0000000..ea8b2c8
--- /dev/null
+++ b/charts/koredump/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Nokia
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/templates/NOTES.txt b/charts/koredump/templates/NOTES.txt
similarity index 100%
rename from templates/NOTES.txt
rename to charts/koredump/templates/NOTES.txt
diff --git a/templates/_helpers.tpl b/charts/koredump/templates/_helpers.tpl
similarity index 100%
rename from templates/_helpers.tpl
rename to charts/koredump/templates/_helpers.tpl
diff --git a/templates/daemonset.yaml b/charts/koredump/templates/daemonset.yaml
similarity index 100%
rename from templates/daemonset.yaml
rename to charts/koredump/templates/daemonset.yaml
diff --git a/templates/deployment.yaml b/charts/koredump/templates/deployment.yaml
similarity index 100%
rename from templates/deployment.yaml
rename to charts/koredump/templates/deployment.yaml
diff --git a/templates/hpa.yaml b/charts/koredump/templates/hpa.yaml
similarity index 100%
rename from templates/hpa.yaml
rename to charts/koredump/templates/hpa.yaml
diff --git a/templates/ingress.yaml b/charts/koredump/templates/ingress.yaml
similarity index 100%
rename from templates/ingress.yaml
rename to charts/koredump/templates/ingress.yaml
diff --git a/templates/secret-tokens.yaml b/charts/koredump/templates/secret-tokens.yaml
similarity index 100%
rename from templates/secret-tokens.yaml
rename to charts/koredump/templates/secret-tokens.yaml
diff --git a/templates/service.yaml b/charts/koredump/templates/service.yaml
similarity index 100%
rename from templates/service.yaml
rename to charts/koredump/templates/service.yaml
diff --git a/templates/serviceaccount.yaml b/charts/koredump/templates/serviceaccount.yaml
similarity index 100%
rename from templates/serviceaccount.yaml
rename to charts/koredump/templates/serviceaccount.yaml
diff --git a/templates/tests/test-connection.yaml b/charts/koredump/templates/tests/test-connection.yaml
similarity index 100%
rename from templates/tests/test-connection.yaml
rename to charts/koredump/templates/tests/test-connection.yaml
diff --git a/values.yaml b/charts/koredump/values.yaml
similarity index 100%
rename from values.yaml
rename to charts/koredump/values.yaml