diff --git a/README.md b/README.md
index 698a3eb2..01534517 100644
--- a/README.md
+++ b/README.md
@@ -98,11 +98,11 @@ Read up here on how to help out, there is something for everyone:
 |-------------------------------------------------------------|-----------------------------------------------------------|
 | [RetroDECK](https://github.com/XargonWan/RetroDECK)          | This one, our main repo where the core of the project is  |
 | [RetroDECK-cooker](https://github.com/XargonWan/RetroDECK-cooker)  | Where we publish our test build, no code is hosted here |
-| [RetroDECK-Wiki](https://github.com/XargonWan/RetroDECK-Wiki)  | Where our wiki source code is |
+| [RetroDECK/Wiki](https://github.com/RetroDECK/Wiki)  | Where our wiki source code is |
 | [RetroDECK-website](https://github.com/XargonWan/RetroDECK-website)  | Where our website source code is |
 | [RetroDECK on Flathub](https://github.com/flathub/net.retrodeck.retrodeck) | Our little space in Flathub's organization                 |
-| [RetroDECK-MAME](https://github.com/XargonWan/RetroDECK-MAME)   | MAME is big to build, so it's pre-built here and then imported in the build |
-| [RetroDECK-ES-DE](https://github.com/RetroDECK/ES-DE)  | This is where we store our patched fork of ES-DE          |
+| [RetroDECK/MAME](https://github.com/RetroDECK/MAME)   | MAME is big to build, so it's pre-built here and then imported in the build |
+| [RetroDECK/ES-DE](https://github.com/RetroDECK/ES-DE)  | This is where we store our patched fork of ES-DE          |
 
 
 # The RetroDECK Wiki
diff --git a/automation_tools/automation_task_list.cfg b/automation_tools/automation_task_list.cfg
index c83c27e1..c5764d44 100644
--- a/automation_tools/automation_task_list.cfg
+++ b/automation_tools/automation_task_list.cfg
@@ -22,9 +22,9 @@ latestghreleasesha^RETRODECKSOLARUSPLACEHOLDER^https://api.github.com/repos/Retr
 latestghreleasesha^RETRODECKPRIMEHACKPLACEHOLDER^https://api.github.com/repos/RetroDECK/io.github.shiiion.primehack/releases/latest^RetroDECK-primehack-Artifact.tar.gz
 latestghreleasesha^RETRODECKGZDOOMSHASPLACEHOLDER^https://api.github.com/repos/RetroDECK/org.zdoom.GZDoom/releases/latest^RetroDECK-gzdoom-Artifact.tar.gz
 latestghreleasesha^RETRODECKMELONDSSHAPLACEHOLDER^https://api.github.com/repos/RetroDECK/net.kuribo64.melonDS/releases/latest^RetroDECK-melonds-Artifact.tar.gz
-latestghreleasesha^RETRODECKMAMEPLACEHOLDER^https://api.github.com/repos/XargonWan/RetroDECK-MAME/releases/latest^RetroDECK-MAME-Artifact.tar.gz
+latestghreleasesha^RETRODECKMAMEPLACEHOLDER^https://api.github.com/repos/RetroDECK/MAME/releases/latest^RetroDECK-MAME-Artifact.tar.gz
 
-latestghrelease^RETRODECKMAMEURLPLACEHOLDER^https://api.github.com/repos/XargonWan/RetroDECK-MAME/releases/latest^RetroDECK-MAME-Artifact.tar.gz
+latestghrelease^RETRODECKMAMEURLPLACEHOLDER^https://api.github.com/repos/RetroDECK/MAME/releases/latest^RetroDECK-MAME-Artifact.tar.gz
 latestghrelease^RETRODECKESDEURLPLACEHOLDER^https://api.github.com/repos/RetroDECK/ES-DE/releases/latest^RetroDECK-ES-DE-Artifact.tar.gz
 latestghrelease^RETRODECKPPSSPPURL^https://api.github.com/repos/RetroDECK/org.ppsspp.PPSSPP/releases/latest^RetroDECK-PPSSPP-Artifact.tar.gz
 latestghrelease^RETRODECKDOLPHINURLPLACEHOLDER^https://api.github.com/repos/RetroDECK/org.DolphinEmu.dolphin-emu/releases/latest^RetroDECK-dolphin-Artifact.tar.gz