diff --git a/_events/2022-0921-opensearchcon.markdown b/_events/2022-0921-opensearchcon.markdown
index 2d4ab8c1fe..9f94bbc0a2 100644
--- a/_events/2022-0921-opensearchcon.markdown
+++ b/_events/2022-0921-opensearchcon.markdown
@@ -2,11 +2,14 @@
 
 eventdate: 2022-09-21 10:00:00 -0700
 title: OpenSearchCon - 2022-09-21
-online: 
+online: false
 signup:
     url: https://opensearchcon.splashthat.com/
     title: Register to attend
-
+tz: America/Los_Angeles
+location:
+  city: Seattle
+  country: USA
 ---
 
 OpenSearchCon - A one-day conference for the community!
diff --git a/_events/2022-1024-open-observability-day.markdown b/_events/2022-1024-open-observability-day.markdown
index c407aefd2c..51d64b4487 100644
--- a/_events/2022-1024-open-observability-day.markdown
+++ b/_events/2022-1024-open-observability-day.markdown
@@ -7,7 +7,9 @@ tz: America/Detroit
 signup:
     url: https://events.linuxfoundation.org/open-observability-day-north-america/
     title: Meet us there!
-
+location:
+  city: Detroit
+  country: USA
 ---
 
 Join the OpenSearch team at [Open Observability Day](https://events.linuxfoundation.org/open-observability-day-north-america/).
diff --git a/_events/2022-1107-ubuntu-summit.markdown b/_events/2022-1107-ubuntu-summit.markdown
index 04de4374dc..47c6943152 100644
--- a/_events/2022-1107-ubuntu-summit.markdown
+++ b/_events/2022-1107-ubuntu-summit.markdown
@@ -1,13 +1,15 @@
 ---
 
-eventdate: 2022-11-07 08:00:00 +0200
+eventdate: 2022-11-07 08:00:00 +0100
 title: Ubuntu Summit - 2022-11-07 through 11-09
 online: false
 tz: Europe/Prague
 signup:
     url: https://events.canonical.com/event/2/
     title: Meet us there!
-
+location:
+  city: Prague
+  country: Czech Republic
 ---
 
 Join the OpenSearch team at [Ubuntu Summit 2022](https://events.canonical.com/event/2/).
diff --git a/_events/2023-0205-opensearch-at-fosdem23 copy.markdown b/_events/2023-0205-opensearch-at-fosdem23 copy.markdown
index 6639a8dc11..47cff2bae1 100644
--- a/_events/2023-0205-opensearch-at-fosdem23 copy.markdown	
+++ b/_events/2023-0205-opensearch-at-fosdem23 copy.markdown	
@@ -4,14 +4,17 @@ eventdate: 2023-02-05 16:00:00 +0100
 # the title - this is how it will show up in listing and headings on the site:
 title: FOSDEM - Python Logging Like Your Job Depends on It
 # if your event has an online component, put it here:
-online: False
+online: false
 # This is for the sign up button
 signup:
     # the link URL
     url: https://fosdem.org/2023/schedule/event/python_logging/
     # the button text
     title: Talk Page
-
+tz: Europe/Brussels
+location:
+  city: Brussels
+  country: Belgium
 # below this tripple dash, describe your event. It should be 1-3 sentences
 ---
 
diff --git a/_events/2023-0307-awsopensearch-unplugged.markdown b/_events/2023-0307-awsopensearch-unplugged.markdown
index 4217a2efb0..029e8a88f2 100644
--- a/_events/2023-0307-awsopensearch-unplugged.markdown
+++ b/_events/2023-0307-awsopensearch-unplugged.markdown
@@ -7,7 +7,9 @@ tz: America/New_York
 signup:
     url: https://opensearchunplugged3923.splashthat.com/
     title: Register Now
-
+location:
+  city: New York
+  country: USA
 ---
 
 Join this partner event with AWS
diff --git a/_events/2023-0426-rta-sumit.markdown b/_events/2023-0426-rta-sumit.markdown
index f44167fbd6..4723266c00 100644
--- a/_events/2023-0426-rta-sumit.markdown
+++ b/_events/2023-0426-rta-sumit.markdown
@@ -1,13 +1,15 @@
 ---
 
-eventdate: 2023-04-26 13:30:00 -0800
+eventdate: 2023-04-26 13:30:00 -0700
 title: Upgrading Log-Analytics Clusters to OpenSearch
 online: false
 tz: America/Los_Angeles
 signup:
     url: https://www.myeventi.events/rtasummit23/attendee/?code=Stern30
     title: Join RTA-Summit 2023 conference in San Francisco, CA
-
+location:
+  city: San Francisco
+  country: USA
 ---
 
 ### Join [Amitai Stern](https://opensearch.org/authors/amistrn/) at the Real-Time Analytics Summit for the session "Upgrading Log-Analytics Clusters to OpenSearch"
diff --git a/_events/2023-0510-devoxxuk.markdown b/_events/2023-0510-devoxxuk.markdown
index b06a37ef92..78d4723395 100644
--- a/_events/2023-0510-devoxxuk.markdown
+++ b/_events/2023-0510-devoxxuk.markdown
@@ -1,13 +1,15 @@
 ---
 
-eventdate: 2023-05-10 08:00:00 +0000
+eventdate: 2023-05-10 08:00:00 +0100
 title: Using Apache Kafka and OpenSearch to explore Mastodon
 online: false
 tz: Europe/London
 signup:
     url: https://www.devoxx.co.uk/
     title: Join Devoxx UK 2023 conference in London
-
+location:
+  city: London
+  country: United Kingdom
 ---
 
 Join Olena Kutsenko at DevoxxUK for the session "Using Apache Kafka and OpenSearch to explore Mastodon" - https://www.devoxx.co.uk/speaker-details/?id=7861
diff --git a/_events/2023-0510-open-source-summit.markdown b/_events/2023-0510-open-source-summit.markdown
index ad66b58da3..51b2e4b339 100644
--- a/_events/2023-0510-open-source-summit.markdown
+++ b/_events/2023-0510-open-source-summit.markdown
@@ -1,13 +1,15 @@
 ---
 
-eventdate: 2023-05-10 14:00:00 -0800
+eventdate: 2023-05-10 14:00:00 -0700
 title: Demystifying Anomaly Detection in OpenSearch - Open Source Summit North America 2023
 online: false
 tz: America/Vancouver
 signup:
     url: https://ossna2023.sched.com/event/4a16eb089ae3231cf5c2bb76e087b6fb
     title: See you there!
-
+location:
+  city: Seattle
+  country: USA
 ---
 Come see Developer Advocate, Nate Boot give a talk: 'Demystifying Anomaly Detection in OpenSearch' at Open Source Summit
 
diff --git a/_events/2023-0511-open-source-summit.markdown b/_events/2023-0511-open-source-summit.markdown
index de96e6054d..a6d1c3336f 100644
--- a/_events/2023-0511-open-source-summit.markdown
+++ b/_events/2023-0511-open-source-summit.markdown
@@ -1,13 +1,15 @@
 ---
 
-eventdate: 2023-05-11 10:00:00 -0800
+eventdate: 2023-05-11 10:00:00 -0700
 title: Keynote - One Tool, Five Minutes, Countless Applications - Open Source Summit North America 2023
 online: false
 tz: America/Vancouver
 signup:
     url: https://ossna2023.sched.com/event/1Krni
     title: See you there!
-
+location:
+  city: Seattle
+  country: USA
 ---
 Come see Dagney Braun, Principal Product Manager, Amazon give a keynote: 'OpenSearch: One Tool, Five Minutes, Countless Applications' at Open Source Summit
 
diff --git a/_events/2023-0607-chicago-search-meetup.markdown b/_events/2023-0607-chicago-search-meetup.markdown
index 7c4abb2a7f..bc12ca2594 100644
--- a/_events/2023-0607-chicago-search-meetup.markdown
+++ b/_events/2023-0607-chicago-search-meetup.markdown
@@ -7,7 +7,9 @@ tz: America/Chicago
 signup:
     url: https://www.meetup.com/opensearch-project-chicago/events/293331344
     title: RSVP on Meetup
-
+location:
+  city: Chicago
+  country: USA
 ---
 
 Please join the [Bonsai](http://bonsai.io/) team, hosted by [Spantree](https://spantree.net/) and in partnership with the OpenSearch Project. This will be an in-person event, launching the [Chicago search engineer community](https://www.meetup.com/opensearch-project-chicago/).
diff --git a/_events/2023-0927-opensearchcon.markdown b/_events/2023-0927-opensearchcon.markdown
index cb1e291b88..73946c67bd 100644
--- a/_events/2023-0927-opensearchcon.markdown
+++ b/_events/2023-0927-opensearchcon.markdown
@@ -1,8 +1,13 @@
 ---
 
 eventdate: 2023-09-27 08:00:00 -0700
+enddate: 2023-09-29 20:00:00 -0700
 title: OpenSearchCon - 2023
-online: 
+online: false
+tz: America/Los_Angeles
+location:
+    city: Seattle
+    country: USA
 signup:
     url: https://opensearchcon2023.splashthat.com/
     title: Register to attend
diff --git a/_events/2023-1105-ubuntu-summit.markdown b/_events/2023-1105-ubuntu-summit.markdown
index f58f563daf..a5fc7377a9 100644
--- a/_events/2023-1105-ubuntu-summit.markdown
+++ b/_events/2023-1105-ubuntu-summit.markdown
@@ -7,7 +7,10 @@ online: false
 signup:
     url: https://events.canonical.com/event/31/contributions/238/
     title: Learn more
-
+tz: Europe/Riga
+location:
+  city: Riga
+  country: Latvia
 ---
 
 [Aparna Sundar](https://opensearch.org/authors/apasun/), Senior Researcher at OpenSearch Project & [Kris Freedain](https://opensearch.org/authors/krisfreedain/), Community Manager at OpenSearch Project will be giving at talk at [Ubuntu Summit](https://events.canonical.com/event/31/) 2023: "Importance of Measuring Trust in Organizations and How Community Presence can Help".
diff --git a/_events/2023-1108-haystack-austin.markdown b/_events/2023-1108-haystack-austin.markdown
index 95b6bff510..94d53d4445 100644
--- a/_events/2023-1108-haystack-austin.markdown
+++ b/_events/2023-1108-haystack-austin.markdown
@@ -1,11 +1,14 @@
 ---
 eventdate: 2023-11-08 12:30:00 -0600
 title: Haystack on Tour 2023 – Austin, Texas - 2023-11-08
-online:
+online: false
 signup:
     url: https://www.meetup.com/haystack-search-relevance-online/events/296658842/
     title: Register to attend
-
+tz: America/Chicago
+location:
+  city: Austin
+  country: USA
 ---
 
 <img src="/assets/media/herobanners/2023_11_08-haystack-atx.png" alt="Haystack on Tour in Austin, TX 2023"/>{: .img-fluid}
diff --git a/_events/2023-1110-amsterdam-user-group.markdown b/_events/2023-1110-amsterdam-user-group.markdown
index 20f1c79c3f..a90cda469e 100644
--- a/_events/2023-1110-amsterdam-user-group.markdown
+++ b/_events/2023-1110-amsterdam-user-group.markdown
@@ -1,13 +1,16 @@
 ---
 
-eventdate: 2023-11-10 18:00:00 +0200
+eventdate: 2023-11-10 18:00:00 +0100
 
 title: Amsterdam OpenSearch Launch Event with Zeta Alpha
 online: false
 signup:
     url: https://www.meetup.com/opensearch-project-amsterdam/events/296766223/
     title: Join on Meetup
-
+tz: Europe/Amsterdam
+location:
+  city: Amsterdam
+  country: Netherlands
 ---
 
 [Zeta Alpha](https://www.zeta-alpha.com/) is inviting the OpenSearch community in Amsterdam to join the launch event of the Amsterdam User Group. We start at 18:00, we'll have Pizza, Refreshments, Talks, and Networking (this is an in-person only event).
diff --git a/_events/2023-1128-community-meeting.markdown b/_events/2023-1128-community-meeting.markdown
index db447c4c25..b82966bd54 100644
--- a/_events/2023-1128-community-meeting.markdown
+++ b/_events/2023-1128-community-meeting.markdown
@@ -1,6 +1,6 @@
 ---
 
-eventdate: 2023-11-28 08:00:00 -0700
+eventdate: 2023-11-28 08:00:00 -0800
 
 title: OpenSearch Community Meeting - 2023-11-28
 online: true
diff --git a/_events/_sample.markdown b/_events/_sample.markdown
index 4a27feb6ea..8fbc8907b4 100644
--- a/_events/_sample.markdown
+++ b/_events/_sample.markdown
@@ -1,11 +1,17 @@
 ---
 # put your event date and time (24 hr) here (mind the time-zone and daylight saving time!):
 eventdate: 2021-01-01 12:34:00 -0700
+# If the event last multiple day, also add the end date:
+# enddate: 2021-01-03 20:00:00 -0700
+
 # the title - this is how it will show up in listing and headings on the site:
 title: Your Event Title
 online: true
-# If the event is online, remove the next line, otherwise uncomment and adjust it:
+# If the event is online, remove the next lines, otherwise uncomment and adjust:
 # tz: Pacific/Tahiti
+# location:
+#     city: Papeete
+#     country: French Polynesia
 
 # This is for the sign up button
 signup:
diff --git a/events/index.html b/events/index.html
index 7e387ba600..5c0198c895 100644
--- a/events/index.html
+++ b/events/index.html
@@ -7,7 +7,7 @@
 ---
 
 {% assign now = site.time %}
-{% assign future_events = site.events | where_exp: "event","event.eventdate > now" %}
+{% assign future_events = site.events | where_exp: "event","event.eventdate > now or event.enddate > now" %}
 {% assign primary_title = site.headings.events %}
 {% assign layout_class = 'sidebar-right events-page' %}
 
diff --git a/events/past.html b/events/past.html
index 459a019268..88b5a508d7 100644
--- a/events/past.html
+++ b/events/past.html
@@ -6,7 +6,7 @@
 ---
 
 {% assign now = site.time %}
-{% assign past_events = site.events | where_exp: "event","event.eventdate < now" %}
+{% assign past_events = site.events | where_exp: "event","event.eventdate < now or event.enddate < now" %}
 {% assign primary_title = site.headings.events %}
 {% assign layout_class = 'sidebar-right events-page' %}