diff --git a/README.md b/README.md
index 37279cb..7dcc890 100644
--- a/README.md
+++ b/README.md
@@ -130,17 +130,21 @@ helm delete nango
 |                          | global.serviceAccountName       | default      |
 |                          | global.secretName               | nango-secret |
 | server                   | name                           | server       |
+|                          | tag                            | enterprise   |
 |                          | useLoadBalancer                | true         |
 |                          | replicas                       | 1            |
 | jobs                     | name                           | jobs         |
+|                          | tag                            | enterprise   |
 |                          | replicas                       | 1            |
 |                          | volume.name                    | flows-volume |
 |                          | volume.claimName               | flow-claim   |
 |                          | volume.aws                     | false        |
 |                          | volume.gcp                     | false        |
 | runner                   | name                           | runner       |
+|                          | tag                            | enterprise   |
 |                          | replicas                       | 1            |
 | persist                  | name                           | persist      |
+|                          | tag                            | enterprise   |
 |                          | replicas                       | 1            |
 |                          | url                            | http://nango-persist |
 | shared                   | namespace                      | default      |
diff --git a/charts/nango/Chart.yaml b/charts/nango/Chart.yaml
index a3abc9b..eef287e 100644
--- a/charts/nango/Chart.yaml
+++ b/charts/nango/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: nango
 type: application
-version: 0.0.20
+version: 0.0.21
 appVersion: 0.0.2
 dependencies:
   - condition: postgresql.enabled
diff --git a/charts/nango/templates/jobs/jobs-deployment.yaml b/charts/nango/templates/jobs/jobs-deployment.yaml
index 3ac3ac8..ae74722 100644
--- a/charts/nango/templates/jobs/jobs-deployment.yaml
+++ b/charts/nango/templates/jobs/jobs-deployment.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: {{ .Values.jobs.name | default "nango-jobs" }}
-          image: nangohq/nango-jobs:enterprise
+          image: nangohq/nango-jobs:{{ .Values.jobs.tag | default "enterprise" }}
           imagePullPolicy: {{ .Values.imagePullPolicy | default "Always" }}
           env:
             - name: NANGO_DB_HOST
diff --git a/charts/nango/templates/persist/persist-deployment.yaml b/charts/nango/templates/persist/persist-deployment.yaml
index 2daecb9..c9771e1 100644
--- a/charts/nango/templates/persist/persist-deployment.yaml
+++ b/charts/nango/templates/persist/persist-deployment.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: {{ .Values.persist.name | default "nango-persist" }}
-          image: nangohq/nango-persist:enterprise
+          image: nangohq/nango-persist:{{ .Values.persist.tag | default "enterprise" }}
           imagePullPolicy: {{ .Values.imagePullPolicy | default "Always" }}
           env:
             - name: NANGO_DB_HOST
diff --git a/charts/nango/templates/runner/runner-deployment.yaml b/charts/nango/templates/runner/runner-deployment.yaml
index 72e6a6e..6a1ad82 100644
--- a/charts/nango/templates/runner/runner-deployment.yaml
+++ b/charts/nango/templates/runner/runner-deployment.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: {{ .Values.runner.name | default "nango-runner" }}
-          image: nangohq/nango-runner:enterprise
+          image: nangohq/nango-runner:{{ .Values.runner.tag | default "enterprise" }}
           imagePullPolicy: {{ .Values.imagePullPolicy | default "Always" }}
           env:
             - name: PERSIST_SERVICE_URL
diff --git a/charts/nango/templates/server/server-deployment.yaml b/charts/nango/templates/server/server-deployment.yaml
index 9f6c1a9..0b424d5 100644
--- a/charts/nango/templates/server/server-deployment.yaml
+++ b/charts/nango/templates/server/server-deployment.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: {{ .Values.server.name | default "nango-server" }}
-          image: nangohq/nango-server:enterprise
+          image: nangohq/nango-server:{{ .Values.persist.tag | default "enterprise" }}
           imagePullPolicy: {{ .Values.imagePullPolicy  | default "Always" }}
           ports:
             - containerPort: 3003