diff --git a/deploy/docker/druid-jobs/supervisor-spec.json b/deploy/docker/druid-jobs/supervisor-spec.json
index 33fd45b0a3..4af3850a5c 100644
--- a/deploy/docker/druid-jobs/supervisor-spec.json
+++ b/deploy/docker/druid-jobs/supervisor-spec.json
@@ -19,8 +19,16 @@
               "ServiceName",
               "References",
               "Tags",
-              "TagsKeys",
-              "TagsValues",
+              { 
+                  "type": "string",
+                  "name": "TagsKeys", 
+                  "multiValueHandling": "ARRAY" 
+              },
+              { 
+                  "type": "string",
+                  "name": "TagsValues", 
+                  "multiValueHandling": "ARRAY" 
+              },
               { "name": "DurationNano", "type": "Long" },
               { "name": "Kind", "type": "int" }
             ]
diff --git a/deploy/kubernetes/jobs/supervisor/supervisor-config.yaml b/deploy/kubernetes/jobs/supervisor/supervisor-config.yaml
index 811df2e140..6ad6db1f5b 100644
--- a/deploy/kubernetes/jobs/supervisor/supervisor-config.yaml
+++ b/deploy/kubernetes/jobs/supervisor/supervisor-config.yaml
@@ -25,8 +25,16 @@ data:
                 "ServiceName",
                 "References",
                 "Tags",
-                "TagsKeys",
-                "TagsValues",
+                { 
+                    "type": "string",
+                    "name": "TagsKeys", 
+                    "multiValueHandling": "ARRAY" 
+                },
+                { 
+                    "type": "string",
+                    "name": "TagsValues", 
+                    "multiValueHandling": "ARRAY" 
+                },
                 { "name": "DurationNano", "type": "Long" },
                 { "name": "Kind", "type": "int" }
               ]