diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index 5dc6dad4d6..41d9408eeb 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -7,8 +7,8 @@ on:
         required: true
 
 jobs:
-  goreleaser:
-    name: Goreleaser
+  bump-version:
+    name: bump-version
     runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.bump-version.outputs.tag }}
@@ -25,42 +25,57 @@ jobs:
           WITH_V: true
           CUSTOM_TAG: ${{ github.event.inputs.version }}
           RELEASE_BRANCHES: master
-      - uses: actions/checkout@v2
+
+  helm-release:
+    name: Flyte helm release
+    runs-on: ubuntu-latest
+    needs: [ bump-version ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
         with:
           fetch-depth: "0"
 
       - name: Install Helm
         uses: azure/setup-helm@v1
-        with:
-          version: v3.4.0
 
       - name: Configure Git
         run: |
           git config user.name "${{ github.actor }}"
           git config user.email "${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>"
+      - name: Preprare Flyte Helm Release
+        env:
+          VERSION: ${{ needs.bump-version.outputs.version }}
+          REPOSITORY: "https://flyteorg.github.io/flyte"
+        run: |
+          make prepare_artifacts
+      - name: Run chart-releaser
+        uses: stefanprodan/helm-gh-pages@v1.4.1
+        with:
+          token: "${{ secrets.FLYTE_BOT_PAT }}"
+          linting: off
+
+
+  manifest-release:
+    name: Flyte manifest release
+    runs-on: ubuntu-latest
+    needs: [ bump-version ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: "0"
 
       - name: Preprare Flyte Release
         env:
-          FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }}
-          VERSION: ${{ github.event.inputs.version }}
+          VERSION: ${{ needs.bump-version.outputs.version }}
         run: |
-          grep -rlZ "version:[^P]*# VERSION" ./helm/Chart.yaml | xargs -0 sed -i "s/version:[^P]*# VERSION/version: ${VERSION} # VERSION/g"
-          sed -i "s/v0.1.10/${VERSION}/g" ./helm/README.md
-          VERSION=$VERSION make prepare_artifacts
-
+          make prepare_artifacts
+          git stash
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
         with:
           version: latest
           args: release --rm-dist --release-notes=CHANGELOG/CHANGELOG-${{ github.event.inputs.version }}.md
         env:
-          GITHUB_TOKEN: ${{ secrets.FLYTE_BOT_PAT }}
-
-      - name: Release helm registry
-        env:
-          FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }}
-          VERSION: ${{ github.event.inputs.version }}
-        run: |
-          grep -rlZ "version:[^P]*# VERSION" ./helm/Chart.yaml | xargs -0 sed -i "s/version:[^P]*# VERSION/version: ${VERSION} # VERSION/g"
-          # Commit Chart registry to github gh-pages
-          bin/cr index --owner flyteorg --git-repo flyte --charts-repo="https://flyteorg.github.io/flyte" --push --token=${FLYTE_BOT_PAT} --release-name-template="{{ .Version }}"
+          GITHUB_TOKEN: ${{ secrets.FLYTE_BOT_PAT }}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 1ae8f1602f..058da7654e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,11 +16,9 @@ docs/searchindex.js
 docs/
 release/
 __pycache__/
