diff --git a/assets/layers/postoffices/postoffices.json b/assets/layers/postoffices/postoffices.json
index 70c8b720f..c3295a97c 100644
--- a/assets/layers/postoffices/postoffices.json
+++ b/assets/layers/postoffices/postoffices.json
@@ -406,6 +406,36 @@
           }
         }
       ]
+    },
+    {
+      "id": "has_atm",
+      "question": {
+        "en": "Does this post office have an ATM?",
+        "nl": "Heeft dit postkantoor een bankautomaat?"
+      },
+      "mappings": [
+        {
+          "if": "atm=yes",
+          "then": {
+            "en": "This post office has an ATM",
+            "nl": "Dit postkantoor heeft een bankautomaat"
+          }
+        },
+        {
+          "if": "atm=no",
+          "then": {
+            "en": "This post office does <b>not</b> have an ATM",
+            "nl": "Dit postkantoor heeft <b>geen</b> bankautomaaat"
+          }
+        },
+        {
+          "if": "atm=separate",
+          "then": {
+            "en": "This post office does have an ATM, but it is mapped as a different icon",
+            "nl": "Dit postkantoor heeft een bankautomaat, maar deze staat apart op de kaart aangeduid"
+          }
+        }
+      ]
     }
   ],
   "presets": [
diff --git a/assets/themes/atm/atm.json b/assets/themes/atm/atm.json
index e8340a472..a23e411a4 100644
--- a/assets/themes/atm/atm.json
+++ b/assets/themes/atm/atm.json
@@ -54,7 +54,7 @@
       "override": {
         "minzoom": 18,
         "filter": {
-          "sameAs": "bank"
+          "sameAs": "bank_with_atm"
         }
       }
     },
@@ -126,6 +126,33 @@
           "all_tags"
         ]
       }
+    },
+    {
+      "builtin": "postoffices",
+      "override": {
+        "id": "post_offices_with_atm",
+        "minzoom": 14,
+        "=presets": [],
+        "source": {
+          "osmTags": {
+            "and+": [
+              "atm=yes"
+            ]
+          }
+        },
+        "filter": [
+          "open_now"
+        ]
+      }
+    },
+    {
+      "builtin": "postoffices",
+      "override": {
+        "minzoom": 18,
+        "filter": {
+          "sameAs": "post_offices_with_atm"
+        }
+      }
     }
   ]
-}
\ No newline at end of file
+}