diff --git a/.github/workflows/Release-Charts.yml b/.github/workflows/Release-Charts.yml
new file mode 100644
index 0000000..6419b97
--- /dev/null
+++ b/.github/workflows/Release-Charts.yml
@@ -0,0 +1,46 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Release Charts
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the main branch
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Configure Git
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+
+      - name: Install Helm
+        uses: azure/setup-helm@v1
+        with:
+          version: v3.4.0
+
+      - name: Run chart-releaser
+        uses: helm/chart-releaser-action@v1.2.1
+        with:
+          charts_dir: ./
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+
diff --git a/.helmignore b/charts/.helmignore
similarity index 100%
rename from .helmignore
rename to charts/.helmignore
diff --git a/Chart.yaml b/charts/Chart.yaml
similarity index 95%
rename from Chart.yaml
rename to charts/Chart.yaml
index 290ed5a..096fdeb 100644
--- a/Chart.yaml
+++ b/charts/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: selenium3
-version: 1.2.4
+version: 1.2.5
 appVersion: 3.141.59
 description: Chart for selenium 3 grid
 keywords:
diff --git a/LICENSE b/charts/LICENSE
similarity index 100%
rename from LICENSE
rename to charts/LICENSE
diff --git a/README.md b/charts/README.md
similarity index 100%
rename from README.md
rename to charts/README.md
diff --git a/artifacthub-repo.yml b/charts/artifacthub-repo.yml
similarity index 100%
rename from artifacthub-repo.yml
rename to charts/artifacthub-repo.yml
diff --git a/templates/NOTES.txt b/charts/templates/NOTES.txt
similarity index 97%
rename from templates/NOTES.txt
rename to charts/templates/NOTES.txt
index 29608aa..0c75a66 100644
--- a/templates/NOTES.txt
+++ b/charts/templates/NOTES.txt
@@ -1,4 +1,6 @@
-Selenium Hub can be accessed via port {{ .Values.hub.port }} on the following
+selenium 3
+
+Hub can be accessed via port {{ .Values.hub.port }} on the following
 DNS name from within your cluster:
 
 - http://{{ template "selenium.hub.fullname" . }}.{{ .Release.Namespace }}:{{ .Values.hub.port }}
diff --git a/templates/_helpers.tpl b/charts/templates/_helpers.tpl
similarity index 100%
rename from templates/_helpers.tpl
rename to charts/templates/_helpers.tpl
diff --git a/templates/chrome-daemonset.yaml b/charts/templates/chrome-daemonset.yaml
similarity index 100%
rename from templates/chrome-daemonset.yaml
rename to charts/templates/chrome-daemonset.yaml
diff --git a/templates/chrome-deployment.yaml b/charts/templates/chrome-deployment.yaml
similarity index 100%
rename from templates/chrome-deployment.yaml
rename to charts/templates/chrome-deployment.yaml
diff --git a/templates/chromeDebug-daemonset.yaml b/charts/templates/chromeDebug-daemonset.yaml
similarity index 100%
rename from templates/chromeDebug-daemonset.yaml
rename to charts/templates/chromeDebug-daemonset.yaml
diff --git a/templates/chromeDebug-deployment.yaml b/charts/templates/chromeDebug-deployment.yaml
similarity index 100%
rename from templates/chromeDebug-deployment.yaml
rename to charts/templates/chromeDebug-deployment.yaml
diff --git a/templates/firefox-daemonset.yaml b/charts/templates/firefox-daemonset.yaml
similarity index 100%
rename from templates/firefox-daemonset.yaml
rename to charts/templates/firefox-daemonset.yaml
diff --git a/templates/firefox-deployment.yaml b/charts/templates/firefox-deployment.yaml
similarity index 100%
rename from templates/firefox-deployment.yaml
rename to charts/templates/firefox-deployment.yaml
diff --git a/templates/firefoxDebug-daemonset.yaml b/charts/templates/firefoxDebug-daemonset.yaml
similarity index 100%
rename from templates/firefoxDebug-daemonset.yaml
rename to charts/templates/firefoxDebug-daemonset.yaml
diff --git a/templates/firefoxDebug-deployment.yaml b/charts/templates/firefoxDebug-deployment.yaml
similarity index 100%
rename from templates/firefoxDebug-deployment.yaml
rename to charts/templates/firefoxDebug-deployment.yaml
diff --git a/templates/hub-deployment.yaml b/charts/templates/hub-deployment.yaml
similarity index 100%
rename from templates/hub-deployment.yaml
rename to charts/templates/hub-deployment.yaml
diff --git a/templates/hub-service.yaml b/charts/templates/hub-service.yaml
similarity index 100%
rename from templates/hub-service.yaml
rename to charts/templates/hub-service.yaml
diff --git a/templates/ingress.yaml b/charts/templates/ingress.yaml
similarity index 96%
rename from templates/ingress.yaml
rename to charts/templates/ingress.yaml
index cd3949c..ff2b6f0 100644
--- a/templates/ingress.yaml
+++ b/charts/templates/ingress.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.hub.ingress.enabled -}}
 {{- $fullName := include "selenium.hub.fullname" . -}}
 {{- $ingressPath := .Values.hub.ingress.path -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
diff --git a/templates/pvc.yaml b/charts/templates/pvc.yaml
similarity index 100%
rename from templates/pvc.yaml
rename to charts/templates/pvc.yaml
diff --git a/values.yaml b/charts/values.yaml
similarity index 100%
rename from values.yaml
rename to charts/values.yaml