diff --git a/unturnedconfig.json b/unturnedconfig.json
index 1a98ccb..432bde6 100644
--- a/unturnedconfig.json
+++ b/unturnedconfig.json
@@ -152,14 +152,40 @@
     {
         "DisplayName": "Map",
         "Category": "Server Settings",
-        "Description": "Sets the map",
+        "Description": "Sets the map for the server. If Custom is selected, Custom Map Name must also be set",
         "Keywords": "map",
         "FieldName": "Map",
-        "InputType": "text",
+        "InputType": "enum",
         "IsFlagArgument": false,
         "ParamFieldName": "Map",
         "IncludeInCommandLine": false,
         "DefaultValue": "PEI",
+        "EnumValues":{
+            "Alpha Valley":"Alpha Valley (Arena)",
+            "Germany":"Germany",
+            "Monolith":"Monolith (Arena)",
+            "Paintball Arena":"Paintball Arena",
+            "PEI":"PEI (default)",
+            "PEI Arena":"PEI Arena",
+            "Russia":"Russia",
+            "Washington":"Washington",
+            "Washington Arena":"Washington Arena",
+            "Yukon":"Yukon",
+            "{{CustomMap}}":"Custom"
+        }
+    },
+    {
+        "DisplayName":"Custom Map Name",
+        "Category":"Server Settings",
+        "Description":"Sets a custom map name for the server. \"Custom\" type must be selected under Map, and the map files must be installed via Workshop Items",
+        "Keywords":"custom,map",
+        "FieldName":"CustomMap",
+        "InputType":"text",
+        "IsFlagArgument":false,
+        "ParamFieldName":"CustomMap",
+        "IncludeInCommandLine":false,
+        "DefaultValue":"",
+        "Placeholder":"Hawaii",
         "EnumValues":{}
     },
     {