diff --git a/features_capability.json b/features_capability.json
index 96526c85a08..af1d4709aca 100644
--- a/features_capability.json
+++ b/features_capability.json
@@ -14,5 +14,9 @@
   "definitions/gpuConfiguration": {
     "stable": {"min":  "20.12-ALPHA"},
     "nightlies": {"min":  "20.10-MASTER-somever"}
+  },
+  "definitions/timezone": {
+    "stable": {"min":  "20.12-ALPHA"},
+    "nightlies": {"min":  "20.12-MASTER"}
   }
 }
\ No newline at end of file
diff --git a/test/plex/2.1.0/questions.yaml b/test/plex/2.1.0/questions.yaml
index e2328f9e339..a21fd9adc96 100644
--- a/test/plex/2.1.0/questions.yaml
+++ b/test/plex/2.1.0/questions.yaml
@@ -111,7 +111,9 @@ questions:
     group: "Plex Configuration"
     schema:
       type: string
-      default: "UTC"
+      default: "Etc/UTC"
+      $ref:
+        - "definitions/timezone"
 
   # Update strategy
   - variable: strategyType