diff --git a/.gitignore b/.gitignore
index dbcff3b55c1152f6f2ce57fead35dab4b43bed40..1b990a0420f717e8c6168a5d71564d2da710c9f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,5 @@
 *.tmproj
 .vscode/
 rshiny-*.tgz
-shiny-server-*.tgz
\ No newline at end of file
+shiny-server-*.tgz
+shiny-k8s-toolkit-helm-*.tgz
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8384dd7c261db1d952460b22bb0d25032ad2c0d8..322842a4b81a88743994447748bb5e75732c70d1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,8 +5,8 @@ upload:
   needs: []
   image: harbor.pasteur.fr/kube-system/helm-kubectl:3.4.0
   script:
-    - CHART_VERSION=$(helm show chart shiny-server | grep version | cut -d' ' -f2)
-    - CHART_NAME=$(helm show chart shiny-server | grep name | cut -d' ' -f2)
+    - CHART_VERSION=$(helm show chart shiny-k8s-toolkit-helm | grep version | cut -d' ' -f2)
+    - CHART_NAME=$(helm show chart shiny-k8s-toolkit-helm | grep name | cut -d' ' -f2)
     - |
       if [ "helm" == "${CI_COMMIT_REF_SLUG}" ]; then
         export CHANNEL="stable"
@@ -14,7 +14,7 @@ upload:
         export CHANNEL="${CI_COMMIT_REF_SLUG}"
       fi
       echo $CHANNEL
-    - helm package shiny-server
+    - helm package shiny-k8s-toolkit-helm
     - curl --request POST --user gitlab-ci-token:$CI_JOB_TOKEN --form "chart=@${CHART_NAME}-${CHART_VERSION}.tgz" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/helm/api/${CHANNEL}/charts"
 
 
diff --git a/README.md b/README.md
index cc772bfbcee35f80cb4d33c66dc8667d5419592c..6d59c45bb1a904488ce60cae51eca6dc4be53ce7 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,11 @@
 
 To build a package locally, and test it with the example project, you can do:
 ```sh
-helm package shiny-server -d ../*shiny-k8s-example-python/chart/charts/
-helm package shiny-server -d ../*shiny-k8s-example-r/chart/charts/
+helm package shiny-k8s-toolkit-helm -d ../*shiny-k8s-example-python/chart/charts/
+helm package shiny-k8s-toolkit-helm -d ../*shiny-k8s-example-r/chart/charts/
 ```
 
 It will store the package in the appropriate folder, and when you will run 
 `./dohelm.sh` the newest version will be used.
 
-Don't forget to increment the version counter in shiny-server/Chart.yaml
+Don't forget to increment the version counter in shiny-k8s-toolkit-helm/Chart.yaml
diff --git a/shiny-server/.helmignore b/shiny-k8s-toolkit-helm/.helmignore
similarity index 100%
rename from shiny-server/.helmignore
rename to shiny-k8s-toolkit-helm/.helmignore
diff --git a/shiny-server/Chart.yaml b/shiny-k8s-toolkit-helm/Chart.yaml
similarity index 96%
rename from shiny-server/Chart.yaml
rename to shiny-k8s-toolkit-helm/Chart.yaml
index 661666357ddcc938d01d34156a7daf11eab64418..59aef10a3e028a339b6891b74a85880738ec11d3 100644
--- a/shiny-server/Chart.yaml
+++ b/shiny-k8s-toolkit-helm/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: shiny-server
+name: shiny-k8s-toolkit-helm
 description: A Helm chart for deploying shiny app in Kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.7.5
+version: 0.8.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/shiny-server/templates/NOTES.txt b/shiny-k8s-toolkit-helm/templates/NOTES.txt
similarity index 100%
rename from shiny-server/templates/NOTES.txt
rename to shiny-k8s-toolkit-helm/templates/NOTES.txt
diff --git a/shiny-server/templates/_helpers.tpl b/shiny-k8s-toolkit-helm/templates/_helpers.tpl
similarity index 100%
rename from shiny-server/templates/_helpers.tpl
rename to shiny-k8s-toolkit-helm/templates/_helpers.tpl
diff --git a/shiny-server/templates/_secretHelper.tpl b/shiny-k8s-toolkit-helm/templates/_secretHelper.tpl
similarity index 100%
rename from shiny-server/templates/_secretHelper.tpl
rename to shiny-k8s-toolkit-helm/templates/_secretHelper.tpl
diff --git a/shiny-server/templates/deployment.yaml b/shiny-k8s-toolkit-helm/templates/deployment.yaml
similarity index 100%
rename from shiny-server/templates/deployment.yaml
rename to shiny-k8s-toolkit-helm/templates/deployment.yaml
diff --git a/shiny-server/templates/hpa.yaml b/shiny-k8s-toolkit-helm/templates/hpa.yaml
similarity index 100%
rename from shiny-server/templates/hpa.yaml
rename to shiny-k8s-toolkit-helm/templates/hpa.yaml
diff --git a/shiny-server/templates/image-pull-secret.yaml b/shiny-k8s-toolkit-helm/templates/image-pull-secret.yaml
similarity index 100%
rename from shiny-server/templates/image-pull-secret.yaml
rename to shiny-k8s-toolkit-helm/templates/image-pull-secret.yaml
diff --git a/shiny-server/templates/ingress.yaml b/shiny-k8s-toolkit-helm/templates/ingress.yaml
similarity index 100%
rename from shiny-server/templates/ingress.yaml
rename to shiny-k8s-toolkit-helm/templates/ingress.yaml
diff --git a/shiny-server/templates/service.yaml b/shiny-k8s-toolkit-helm/templates/service.yaml
similarity index 100%
rename from shiny-server/templates/service.yaml
rename to shiny-k8s-toolkit-helm/templates/service.yaml
diff --git a/shiny-server/templates/storage.yaml b/shiny-k8s-toolkit-helm/templates/storage.yaml
similarity index 100%
rename from shiny-server/templates/storage.yaml
rename to shiny-k8s-toolkit-helm/templates/storage.yaml
diff --git a/shiny-server/values.yaml b/shiny-k8s-toolkit-helm/values.yaml
similarity index 100%
rename from shiny-server/values.yaml
rename to shiny-k8s-toolkit-helm/values.yaml