diff --git a/helm/vitess/examples/minikube.yaml b/helm/vitess/examples/minikube.yaml
index 114a7654cdc..c0b50d6fea5 100644
--- a/helm/vitess/examples/minikube.yaml
+++ b/helm/vitess/examples/minikube.yaml
@@ -12,38 +12,40 @@ topology:
         authType: "none"
       keyspaces:
         - name: "messagedb"
-          schema: |-
-            CREATE TABLE messages (
-              page BIGINT(20) UNSIGNED,
-              time_created_ns BIGINT(20) UNSIGNED,
-              message VARCHAR(10000),
-              PRIMARY KEY (page, time_created_ns)
-            ) ENGINE=InnoDB
-          vschema: |-
-            {
-              "sharded": true,
-              "vindexes": {
-                "hash": {
-                  "type": "hash"
-                }
-              },
-              "tables": {
-                "messages": {
-                  "column_vindexes": [
-                    {
-                      "column": "page",
-                      "name": "hash"
-                    }
-                  ]
-                }
-              }
-            }
           shards:
             - name: "0"
               tablets:
                 - type: "replica"
                   vttablet:
                     replicas: 2
+          schema:
+            phase1: |-
+              CREATE TABLE messages (
+                page BIGINT(20) UNSIGNED,
+                time_created_ns BIGINT(20) UNSIGNED,
+                message VARCHAR(10000),
+                PRIMARY KEY (page, time_created_ns)
+              ) ENGINE=InnoDB
+          vschema:
+            phase1: |-
+              {
+                "sharded": true,
+                "vindexes": {
+                  "hash": {
+                    "type": "hash"
+                  }
+                },
+                "tables": {
+                  "messages": {
+                    "column_vindexes": [
+                      {
+                        "column": "page",
+                        "name": "hash"
+                      }
+                    ]
+                  }
+                }
+              }
 
 etcd:
   replicas: 1
diff --git a/helm/vitess/templates/_keyspace.tpl b/helm/vitess/templates/_keyspace.tpl
index 91c20951110..979e5827878 100644
--- a/helm/vitess/templates/_keyspace.tpl
+++ b/helm/vitess/templates/_keyspace.tpl
@@ -15,8 +15,9 @@
 
 # define image to use
 {{- $vitessTag := .vitessTag | default $defaultVtctlclient.vitessTag -}}
+{{- $secrets := .secrets | default $defaultVtctlclient.secrets }}
 
-{{- if $keyspace.schema }}
+{{- range $name, $schema := $keyspace.schema }}
 ---
 ###################################
 # ApplySchema Job
@@ -24,7 +25,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ $keyspaceClean }}-apply-schema
+  name: {{ $keyspaceClean }}-apply-schema-{{ $name }}
 spec:
   backoffLimit: 1
   template:
@@ -76,14 +77,14 @@ spec:
             done
 
             vtctlclient ${VTCTL_EXTRA_FLAGS[@]} -server $VTCTLD_SVC ApplySchema -sql "$(cat <<END_OF_COMMAND
-{{ $keyspace.schema | indent 14}}
+{{ $schema | indent 14}}
             END_OF_COMMAND
             )" {{ $keyspace.name }}
       volumes:
-{{ include "user-secret-volumes" (.secrets | default $defaultVtctlclient.secrets) | indent 8 }}
+{{ include "user-secret-volumes" $secrets | indent 8 }}
 {{ end }}
 
-{{- if $keyspace.vschema }}
+{{- range $name, $vschema := $keyspace.vschema }}
 ---
 ###################################
 # ApplyVSchema job
@@ -91,7 +92,7 @@ spec:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ $keyspaceClean }}-apply-vschema
+  name: {{ $keyspaceClean }}-apply-vschema-{{ $name }}
 spec:
   backoffLimit: 1
   template:
@@ -124,11 +125,11 @@ spec:
             done
 
             vtctlclient ${VTCTL_EXTRA_FLAGS[@]} -server $VTCTLD_SVC ApplyVSchema -vschema "$(cat <<END_OF_COMMAND
-{{ $keyspace.vschema | indent 14 }}
+{{ $vschema | indent 14 }}
             END_OF_COMMAND
             )" {{ $keyspace.name }}
       volumes:
-{{ include "user-secret-volumes" (.secrets | default $defaultVtctlclient.secrets) | indent 8 }}
+{{ include "user-secret-volumes" $secrets | indent 8 }}
 
 {{- end -}}
 {{- end -}}