diff --git a/data/deprecated.json b/data/deprecated.json
index 983c121d..d0b3a71c 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -578,6 +578,10 @@
     "old": {"embankment": "true"},
     "replace": {"embankment": "yes"}
   },
+  {
+    "old": {"embassy": "embassy"},
+    "replace": {"embassy": "yes"}
+  },
   {
     "old": {"entrance": "emergency_exit"},
     "replace": {"entrance": "emergency"}
diff --git a/data/fields/embassy.json b/data/fields/embassy.json
index 3fa14fa9..0807132d 100644
--- a/data/fields/embassy.json
+++ b/data/fields/embassy.json
@@ -1,5 +1,18 @@
 {
     "key": "embassy",
+    "label": "Type",
     "type": "combo",
-    "label": "Type"
+    "autoSuggestions": false,
+    "strings": {
+        "options": {
+            "yes": "Embassy",
+            "residence": "Official Residence of an Ambassador",
+            "high_commission": "High Commission",
+            "mission": "Diplomatic Mission",
+            "branch_embassy": "Branch of an Embassy",
+            "nunciature": "Diplomatic Mission of the Holy See",
+            "delegation": "Delegation",
+            "interests_section": "Interests Section"
+        }
+    }
 }
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index 9007822e..b376d06f 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -1064,6 +1064,23 @@ en:
       embassy:
         # embassy=*
         label: Type
+        options:
+          # embassy=branch_embassy
+          branch_embassy: Branch of an Embassy
+          # embassy=delegation
+          delegation: Delegation
+          # embassy=high_commission
+          high_commission: High Commission
+          # embassy=interests_section
+          interests_section: Interests Section
+          # embassy=mission
+          mission: Diplomatic Mission
+          # embassy=nunciature
+          nunciature: Diplomatic Mission of the Holy See
+          # embassy=residence
+          residence: Official Residence of an Ambassador
+          # embassy=yes
+          'yes': Embassy
       emergency:
         # emergency=*
         label: Emergency