diff --git a/.github/workflows/on-push-lint-charts.yml b/.github/workflows/on-push-lint-charts.yml
index 334d616..b0a8036 100644
--- a/.github/workflows/on-push-lint-charts.yml
+++ b/.github/workflows/on-push-lint-charts.yml
@@ -3,7 +3,7 @@ name: Lint and Test Charts
 on: 
   push:
     paths:
-      - 'charts/**'   
+      - 'deploy/helm/charts/**' 
       - '.github/**'            
 
 jobs:
@@ -15,20 +15,20 @@ jobs:
           
       - name: Run chart-testing (lint)
         id: lint
-        uses: helm/chart-testing-action@v1.0.0-rc.1
+        uses: helm/chart-testing-action@v1.0.0
         with:
           config: .ci/ct-config.yaml
           command: lint
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.0.0-alpha.3
+        uses: helm/kind-action@v1.0.0
         with:
           install_local_path_provisioner: true
         # Only build a kind cluster if there are chart changes to test.
         if: steps.lint.outputs.changed == 'true'
 
       - name: Run chart-testing (install)
-        uses: helm/chart-testing-action@v1.0.0-rc.1
+        uses: helm/chart-testing-action@v1.0.0
         with:
           command: install
           config: .ci/ct-config.yaml
diff --git a/.github/workflows/on-push-master-publish-chart.yml b/.github/workflows/on-push-master-publish-chart.yml
index acb2e87..5d62699 100644
--- a/.github/workflows/on-push-master-publish-chart.yml
+++ b/.github/workflows/on-push-master-publish-chart.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - master
     paths:
-      - 'charts/**'
+      - 'deploy/helm/charts/**' 
       - '.github/**'         
       
 jobs:
@@ -24,14 +24,9 @@ jobs:
         git config user.name "$GITHUB_ACTOR"
         git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
-    # See https://github.com/helm/chart-releaser-action/issues/6
-    - name: Install Helm
-      run: |
-        curl -fsSLo get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3
-        chmod 700 get_helm.sh
-        ./get_helm.sh
-
     - name: Run chart-releaser
-      uses: helm/chart-releaser-action@v1.0.0-rc.1
+      uses: helm/chart-releaser-action@v1.0.0
+      with:
+        charts_dir: deploy/helm/charts/      
       env:
         CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
\ No newline at end of file
diff --git a/deploy/helm/charts/portainer/Chart.yaml b/deploy/helm/charts/portainer/Chart.yaml
index 29a6352..0d7de35 100644
--- a/deploy/helm/charts/portainer/Chart.yaml
+++ b/deploy/helm/charts/portainer/Chart.yaml
@@ -16,14 +16,14 @@ 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.
-version: 0.0.1-fp1
+version: 1.0.0-pre1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 1.0.0
+appVersion: 2.0.0
 
 sources:
-    - https://github.com/portainer/portainer-k8s
+    - https://github.com/portainer/k8s
 
 maintainers:
     - name: funkypenguin
diff --git a/deploy/manifests/portainer/portainer.yaml b/deploy/manifests/portainer/portainer.yaml
index 52e70b0..289917b 100644
--- a/deploy/manifests/portainer/portainer.yaml
+++ b/deploy/manifests/portainer/portainer.yaml
@@ -4,14 +4,14 @@ kind: "PersistentVolumeClaim"
 apiVersion: "v1"
 metadata:
   name: portainer
-  namespace: portainer
+  namespace: portainer  
   annotations:
     volume.alpha.kubernetes.io/storage-class: "generic"
   labels:
     io.portainer.kubernetes.application.stack: portainer
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "1.0.0"
+    app.kubernetes.io/version: "2.0.0"
 spec:
   accessModes:
     - "ReadWriteOnce"
@@ -28,7 +28,7 @@ metadata:
   labels:
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "1.0.0"
+    app.kubernetes.io/version: "2.0.0"
 ---
 # Source: portainer/templates/rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -38,7 +38,7 @@ metadata:
   labels:
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "1.0.0"
+    app.kubernetes.io/version: "2.0.0"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -58,7 +58,7 @@ metadata:
     io.portainer.kubernetes.application.stack: portainer
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "1.0.0"
+    app.kubernetes.io/version: "2.0.0"
 spec:
   type: ClusterIP
   ports:
@@ -84,7 +84,7 @@ metadata:
     io.portainer.kubernetes.application.stack: portainer
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "1.0.0"
+    app.kubernetes.io/version: "2.0.0"
 spec:
   replicas: 1
   selector:
@@ -101,7 +101,7 @@ spec:
       volumes:
          - name: "data"
            persistentVolumeClaim:
-             claimName: portainer
+             claimName: portainer      
       containers:
         - name: portainer
           image: "portainer/portainer-ce:latest"
@@ -115,7 +115,7 @@ spec:
               protocol: TCP
             - name: tcp-edge
               containerPort: 8000
-              protocol: TCP
+              protocol: TCP              
           livenessProbe:
             httpGet:
               path: /
@@ -126,3 +126,4 @@ spec:
               port: 9000
           resources:
             {}
+