diff --git a/.github/main.workflow b/.github/main.workflow
deleted file mode 100644
index 65b700fc..00000000
--- a/.github/main.workflow
+++ /dev/null
@@ -1,71 +0,0 @@
-# workflow "Publish Helm chart(s)" {
-#   resolves = [
-#     "Package Helm Chart(s)",
-#     "Filter: not deleted",
-#   ]
-#   on = "push"
-# }
-
-# workflow "Pull Requests" {
-#   on = "pull_request"
-#   resolves = [
-#     "Lint changed chart(s) in pull request",
-#   ]
-# }
-
-# action "Package Helm Chart(s)" {
-#   uses = "billimek/gh-actions/helm-gh-pages@master"
-#   args = "https://billimek.com/billimek-charts/"
-#   secrets = [
-#     "GITHUB_TOKEN",
-#     "COMMIT_EMAIL",
-#     "ACCESS_TOKEN",
-#   ]
-#   needs = ["Filter: not deleted"]
-#   env = {
-#     SKIP_LINTING = "true"
-#   }
-# }
-
-# action "Filter: action 'opened|synchronize'" {
-#   uses = "actions/bin/filter@master"
-#   args = "action 'opened|synchronize'"
-#   secrets = ["GITHUB_TOKEN"]
-#   needs = ["Filter: not master branch"]
-# }
-
-# action "Lint changed chart(s) in pull request" {
-#   uses = "billimek/gh-actions/helm-gh-pages@master"
-#   args = "https://billimek.com/billimek-charts/"
-#   secrets = ["GITHUB_TOKEN"]
-#   needs = ["Filter: action 'opened|synchronize'"]
-# }
-
-# action "Filter: master branch" {
-#   uses = "actions/bin/filter@master"
-#   args = "branch master"
-#   secrets = ["GITHUB_TOKEN"]
-# }
-
-# action "Filter: not deleted" {
-#   uses = "actions/bin/filter@master"
-#   args = "not deleted"
-#   secrets = ["GITHUB_TOKEN"]
-#   needs = ["Filter: master branch"]
-# }
-
-# action "Filter: not master branch" {
-#   uses = "actions/bin/filter@master"
-#   args = "not branch master"
-#   secrets = ["GITHUB_TOKEN"]
-# }
-
-# workflow "on pull request merge, delete the branch" {
-#   resolves = ["branch cleanup"]
-#   on = "pull_request"
-# }
-
-# action "branch cleanup" {
-#   uses = "jessfraz/branch-cleanup-action@master"
-#   secrets = ["GITHUB_TOKEN"]
-# }
diff --git a/.github/workflows/ct.yaml b/.github/workflows/ct.yaml
new file mode 100644
index 00000000..05a67fa1
--- /dev/null
+++ b/.github/workflows/ct.yaml
@@ -0,0 +1,4 @@
+helm-extra-args: --timeout 600
+chart-dirs:
+  - .
+  - kube-plex/charts
\ No newline at end of file
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
new file mode 100644
index 00000000..bba1c6c1
--- /dev/null
+++ b/.github/workflows/lint-test.yaml
@@ -0,0 +1,27 @@
+name: Lint and Test Charts
+
+on: pull_request
+
+jobs:
+  lint-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+
+      - name: Run chart-testing (lint)
+        id: lint
+        uses: helm/chart-testing-action@v1.0.0-alpha.3
+        with:
+          command: lint --config .github/workflows/ct.yaml
+
+      - name: Create kind cluster
+        uses: helm/kind-action@v1.0.0-alpha.3
+        with:
+          install_local_path_provisioner: true
+        if: steps.lint.outputs.changed == 'true'
+
+      - name: Run chart-testing (install)
+        uses: helm/chart-testing-action@v1.0.0-alpha.3
+        with:
+          command: install
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
new file mode 100644
index 00000000..3554b29e
--- /dev/null
+++ b/.github/workflows/release.yaml
@@ -0,0 +1,36 @@
+name: Release Charts
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+
+      - name: Configure Git
+        run: |
+          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 -sSLo get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get
+          chmod 700 get_helm.sh
+          ./get_helm.sh
+          helm init --client-only
+
+      - name: Add dependency chart repos
+        run: |
+          helm repo add stable https://kubernetes-charts.storage.googleapis.com/
+          helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com/
+
+      - name: Run chart-releaser
+        uses: helm/chart-releaser-action@v1.0.0-alpha.2
+        env:
+          CR_TOKEN: "${{ secrets.CR_TOKEN }}"