-/helm/charts/
-Chart.lock
+/charts/flyte/charts
+/charts/flyte/Chart.lock
 **/*.bak-
-.cr-release-packages/
-.cr-index/
 bin/-
 bin/
 .python-version
diff --git a/.goreleaser.yml b/.goreleaser.yml
index d98a2f1012..9079fd7931 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -11,5 +11,4 @@ release:
   name_template: "Flyte v{{.Version}} milestone release"
   disable: false
   extra_files:
-    - glob: ./release/*
-    - glob: .cr-release-packages/
\ No newline at end of file
+    - glob: ./release/*
\ No newline at end of file
diff --git a/helm/.helmignore b/charts/flyte/.helmignore
similarity index 100%
rename from helm/.helmignore
rename to charts/flyte/.helmignore
diff --git a/helm/Chart.yaml b/charts/flyte/Chart.yaml
similarity index 100%
rename from helm/Chart.yaml
rename to charts/flyte/Chart.yaml
diff --git a/helm/README.md b/charts/flyte/README.md
similarity index 94%
rename from helm/README.md
rename to charts/flyte/README.md
index 79ad7f84e0..45dd6c144c 100644
--- a/helm/README.md
+++ b/charts/flyte/README.md
@@ -97,8 +97,12 @@ helm upgrade -f values-sandbox.yaml flyte .
 | contour | object | `{"affinity":{},"contour":{"resources":{"limits":{"cpu":"100m","memory":"100Mi"},"requests":{"cpu":"10m","memory":"50Mi"}}},"enabled":true,"envoy":{"resources":{"limits":{"cpu":"100m","memory":"100Mi"},"requests":{"cpu":"10m","memory":"50Mi"}}},"nodeSelector":{},"podAnnotations":{},"replicaCount":1,"serviceAccountAnnotations":{},"tolerations":[]}` |  CONTOUR SETTINGS |
 | contour.affinity | object | `{}` | affinity for Contour deployment |
 | contour.contour.resources | object | `{"limits":{"cpu":"100m","memory":"100Mi"},"requests":{"cpu":"10m","memory":"50Mi"}}` | Default resources requests and limits for Contour |
+| contour.contour.resources.limits | object | `{"cpu":"100m","memory":"100Mi"}` | Limits are the maximum set of resources needed for this pod |
+| contour.contour.resources.requests | object | `{"cpu":"10m","memory":"50Mi"}` | Requests are the minimum set of resources needed for this pod |
 | contour.enabled | bool | `true` | - enable or disable Contour deployment installation |
 | contour.envoy.resources | object | `{"limits":{"cpu":"100m","memory":"100Mi"},"requests":{"cpu":"10m","memory":"50Mi"}}` | Default resources requests and limits for Envoy |
+| contour.envoy.resources.limits | object | `{"cpu":"100m","memory":"100Mi"}` | Limits are the maximum set of resources needed for this pod |
+| contour.envoy.resources.requests | object | `{"cpu":"10m","memory":"50Mi"}` | Requests are the minimum set of resources needed for this pod |
 | contour.nodeSelector | object | `{}` | nodeSelector for Contour deployment |
 | contour.podAnnotations | object | `{}` | Annotations for Contour pods |
 | contour.replicaCount | int | `1` | Replicas count for Contour deployment |
@@ -107,7 +111,9 @@ helm upgrade -f values-sandbox.yaml flyte .
 | datacatalog | object | `{"affinity":{},"configPath":"/etc/datacatalog/config/*.yaml","image":{"pullPolicy":"IfNotPresent","repository":"cr.flyte.org/flyteorg/datacatalog","tag":"v0.3.6"},"nodeSelector":{},"podAnnotations":{},"replicaCount":1,"resources":{"limits":{"cpu":"500m","ephemeral-storage":"100Mi","memory":"500Mi"},"requests":{"cpu":"10m","ephemeral-storage":"50Mi","memory":"50Mi"}},"service":{"annotations":{"projectcontour.io/upstream-protocol.h2c":"grpc"},"type":"NodePort"},"serviceAccount":{"annotations":{},"create":true,"imagePullSecrets":{}},"tolerations":[]}` |  DATACATALOG SETTINGS |
 | datacatalog.affinity | object | `{}` | affinity for Datacatalog deployment |
 | datacatalog.configPath | string | `"/etc/datacatalog/config/*.yaml"` | Default regex string for searching configuration files |
+| datacatalog.image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |
 | datacatalog.image.repository | string | `"cr.flyte.org/flyteorg/datacatalog"` | Docker image for Datacatalog deployment |
+| datacatalog.image.tag | string | `"v0.3.6"` | Docker image tag |
 | datacatalog.nodeSelector | object | `{}` | nodeSelector for Datacatalog deployment |
 | datacatalog.podAnnotations | object | `{}` | Annotations for Datacatalog pods |
 | datacatalog.replicaCount | int | `1` | Replicas count for Datacatalog deployment |
@@ -121,9 +127,9 @@ helm upgrade -f values-sandbox.yaml flyte .
 | db.database.host | string | `"postgres"` |  username: postgres |
 | flyteadmin.affinity | object | `{}` | affinity for Flyteadmin deployment |
 | flyteadmin.configPath | string | `"/etc/flyte/config/*.yaml"` | Default regex string for searching configuration files |
-| flyteadmin.image.pullPolicy | string | `"IfNotPresent"` |  |
+| flyteadmin.image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |
 | flyteadmin.image.repository | string | `"cr.flyte.org/flyteorg/flyteadmin"` | Docker image for Flyteadmin deployment |
-| flyteadmin.image.tag | string | `"v0.6.16"` |  |
+| flyteadmin.image.tag | string | `"v0.6.16"` | Docker image tag |
 | flyteadmin.initialProjects | list | `["flytesnacks","flytetester","flyteexamples"]` | Initial projects to create |
 | flyteadmin.nodeSelector | object | `{}` | nodeSelector for Flyteadmin deployment |
 | flyteadmin.podAnnotations | object | `{}` | Annotations for Flyteadmin pods |
@@ -138,7 +144,9 @@ helm upgrade -f values-sandbox.yaml flyte .
 | flyteadmin.tolerations | list | `[]` | tolerations for Flyteadmin deployment |
 | flyteconsole | object | `{"affinity":{},"image":{"pullPolicy":"IfNotPresent","repository":"cr.flyte.org/flyteorg/flyteconsole","tag":"v0.20.1"},"nodeSelector":{},"podAnnotations":{},"replicaCount":1,"resources":{"limits":{"cpu":"500m","memory":"250Mi"},"requests":{"cpu":"10m","memory":"50Mi"}},"service":{"annotations":{},"type":"ClusterIP"},"tolerations":[]}` |  FLYTECONSOLE SETTINGS |
 | flyteconsole.affinity | object | `{}` | affinity for Flyteconsole deployment |
+| flyteconsole.image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |
 | flyteconsole.image.repository | string | `"cr.flyte.org/flyteorg/flyteconsole"` | Docker image for Flyteconsole deployment |
+| flyteconsole.image.tag | string | `"v0.20.1"` | Docker image tag |
 | flyteconsole.nodeSelector | object | `{}` | nodeSelector for Flyteconsole deployment |
 | flyteconsole.podAnnotations | object | `{}` | Annotations for Flyteconsole pods |
 | flyteconsole.replicaCount | int | `1` | Replicas count for Flyteconsole deployment |
@@ -148,7 +156,9 @@ helm upgrade -f values-sandbox.yaml flyte .
 | flytepropeller | object | `{"affinity":{},"cacheSizeMbs":0,"configPath":"/etc/flyte/config/*.yaml","image":{"pullPolicy":"IfNotPresent","repository":"cr.flyte.org/flyteorg/flytepropeller","tag":"v0.13.4"},"nodeSelector":{},"podAnnotations":{},"replicaCount":1,"resources":{"limits":{"cpu":"200m","ephemeral-storage":"100Mi","memory":"200Mi"},"requests":{"cpu":"10m","ephemeral-storage":"50Mi","memory":"50Mi"}},"serviceAccount":{"annotations":{},"create":true,"imagePullSecrets":{}},"tolerations":[]}` |  FLYTEPROPELLER SETTINGS |
 | flytepropeller.affinity | object | `{}` | affinity for Flytepropeller deployment |
 | flytepropeller.configPath | string | `"/etc/flyte/config/*.yaml"` | Default regex string for searching configuration files |
+| flytepropeller.image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |
 | flytepropeller.image.repository | string | `"cr.flyte.org/flyteorg/flytepropeller"` | Docker image for Flytepropeller deployment |
+| flytepropeller.image.tag | string | `"v0.13.4"` | Docker image tag |
 | flytepropeller.nodeSelector | object | `{}` | nodeSelector for Flytepropeller deployment |
 | flytepropeller.podAnnotations | object | `{}` | Annotations for Flytepropeller pods |
 | flytepropeller.replicaCount | int | `1` | Replicas count for Flytepropeller deployment |
@@ -162,17 +172,23 @@ helm upgrade -f values-sandbox.yaml flyte .
 | minio | object | `{"affinity":{},"enabled":true,"image":{"pullPolicy":"IfNotPresent","repository":"minio/minio","tag":"RELEASE.2020-12-16T05-05-17Z"},"nodeSelector":{},"podAnnotations":{},"replicaCount":1,"resources":{"limits":{"cpu":"200m","memory":"512Mi"},"requests":{"cpu":"10m","memory":"128Mi"}},"service":{"annotations":{},"type":"ClusterIP"},"tolerations":[]}` |  MINIO SETTINGS |
 | minio.affinity | object | `{}` | affinity for Minio deployment |
 | minio.enabled | bool | `true` | - enable or disable Minio deployment installation |
+| minio.image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |
 | minio.image.repository | string | `"minio/minio"` | Docker image for Minio deployment |
+| minio.image.tag | string | `"RELEASE.2020-12-16T05-05-17Z"` | Docker image tag |
 | minio.nodeSelector | object | `{}` | nodeSelector for Minio deployment |
 | minio.podAnnotations | object | `{}` | Annotations for Minio pods |
 | minio.replicaCount | int | `1` | Replicas count for Minio deployment |
 | minio.resources | object | `{"limits":{"cpu":"200m","memory":"512Mi"},"requests":{"cpu":"10m","memory":"128Mi"}}` | Default resources requests and limits for Minio deployment |
+| minio.resources.limits | object | `{"cpu":"200m","memory":"512Mi"}` | Limits are the maximum set of resources needed for this pod |
+| minio.resources.requests | object | `{"cpu":"10m","memory":"128Mi"}` | Requests are the minimum set of resources needed for this pod |
 | minio.service | object | `{"annotations":{},"type":"ClusterIP"}` | Service settings for Minio |
 | minio.tolerations | list | `[]` | tolerations for Minio deployment |
 | postgres | object | `{"affinity":{},"enabled":true,"image":{"pullPolicy":"IfNotPresent","repository":"postgres","tag":"10.16"},"nodeSelector":{},"podAnnotations":{},"replicaCount":1,"resources":{"limits":{"cpu":"1000m","memory":"512Mi"},"requests":{"cpu":"10m","memory":"128Mi"}},"service":{"annotations":{},"type":"ClusterIP"},"tolerations":[]}` |  POSTGRES SETTINGS |
 | postgres.affinity | object | `{}` | affinity for Postgres deployment |
 | postgres.enabled | bool | `true` | - enable or disable Postgres deployment installation |
+| postgres.image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |
 | postgres.image.repository | string | `"postgres"` | Docker image for Postgres deployment |
+| postgres.image.tag | string | `"10.16"` | Docker image tag |
 | postgres.nodeSelector | object | `{}` | nodeSelector for Postgres deployment |
 | postgres.podAnnotations | object | `{}` | Annotations for Postgres pods |
 | postgres.replicaCount | int | `1` | Replicas count for Postgres deployment |
@@ -182,7 +198,9 @@ helm upgrade -f values-sandbox.yaml flyte .
 | pytorchoperator | object | `{"affinity":{},"enabled":true,"image":{"pullPolicy":"IfNotPresent","repository":"gcr.io/kubeflow-images-public/pytorch-operator","tag":"v1.0.0-g047cf0f"},"nodeSelector":{},"podAnnotations":{},"replicaCount":1,"resources":{"limits":{"cpu":"500m","memory":"1000M"},"requests":{"cpu":"10m","memory":"50M"}},"service":{"annotations":{},"type":"ClusterIP"},"serviceAccountAnnotations":{},"tolerations":[]}` | -------------------- Distributed Pytorch execution using the K8s Pytorch operator |
 | pytorchoperator.affinity | object | `{}` | affinity for Pytorchoperator deployment |
 | pytorchoperator.enabled | bool | `true` | - enable or disable Pytorchoperator deployment installation |
+| pytorchoperator.image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |
 | pytorchoperator.image.repository | string | `"gcr.io/kubeflow-images-public/pytorch-operator"` | Docker image for Pytorchoperator |
+| pytorchoperator.image.tag | string | `"v1.0.0-g047cf0f"` | Docker image tag |
 | pytorchoperator.nodeSelector | object | `{}` | nodeSelector for Pytorchoperator deployment |
 | pytorchoperator.podAnnotations | object | `{}` | Annotations for Pytorchoperator pods |
 | pytorchoperator.replicaCount | int | `1` | Replicas count for Pytorchoperator deployment |
@@ -193,11 +211,15 @@ helm upgrade -f values-sandbox.yaml flyte .
 | redis | object | `{"affinity":{},"enabled":true,"image":{"pullPolicy":"IfNotPresent","repository":"docker.io/bitnami/redis","tag":"4.0.2-r1"},"nodeSelector":{},"podAnnotations":{},"replicaCount":1,"resources":{"limits":{"cpu":"1000m","memory":"1Gi"},"requests":{"cpu":"10m","memory":"50Mi"}},"service":{"annotations":{},"type":"ClusterIP"},"tolerations":[]}` | -------------------------------------------- Sandbox Configuration Sandbox allows to run flyte without any cloud dependencies and can be run even locally on your laptop. This is achieved by replacing cloud service dependencies by k8s local alternatives. These may not be ideal for a high performance setup, but are great to try out flyte ----------------------------------------------- REDIS SETTINGS |
 | redis.affinity | object | `{}` | affinity for Redis Statefulset |
 | redis.enabled | bool | `true` | - enable or disable Redis Statefulset installation |
+| redis.image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |
 | redis.image.repository | string | `"docker.io/bitnami/redis"` | Docker image for Redis Statefulset |
+| redis.image.tag | string | `"4.0.2-r1"` | Docker image tag |
 | redis.nodeSelector | object | `{}` | nodeSelector for Redis Statefulset |
 | redis.podAnnotations | object | `{}` | Annotations for Redis pods |
 | redis.replicaCount | int | `1` | Replicas count for Redis Statefulset |
 | redis.resources | object | `{"limits":{"cpu":"1000m","memory":"1Gi"},"requests":{"cpu":"10m","memory":"50Mi"}}` | Default resources requests and limits for Redis Statefulset |
+| redis.resources.limits | object | `{"cpu":"1000m","memory":"1Gi"}` | Limits are the maximum needed resources for this pod. |
+| redis.resources.requests | object | `{"cpu":"10m","memory":"50Mi"}` | Requests are the minimum required resources for this pod. |
 | redis.service | object | `{"annotations":{},"type":"ClusterIP"}` | Service settings for Redis |
 | redis.tolerations | list | `[]` | tolerations for Redis Statefulset |
 | sagemaker | object | `{"enabled":false,"plugin_config":{"plugins":{"sagemaker":{"region":"<region>","roleArn":"<arn>"}}}}` | --------------- -- Training on AWS Sagemaker using AWS Sagemaker operator. To actually install the operator, please follow instructions [here](https://github.com/aws/amazon-sagemaker-operator-for-k8s/tree/master/hack/charts/installer/rolebased) Use the config section here to just enable sagemaker plugin in Flyte, after you have installed the operator using the information |
diff --git a/helm/README.md.gotmpl b/charts/flyte/README.md.gotmpl
similarity index 100%
rename from helm/README.md.gotmpl
rename to charts/flyte/README.md.gotmpl
diff --git a/helm/templates/_helpers.tpl b/charts/flyte/templates/_helpers.tpl
similarity index 100%
rename from helm/templates/_helpers.tpl
rename to charts/flyte/templates/_helpers.tpl
diff --git a/helm/templates/admin/cluster_resource_configmap.yaml b/charts/flyte/templates/admin/cluster_resource_configmap.yaml
similarity index 100%
rename from helm/templates/admin/cluster_resource_configmap.yaml
rename to charts/flyte/templates/admin/cluster_resource_configmap.yaml
diff --git a/helm/templates/admin/configmap.yaml b/charts/flyte/templates/admin/configmap.yaml
similarity index 100%
rename from helm/templates/admin/configmap.yaml
rename to charts/flyte/templates/admin/configmap.yaml
diff --git a/helm/templates/admin/cronjob.yaml b/charts/flyte/templates/admin/cronjob.yaml
similarity index 100%
rename from helm/templates/admin/cronjob.yaml
rename to charts/flyte/templates/admin/cronjob.yaml
diff --git a/helm/templates/admin/deployment.yaml b/charts/flyte/templates/admin/deployment.yaml
similarity index 100%
rename from helm/templates/admin/deployment.yaml
rename to charts/flyte/templates/admin/deployment.yaml
diff --git a/helm/templates/admin/rbac.yaml b/charts/flyte/templates/admin/rbac.yaml
similarity index 100%
rename from helm/templates/admin/rbac.yaml
rename to charts/flyte/templates/admin/rbac.yaml
diff --git a/helm/templates/admin/secret-auth.yaml b/charts/flyte/templates/admin/secret-auth.yaml
similarity index 100%
rename from helm/templates/admin/secret-auth.yaml
rename to charts/flyte/templates/admin/secret-auth.yaml
diff --git a/helm/templates/admin/service.yaml b/charts/flyte/templates/admin/service.yaml
similarity index 100%
rename from helm/templates/admin/service.yaml
rename to charts/flyte/templates/admin/service.yaml
diff --git a/helm/templates/common/ingress.yaml b/charts/flyte/templates/common/ingress.yaml
similarity index 100%
rename from helm/templates/common/ingress.yaml
rename to charts/flyte/templates/common/ingress.yaml
diff --git a/helm/templates/common/namespace.yaml b/charts/flyte/templates/common/namespace.yaml
similarity index 100%
rename from helm/templates/common/namespace.yaml
rename to charts/flyte/templates/common/namespace.yaml
diff --git a/helm/templates/common/secret.yaml b/charts/flyte/templates/common/secret.yaml
similarity index 100%
rename from helm/templates/common/secret.yaml
rename to charts/flyte/templates/common/secret.yaml
diff --git a/helm/templates/console/configmap.yaml b/charts/flyte/templates/console/configmap.yaml
similarity index 100%
rename from helm/templates/console/configmap.yaml
rename to charts/flyte/templates/console/configmap.yaml
diff --git a/helm/templates/console/deployment.yaml b/charts/flyte/templates/console/deployment.yaml
similarity index 100%
rename from helm/templates/console/deployment.yaml
rename to charts/flyte/templates/console/deployment.yaml
diff --git a/helm/templates/console/service.yaml b/charts/flyte/templates/console/service.yaml
similarity index 100%
rename from helm/templates/console/service.yaml
rename to charts/flyte/templates/console/service.yaml
diff --git a/helm/templates/datacatalog/configmap.yaml b/charts/flyte/templates/datacatalog/configmap.yaml
similarity index 100%
rename from helm/templates/datacatalog/configmap.yaml
rename to charts/flyte/templates/datacatalog/configmap.yaml
diff --git a/helm/templates/datacatalog/deployment.yaml b/charts/flyte/templates/datacatalog/deployment.yaml
similarity index 100%
rename from helm/templates/datacatalog/deployment.yaml
rename to charts/flyte/templates/datacatalog/deployment.yaml
diff --git a/helm/templates/datacatalog/rbac.yaml b/charts/flyte/templates/datacatalog/rbac.yaml
similarity index 100%
rename from helm/templates/datacatalog/rbac.yaml
rename to charts/flyte/templates/datacatalog/rbac.yaml
diff --git a/helm/templates/datacatalog/service.yaml b/charts/flyte/templates/datacatalog/service.yaml
similarity index 100%
rename from helm/templates/datacatalog/service.yaml
rename to charts/flyte/templates/datacatalog/service.yaml
diff --git a/helm/templates/minio/deployment.yaml b/charts/flyte/templates/minio/deployment.yaml
similarity index 100%
rename from helm/templates/minio/deployment.yaml
rename to charts/flyte/templates/minio/deployment.yaml
diff --git a/helm/templates/minio/service.yaml b/charts/flyte/templates/minio/service.yaml
similarity index 100%
rename from helm/templates/minio/service.yaml
rename to charts/flyte/templates/minio/service.yaml
diff --git a/helm/templates/postgres/deployment.yaml b/charts/flyte/templates/postgres/deployment.yaml
similarity index 100%
rename from helm/templates/postgres/deployment.yaml
rename to charts/flyte/templates/postgres/deployment.yaml
diff --git a/helm/templates/postgres/service.yaml b/charts/flyte/templates/postgres/service.yaml
similarity index 100%
rename from helm/templates/postgres/service.yaml
rename to charts/flyte/templates/postgres/service.yaml
diff --git a/helm/templates/propeller/configmap.yaml b/charts/flyte/templates/propeller/configmap.yaml
similarity index 100%
rename from helm/templates/propeller/configmap.yaml
rename to charts/flyte/templates/propeller/configmap.yaml
diff --git a/helm/templates/propeller/crds/flyteworkflow.yaml b/charts/flyte/templates/propeller/crds/flyteworkflow.yaml
similarity index 100%
rename from helm/templates/propeller/crds/flyteworkflow.yaml
rename to charts/flyte/templates/propeller/crds/flyteworkflow.yaml
diff --git a/helm/templates/propeller/deployment.yaml b/charts/flyte/templates/propeller/deployment.yaml
similarity index 100%
rename from helm/templates/propeller/deployment.yaml
rename to charts/flyte/templates/propeller/deployment.yaml
diff --git a/helm/templates/propeller/rbac.yaml b/charts/flyte/templates/propeller/rbac.yaml
similarity index 100%
rename from helm/templates/propeller/rbac.yaml
rename to charts/flyte/templates/propeller/rbac.yaml
diff --git a/helm/templates/propeller/secret-auth.yaml b/charts/flyte/templates/propeller/secret-auth.yaml
similarity index 100%
rename from helm/templates/propeller/secret-auth.yaml
rename to charts/flyte/templates/propeller/secret-auth.yaml
diff --git a/helm/templates/propeller/webhook.yaml b/charts/flyte/templates/propeller/webhook.yaml
similarity index 100%
rename from helm/templates/propeller/webhook.yaml
rename to charts/flyte/templates/propeller/webhook.yaml
diff --git a/helm/templates/pytorch-operator/crds/pytorchjobs.yaml b/charts/flyte/templates/pytorch-operator/crds/pytorchjobs.yaml
similarity index 100%
rename from helm/templates/pytorch-operator/crds/pytorchjobs.yaml
rename to charts/flyte/templates/pytorch-operator/crds/pytorchjobs.yaml
diff --git a/helm/templates/pytorch-operator/deployment.yaml b/charts/flyte/templates/pytorch-operator/deployment.yaml
similarity index 100%
rename from helm/templates/pytorch-operator/deployment.yaml
rename to charts/flyte/templates/pytorch-operator/deployment.yaml
diff --git a/helm/templates/pytorch-operator/namespace.yaml b/charts/flyte/templates/pytorch-operator/namespace.yaml
similarity index 100%
rename from helm/templates/pytorch-operator/namespace.yaml
rename to charts/flyte/templates/pytorch-operator/namespace.yaml
diff --git a/helm/templates/pytorch-operator/rbac.yaml b/charts/flyte/templates/pytorch-operator/rbac.yaml
similarity index 100%
rename from helm/templates/pytorch-operator/rbac.yaml
rename to charts/flyte/templates/pytorch-operator/rbac.yaml
diff --git a/helm/templates/pytorch-operator/service.yaml b/charts/flyte/templates/pytorch-operator/service.yaml
similarity index 100%
rename from helm/templates/pytorch-operator/service.yaml
rename to charts/flyte/templates/pytorch-operator/service.yaml
diff --git a/helm/templates/redis/service.yaml b/charts/flyte/templates/redis/service.yaml
similarity index 100%
rename from helm/templates/redis/service.yaml
rename to charts/flyte/templates/redis/service.yaml
diff --git a/helm/templates/redis/statefulset.yaml b/charts/flyte/templates/redis/statefulset.yaml
similarity index 100%
rename from helm/templates/redis/statefulset.yaml
rename to charts/flyte/templates/redis/statefulset.yaml
diff --git a/helm/values-eks.yaml b/charts/flyte/values-eks.yaml
similarity index 100%
rename from helm/values-eks.yaml
rename to charts/flyte/values-eks.yaml
diff --git a/helm/values-gcp.yaml b/charts/flyte/values-gcp.yaml
similarity index 100%
rename from helm/values-gcp.yaml
rename to charts/flyte/values-gcp.yaml
diff --git a/helm/values-sandbox.yaml b/charts/flyte/values-sandbox.yaml
similarity index 100%
rename from helm/values-sandbox.yaml
rename to charts/flyte/values-sandbox.yaml
diff --git a/helm/values.yaml b/charts/flyte/values.yaml
similarity index 96%
rename from helm/values.yaml
rename to charts/flyte/values.yaml
index 810922409b..a1147606e5 100755
--- a/helm/values.yaml
+++ b/charts/flyte/values.yaml
@@ -15,7 +15,9 @@ flyteadmin:
   image:
     # -- Docker image for Flyteadmin deployment
     repository: cr.flyte.org/flyteorg/flyteadmin
+    # -- Docker image tag
     tag: v0.6.16 # FLYTEADMIN_TAG
+    # -- Docker image pull policy
     pullPolicy: IfNotPresent
   # -- Default resources requests and limits for Flyteadmin deployment
   resources:
@@ -68,7 +70,9 @@ datacatalog:
   image:
     # -- Docker image for Datacatalog deployment
     repository: cr.flyte.org/flyteorg/datacatalog
+    # -- Docker image tag
     tag: v0.3.6 # DATACATALOG_TAG
+    # -- Docker image pull policy
     pullPolicy: IfNotPresent
   # -- Default resources requests and limits for Datacatalog deployment
   resources:
@@ -114,7 +118,9 @@ flytepropeller:
   image:
     # -- Docker image for Flytepropeller deployment
     repository: cr.flyte.org/flyteorg/flytepropeller
+    # -- Docker image tag
     tag: v0.13.4 # FLYTEPROPELLER_TAG
+    # -- Docker image pull policy
     pullPolicy: IfNotPresent
   # -- Default resources requests and limits for Flytepropeller deployment
   resources:
@@ -157,7 +163,9 @@ flyteconsole:
   image:
     # -- Docker image for Flyteconsole deployment
     repository: cr.flyte.org/flyteorg/flyteconsole
+    # -- Docker image tag
     tag: v0.20.1 # FLYTECONSOLE_TAG
+    # -- Docker image pull policy
     pullPolicy: IfNotPresent
   # -- Default resources requests and limits for Flyteconsole deployment
   resources:
@@ -219,13 +227,17 @@ redis:
   image:
     # -- Docker image for Redis Statefulset
     repository: docker.io/bitnami/redis
+    # -- Docker image tag
     tag: 4.0.2-r1
+    # -- Docker image pull policy
     pullPolicy: IfNotPresent
   # -- Default resources requests and limits for Redis Statefulset
   resources:
+    # -- Requests are the minimum required resources for this pod.
     requests:
       cpu: 10m
       memory: 50Mi
+    # -- Limits are the maximum needed resources for this pod.
     limits:
       cpu: 1000m
       memory: 1Gi
@@ -254,7 +266,9 @@ postgres:
   image:
     # -- Docker image for Postgres deployment
     repository: postgres
+    # -- Docker image tag
     tag: "10.16"
+    # -- Docker image pull policy
     pullPolicy: IfNotPresent
   # -- Default resources requests and limits for Postgres deployment
   resources:
@@ -289,13 +303,17 @@ minio:
   image:
     # -- Docker image for Minio deployment
     repository: minio/minio
+    # -- Docker image tag
     tag: RELEASE.2020-12-16T05-05-17Z
+    # -- Docker image pull policy
     pullPolicy: IfNotPresent
   # -- Default resources requests and limits for Minio deployment
   resources:
+    # -- Requests are the minimum set of resources needed for this pod
     requests:
       cpu: 10m
       memory: 128Mi
+    # -- Limits are the maximum set of resources needed for this pod
     limits:
       cpu: 200m
       memory: 512Mi
@@ -324,18 +342,22 @@ contour:
   contour:
     # -- Default resources requests and limits for Contour
     resources:
+      # -- Requests are the minimum set of resources needed for this pod
       requests:
         cpu: 10m
         memory: 50Mi
+      # -- Limits are the maximum set of resources needed for this pod
       limits:
         cpu: 100m
         memory: 100Mi
   envoy:
     # -- Default resources requests and limits for Envoy
     resources:
+      # -- Requests are the minimum set of resources needed for this pod
       requests:
         cpu: 10m
         memory: 50Mi
+      # -- Limits are the maximum set of resources needed for this pod
       limits:
         cpu: 100m
         memory: 100Mi
@@ -802,7 +824,9 @@ pytorchoperator:
   image:
     # -- Docker image for Pytorchoperator
     repository: gcr.io/kubeflow-images-public/pytorch-operator
+    # -- Docker image tag
     tag: v1.0.0-g047cf0f
+    # -- Docker image pull policy
     pullPolicy: IfNotPresent
   # -- Default resources requests and limits for Pytorchoperator
   resources:
diff --git a/script/generate_helm.sh b/script/generate_helm.sh
index c696a5fa5e..923232d9e0 100644
--- a/script/generate_helm.sh
+++ b/script/generate_helm.sh
@@ -9,10 +9,10 @@ DEPLOYMENT=${1:-sandbox eks gcp}
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
-helm dep update ${DIR}/../helm/
+helm dep update ${DIR}/../charts/flyte/
 
 for deployment in ${DEPLOYMENT}; do
-    helm template flyte -n flyte ${DIR}/../helm/ -f ${DIR}/../helm/values-${deployment}.yaml > ${DIR}/../deployment/${deployment}/flyte_helm_generated.yaml
+    helm template flyte -n flyte ${DIR}/../charts/flyte/ -f ${DIR}/../charts/flyte/values-${deployment}.yaml > ${DIR}/../deployment/${deployment}/flyte_helm_generated.yaml
 done
 
 echo "Generating helm docs"
@@ -21,7 +21,7 @@ then
     GO111MODULE=on go get github.com/norwoodj/helm-docs/cmd/helm-docs
 fi
 
-${GOPATH:-~/go}/bin/helm-docs -t ${DIR}/../helm/README.md.gotmpl ${DIR}/../helm/
+${GOPATH:-~/go}/bin/helm-docs -t ${DIR}/../charts/flyte/README.md.gotmpl ${DIR}/../charts/flyte/
 
 # This section is used by GitHub workflow to ensure that the generation step was run
 if [ -n "$DELTA_CHECK" ]; then
diff --git a/script/prepare_artifacts.sh b/script/prepare_artifacts.sh
index b630b42c2f..7afeb13fad 100644
--- a/script/prepare_artifacts.sh
+++ b/script/prepare_artifacts.sh
@@ -3,10 +3,10 @@
 set -e
 
 # Create dir structure
-mkdir -p release .cr-index .cr-release-packages
+mkdir -p release
 
 # Copy all deployment manifest in release directory
-for file in ./deployment/**/flyte_generated.yaml; do 
+for file in ./deployment/**/flyte_generated.yaml; do
     if [ -f "$file" ]; then
         result=${file/#"./deployment/"}
         result=${result/%"/flyte_generated.yaml"}
@@ -14,17 +14,6 @@ for file in ./deployment/**/flyte_generated.yaml; do
     fi
 done
 
-grep -rlZ "version:[^P]*# VERSION" ./helm/Chart.yaml | xargs -0 sed -i "s/version:[^P]*# VERSION/version: ${VERSION} # VERSION/g"
-
-# Download helm chart releaser
-wget -q -O /tmp/chart-releaser.tar.gz https://github.com/helm/chart-releaser/releases/download/v1.2.1/chart-releaser_1.2.1_linux_amd64.tar.gz 
-mkdir -p bin
-tar -xf /tmp/chart-releaser.tar.gz -C bin
-chmod +x bin/cr
-rm /tmp/chart-releaser.tar.gz 
-
-# Package helm chart
-bin/cr package helm
-
-# Clean git history
-git stash
\ No newline at end of file
+grep -rlZ "version:[^P]*# VERSION" ./charts/flyte/Chart.yaml | xargs -0 sed -i "s/version:[^P]*# VERSION/version: ${VERSION} # VERSION/g"
+sed "s/v0.1.10/${VERSION}/g" ./charts/flyte/README.md  > temp.txt && mv temp.txt ./charts/flyte/README.md
+helm dep update ./charts/flyte