diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlMetaIndex.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlMetaIndex.java
index 58978537cd2c2..a373c4b9a70fd 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlMetaIndex.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlMetaIndex.java
@@ -17,7 +17,7 @@ public final class MlMetaIndex {
 
     private static final String INDEX_NAME = ".ml-meta";
     private static final String MAPPINGS_VERSION_VARIABLE = "xpack.ml.version";
-    private static final int META_INDEX_MAPPINGS_VERSION = 1;
+    private static final int META_INDEX_MAPPINGS_VERSION = 2;
 
     /**
      * Where to store the ml info in Elasticsearch - must match what's
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/calendars/ScheduledEvent.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/calendars/ScheduledEvent.java
index 84f61a1fbeb20..c6fa4e052c683 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/calendars/ScheduledEvent.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/calendars/ScheduledEvent.java
@@ -219,7 +219,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         builder.field(DESCRIPTION.getPreferredName(), description);
         builder.timeField(START_TIME.getPreferredName(), START_TIME.getPreferredName() + "_string", startTime.toEpochMilli());
         builder.timeField(END_TIME.getPreferredName(), END_TIME.getPreferredName() + "_string", endTime.toEpochMilli());
-        // TODO: Check if this needs to be behind a feature flag?
         builder.field(SKIP_RESULT.getPreferredName(), skipResult);
         builder.field(SKIP_MODEL_UPDATE.getPreferredName(), skipModelUpdate);
         if (forceTimeShift != null) {
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/ml/meta_index_mappings.json b/x-pack/plugin/core/template-resources/src/main/resources/ml/meta_index_mappings.json
index a7bbeb880f522..5862e5d195f25 100644
--- a/x-pack/plugin/core/template-resources/src/main/resources/ml/meta_index_mappings.json
+++ b/x-pack/plugin/core/template-resources/src/main/resources/ml/meta_index_mappings.json
@@ -37,13 +37,13 @@
         "type": "date"
       },
       "skip_result": {
-        "type": "keyword"
+        "type": "boolean"
       },
       "skip_model_update": {
-        "type": "keyword"
+        "type": "boolean"
       },
       "force_time_shift": {
-        "type": "keyword"
+        "type": "integer"
       },
       "type": {
         "type": "keyword"