diff --git a/assets/layers/bike_parking/bike_parking.json b/assets/layers/bike_parking/bike_parking.json
index 43c2d46bb..1921f028e 100644
--- a/assets/layers/bike_parking/bike_parking.json
+++ b/assets/layers/bike_parking/bike_parking.json
@@ -903,16 +903,51 @@
         "key": "capacity:cargo_bike",
         "type": "nat"
       },
-      "mappings": [{
+      "mappings": [
+        {
           "if": "cargo_bike=no",
           "then": {
             "en": "There are no dedicated spaces for cargo bikes here or parking cargo bikes here is not allowed",
             "nl": "Hier zijn geen plaatsen voor bakfietsen voorzien of bakfietsen stallen is niet toegestaan "
           },
           "hideInAnswer": "capacity:cargo_bike=",
-        "addExtraTags": ["capacity:cargo_bike="]
-      }],
+          "addExtraTags": [
+            "capacity:cargo_bike="
+          ]
+        }
+      ],
       "id": "Cargo bike capacity?"
+    },
+    {
+      "id": "maxstay",
+      "question": {
+        "en": "What is the maximum allowed parking duration?",
+        "nl": "Wat is de toegestane, maximale parkeerduur?"
+      },
+      "questionHint": {
+        "en": "If the bicycle is parked for a longer amount, it might be removed by the operator",
+        "nl": "Indien een fiets langer geparkeerd staat, kan deze verwijderd worden door de beheerder"
+      },
+      "freeform": {
+        "key": "maxstay",
+        "type": "pnat"
+      },
+      "render": {
+        "en": "A bike can be parked here for at most {canonical(maxstay)}",
+        "nl": "Een fiets mag hier maximaal {canonical(maxstay)} parkeren"
+      }
+    }
+  ],
+  "units": [
+    {
+      "maxstay": {
+        "quantity": "duration",
+        "denominations": [
+          "days",
+          "weeks",
+          "months"
+        ]
+      }
     }
   ],
   "deletion": {
diff --git a/assets/layers/unit/unit.json b/assets/layers/unit/unit.json
index f05fea928..0d45d7662 100644
--- a/assets/layers/unit/unit.json
+++ b/assets/layers/unit/unit.json
@@ -396,7 +396,34 @@
             "nl": "één dag",
             "de": "ein Tag"
           }
+        },
+        {
+          "canonicalDenomination": "weeks",
+          "addSpace": true,
+          "canonicalDenominationSingular": "week",
+          "humanSingular": {
+            "en": "one week",
+            "nl": "één week"
+          },
+          "human": {
+            "en": "{quantity} weeks",
+            "nl": "{quantity} weken"
+          }
+        },
+        {
+          "canonicalDenomination": "months",
+          "addSpace": true,
+          "canonicalDenominationSingular": "month",
+          "humanSingular": {
+            "en": "one month",
+            "nl": "één maand"
+          },
+          "human": {
+            "en": "{quantity} months",
+            "nl": "{quantity} maanden"
+          }
         }
+
       ]
     }
   ]
diff --git a/src/Models/ThemeConfig/Json/LayerConfigJson.ts b/src/Models/ThemeConfig/Json/LayerConfigJson.ts
index fdcc794f4..75fccf1d6 100644
--- a/src/Models/ThemeConfig/Json/LayerConfigJson.ts
+++ b/src/Models/ThemeConfig/Json/LayerConfigJson.ts
@@ -510,6 +510,9 @@ export interface LayerConfigJson {
     allowSplit?: boolean
 
     /**
+     * Either a list with [{"key": "unitname", "key2": {"quantity": "unitname", "denominations": ["denom", "denom"]}}]
+     *
+     *
      * @see UnitConfigJson
      *
      * group: editing