diff --git a/apps/search_indexes/documents/product.py b/apps/search_indexes/documents/product.py
index 35b1956a..13943191 100644
--- a/apps/search_indexes/documents/product.py
+++ b/apps/search_indexes/documents/product.py
@@ -34,7 +34,19 @@ class ProductDocument(Document):
             'id': fields.IntegerField(),
             'name': fields.KeywordField(),
             'slug': fields.KeywordField(),
-            # 'city' TODO: city indexing
+            'address': fields.ObjectField(
+                properties={
+                    'city': fields.ObjectField(
+                        properties={
+                            'country': fields.ObjectField(
+                                properties={
+                                    'code': fields.KeywordField()
+                                }
+                            )
+                        }
+                    )
+                }
+            )
         }
     )
     wine_colors = fields.ObjectField(
diff --git a/apps/search_indexes/views.py b/apps/search_indexes/views.py
index 46f25545..783754c7 100644
--- a/apps/search_indexes/views.py
+++ b/apps/search_indexes/views.py
@@ -243,7 +243,7 @@ class ProductDocumentViewSet(BaseDocumentViewSet):
             'lookups': [constants.LOOKUP_QUERY_IN],
         },
         'country': {
-            'field': 'wine_region.country.code',
+            'field': 'establishment.address.city.country.code',
         },
         'wine_colors_id': {
             'field': 'wine_colors.id',