diff --git a/_data/archive.yml b/_data/archive.yml
index ba6d3cc22c..dab853b93c 100644
--- a/_data/archive.yml
+++ b/_data/archive.yml
@@ -5993,6 +5993,20 @@
     latitude: 1.2899175
     longitude: 103.8519072
 
+- conference: PyBay
+  year: 2018
+  link: https://web.archive.org/web/20180811130121/http://pybay.com/
+  cfp_link: https://web.archive.org/web/20180413152700/http://pybay.com/cfp
+  cfp: '2018-04-21 23:59:00'
+  place: San Francisco, USA
+  start: 2018-08-16
+  end: 2018-08-19
+  sub: PY
+  location:
+  - title: PyBay 2018
+    latitude: 37.7681571
+    longitude: -122.392929
+
 - conference: Python Nordeste
   year: 2018
   link: https://web.archive.org/web/20181220005202/https://2018.pythonnordeste.org/
@@ -6657,6 +6671,19 @@
     latitude: 35.718741949999995
     longitude: 139.73118058112317
 
+- conference: PyBay
+  year: 2017
+  link: https://web.archive.org/web/20170811130121/http://pybay.com/
+  cfp: '2017-06-16 23:59:00'
+  place: San Francisco, USA
+  start: 2017-08-10
+  end: 2017-08-13
+  sub: PY
+  location:
+  - title: PyBay 2017
+    latitude: 37.7681571
+    longitude: -122.392929
+
 - conference: PyCon Sweden
   alt_name: PyCon SE
   year: 2017
@@ -7456,6 +7483,19 @@
     latitude: 28.6138954
     longitude: 77.2090057
 
+- conference: PyBay
+  year: 2016
+  link: https://web.archive.org/web/20160819153259/http://www.pybay.com/
+  cfp: '2016-06-24 23:59:00'
+  place: San Francisco, USA
+  start: 2016-08-19
+  end: 2016-08-21
+  sub: PY
+  location:
+  - title: PyBay 2016
+    latitude: 37.7681571
+    longitude: -122.392929
+
 - conference: EuroSciPy
   year: 2016
   link: https://web.archive.org/web/20160405221156/https://www.euroscipy.org/2016/
diff --git a/_data/conferences.yml b/_data/conferences.yml
index 32e0968ea9..e08bdc0c4d 100644
--- a/_data/conferences.yml
+++ b/_data/conferences.yml
@@ -294,6 +294,7 @@
   start: 2024-09-21
   end: 2024-09-21
   sponsor: https://pybay.org/sponsors/sponsor-us/
+  mastodon: https://fosstodon.org/@pybay
   sub: PY
   location:
   - title: PyBay 2024
diff --git a/_data/legacy.yml b/_data/legacy.yml
index d032f6fbf4..22d36abb18 100644
--- a/_data/legacy.yml
+++ b/_data/legacy.yml
@@ -392,32 +392,6 @@
     latitude: 15.81527075
     longitude: 74.48744361563915
 
-- conference: PyBay
-  year: 2018
-  link: https://web.archive.org/web/20180811130121/http://pybay.com/
-  cfp: TBA
-  place: San Francisco, USA
-  start: 2018-08-16
-  end: 2018-08-20
-  sub: PY
-  location:
-  - title: PyBay 2018
-    latitude: 37.7681571
-    longitude: -122.392929
-
-- conference: PyBay
-  year: 2016
-  link: https://web.archive.org/web/20160819153259/http://www.pybay.com/
-  cfp: TBA
-  place: San Francisco, USA
-  start: 2016-08-19
-  end: 2016-08-22
-  sub: PY
-  location:
-  - title: PyBay 2016
-    latitude: 37.7681571
-    longitude: -122.392929
-
 - conference: Plone Symposium Tokyo
   year: 2015
   link: https://web.archive.org/web/20150619044225/http://plone.jp/plone-symposium-tokyo-2015