diff --git a/assets/layers/filters/filters.json b/assets/layers/filters/filters.json
index 40270aea1..fa436162b 100644
--- a/assets/layers/filters/filters.json
+++ b/assets/layers/filters/filters.json
@@ -545,7 +545,24 @@
           "osmTags": "kids_area!=no"
         }
       ]
+    },
+    {
+      "id": "self_checkout",
+      "options": [
+        {
+          "question": {
+            "en": "Has self-checkout",
+            "nl": "Heeft zelfscan"
+          },
+          "osmTags": {
+            "or": [
+              "self_checkout=yes",
+              "self_checkout=only"
+            ]
+          }
+        }
+      ]
     }
   ],
   "allowMove": false
-}
+}
\ No newline at end of file
diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json
index a6ccc291a..a5c92897f 100644
--- a/assets/layers/questions/questions.json
+++ b/assets/layers/questions/questions.json
@@ -3543,6 +3543,81 @@
       "filter": [
         "filters.kids_area"
       ]
+    },
+    {
+      "id": "self_checkout",
+      "labels": [
+        "self_checkout_questions"
+      ],
+      "question": {
+        "en": "Does this place offer self-checkout?",
+        "nl": "Biedt deze plaats zelfscannen aan?"
+      },
+      "questionHint": {
+        "en": "e.g. handheld scanners or a self-checkout kiosk",
+        "nl": "bijv. handscanners of een zelfscankassa"
+      },
+      "mappings": [
+        {
+          "if": "self_checkout=yes",
+          "then": {
+            "en": "This place offers self-checkout",
+            "nl": "Deze plaats biedt zelfscannen aan"
+          }
+        },
+        {
+          "if": "self_checkout=no",
+          "then": {
+            "en": "This place does not offer self-checkout",
+            "nl": "Deze plaats biedt geen zelfscannen aan"
+          }
+        },
+        {
+          "if": "self_checkout=only",
+          "then": {
+            "en": "This place <b>only</b> offers self-checkout",
+            "nl": "Deze plaats biedt <b>enkel</b> zelfscannen aan"
+          }
+        }
+      ],
+      "filter": [
+        "filters.self_checkout"
+      ]
+    },
+    {
+      "id": "self_checkout_type",
+      "labels": [
+        "self_checkout_questions"
+      ],
+      "question": {
+        "en": "What kind of self-checkout does this place offer?",
+        "nl": "Wat voor soort zelfscannen biedt deze plaats aan?"
+      },
+      "mappings": [
+        {
+          "if": "self_checkout:handheld=yes",
+          "ifnot": "self_checkout:handheld=no",
+          "then": {
+            "en": "This place offers self-checkout using a handheld scanner",
+            "nl": "Deze plaats biedt zelfscannen met een handscanner aan"
+          }
+        },
+        {
+          "if": "self_checkout:self_scan=yes",
+          "ifnot": "self_checkout:self_scan=no",
+          "then": {
+            "en": "This place offers self-checkout using a self-checkout kiosk",
+            "nl": "Deze plaats biedt zelfscannen met een zelfscankassa aan"
+          }
+        }
+      ],
+      "condition": {
+        "or": [
+          "self_checkout=yes",
+          "self_checkout=only"
+        ]
+      },
+      "multiAnswer": true
     }
   ],
   "allowMove": false,
diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json
index a17a015ed..cb835446e 100644
--- a/assets/layers/shops/shops.json
+++ b/assets/layers/shops/shops.json
@@ -1644,7 +1644,8 @@
       }
     },
     "description",
-    "toilet_at_amenity_lib.all"
+    "toilet_at_amenity_lib.all",
+    "self_checkout_questions"
   ],
   "filter": [
     {
@@ -1715,4 +1716,4 @@
     ]
   },
   "allowMove": true
-}
+}
\ No newline at end of file