diff --git a/CHANGES.rst b/CHANGES.rst
index 254da50e..2247ff76 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -23,6 +23,8 @@ Bug fixes:
 - Multivalue FREEBUSY property is now parsed properly
   Ref: #27
   [jacadzaca]
+- Use non legacy timezone name.
+  Ref: #567
 
 5.0.10 (unreleased)
 -------------------
diff --git a/docs/credits.rst b/docs/credits.rst
index eedcc24b..e3f8c545 100644
--- a/docs/credits.rst
+++ b/docs/credits.rst
@@ -17,6 +17,7 @@ icalendar contributors
 - Jannis Leidel <jannis@leidel.info>
 - Jeroen F.J. Laros <jlaros@fixedpoint.nl>
 - Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
+- Jochen Sprickerhof <icalendar@jochen.sprickerhof.de>
 - Jordan Kiang <jordan@cozi.com>
 - Klaus Klein <kleink+github@kleink.org>
 - Laurent Lasudry <lasudry@gmail.com>
diff --git a/src/icalendar/tests/test_unit_prop.py b/src/icalendar/tests/test_unit_prop.py
index af8a3480..7197392f 100644
--- a/src/icalendar/tests/test_unit_prop.py
+++ b/src/icalendar/tests/test_unit_prop.py
@@ -513,7 +513,7 @@ def test_prop_TypesFactory(self):
 
 
 vDDDTypes_list = [
-    vDDDTypes(pytz.timezone('US/Eastern').localize(datetime(year=2022, month=7, day=22, hour=12, minute=7))),
+    vDDDTypes(pytz.timezone('EST').localize(datetime(year=2022, month=7, day=22, hour=12, minute=7))),
     vDDDTypes(datetime(year=2022, month=7, day=22, hour=12, minute=7)),
     vDDDTypes(datetime(year=2022, month=7, day=22, hour=12, minute=7, tzinfo=tz.UTC)),
     vDDDTypes(date(year=2022, month=7, day=22)),
diff --git a/src/icalendar/windows_to_olson.py b/src/icalendar/windows_to_olson.py
index 52d305c4..383ec7c2 100644
--- a/src/icalendar/windows_to_olson.py
+++ b/src/icalendar/windows_to_olson.py
@@ -17,7 +17,7 @@
     'Arab Standard Time': 'Asia/Riyadh',
     'Arabian Standard Time': 'Asia/Dubai',
     'Arabic Standard Time': 'Asia/Baghdad',
-    'Argentina Standard Time': 'America/Buenos_Aires',
+    'Argentina Standard Time': 'America/Argentina/Buenos_Aires',
     'Atlantic Standard Time': 'America/Halifax',
     'Azerbaijan Standard Time': 'Asia/Baku',
     'Azores Standard Time': 'Atlantic/Azores',
@@ -46,7 +46,7 @@
     'Eastern Standard Time (Mexico)': 'America/Cancun',
     'Egypt Standard Time': 'Africa/Cairo',
     'Ekaterinburg Standard Time': 'Asia/Yekaterinburg',
-    'FLE Standard Time': 'Europe/Kiev',
+    'FLE Standard Time': 'Europe/Kyiv',
     'Fiji Standard Time': 'Pacific/Fiji',
     'GMT Standard Time': 'Europe/London',
     'GTB Standard Time': 'Europe/Bucharest',
@@ -54,7 +54,7 @@
     'Greenland Standard Time': 'America/Godthab',
     'Greenwich Standard Time': 'Atlantic/Reykjavik',
     'Hawaiian Standard Time': 'Pacific/Honolulu',
-    'India Standard Time': 'Asia/Calcutta',
+    'India Standard Time': 'Asia/Kolkata',
     'Iran Standard Time': 'Asia/Tehran',
     'Israel Standard Time': 'Asia/Jerusalem',
     'Jordan Standard Time': 'Asia/Amman',
@@ -69,10 +69,10 @@
     'Morocco Standard Time': 'Africa/Casablanca',
     'Mountain Standard Time': 'America/Denver',
     'Mountain Standard Time (Mexico)': 'America/Chihuahua',
-    'Myanmar Standard Time': 'Asia/Rangoon',
+    'Myanmar Standard Time': 'Asia/Yangon',
     'N. Central Asia Standard Time': 'Asia/Novosibirsk',
     'Namibia Standard Time': 'Africa/Windhoek',
-    'Nepal Standard Time': 'Asia/Katmandu',
+    'Nepal Standard Time': 'Asia/Kathmandu',
     'New Zealand Standard Time': 'Pacific/Auckland',
     'Newfoundland Standard Time': 'America/St_Johns',
     'North Asia East Standard Time': 'Asia/Irkutsk',
@@ -101,7 +101,7 @@
     'Tokyo Standard Time': 'Asia/Tokyo',
     'Tonga Standard Time': 'Pacific/Tongatapu',
     'Turkey Standard Time': 'Europe/Istanbul',
-    'US Eastern Standard Time': 'America/Indianapolis',
+    'US Eastern Standard Time': 'America/Indiana/Indianapolis',
     'US Mountain Standard Time': 'America/Phoenix',
     'UTC': 'Etc/GMT',
     'UTC+12': 'Etc/GMT-12',