diff --git a/Resources/Audio/Lobby/attributions.yml b/Resources/Audio/Lobby/attributions.yml
index 540ebd88328..43eab18a2ee 100644
--- a/Resources/Audio/Lobby/attributions.yml
+++ b/Resources/Audio/Lobby/attributions.yml
@@ -77,9 +77,4 @@
 - files: ["every_light_is_blinking_at_once.ogg"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "every light is blinking at once by Alexander Divine."
-  source: "https://soundcloud.com/alexanderdivine/every-light-is-blinking-at-once"
-
-- files: ["victory.ogg"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "Victory by Koruu Chan. Rights reserved by Checkraze. Converted from WAV to OGG."
-  source: "https://github.com/Cheackraze"
\ No newline at end of file
+  source: "https://soundcloud.com/alexanderdivine/every-light-is-blinking-at-once"
\ No newline at end of file
diff --git a/Resources/Audio/Lobby/victory.ogg b/Resources/Audio/Lobby/victory.ogg
deleted file mode 100644
index 791aae37134..00000000000
Binary files a/Resources/Audio/Lobby/victory.ogg and /dev/null differ
diff --git a/Resources/Audio/_NF/Lobby/attributions.yml b/Resources/Audio/_NF/Lobby/attributions.yml
new file mode 100644
index 00000000000..65365a341b8
--- /dev/null
+++ b/Resources/Audio/_NF/Lobby/attributions.yml
@@ -0,0 +1,9 @@
+- files: ["victory.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Victory by Koruu Chan. Rights reserved by Checkraze. Converted from WAV to OGG."
+  source: "https://github.com/Cheackraze"
+
+- files: ["shibamata.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Shibamata midi remake. Likely original: https://www.nicovideo.jp/watch/sm32841166"
+  source: "https://github.com/Elijahrane/arcadia-station/blob/c2ea3f44d4de4c0a337aeddb12f167a89c5ed3ef/Resources/Audio/Lobby/shibamata.ogg"
\ No newline at end of file
diff --git a/Resources/Audio/_NF/Lobby/shibamata.ogg b/Resources/Audio/_NF/Lobby/shibamata.ogg
new file mode 100644
index 00000000000..e116449a5bd
Binary files /dev/null and b/Resources/Audio/_NF/Lobby/shibamata.ogg differ
diff --git a/Resources/Audio/_NF/Lobby/victory.ogg b/Resources/Audio/_NF/Lobby/victory.ogg
new file mode 100644
index 00000000000..482cbc83f82
Binary files /dev/null and b/Resources/Audio/_NF/Lobby/victory.ogg differ
diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml
index 0732c90c3c2..3e5f5b79c98 100644
--- a/Resources/Prototypes/SoundCollections/lobby.yml
+++ b/Resources/Prototypes/SoundCollections/lobby.yml
@@ -2,10 +2,13 @@
   id: LobbyMusic
   files:
     - /Audio/Lobby/thunderdome.ogg
+#    - /Audio/Lobby/absconditus.ogg
     - /Audio/Lobby/space_asshole.ogg
+#    - /Audio/Lobby/endless_space.ogg
     - /Audio/Lobby/atomicamnesiammx.ogg
     - /Audio/Lobby/singuloose.ogg
     - /Audio/Lobby/comet_haley.ogg
+#    - /Audio/Lobby/marhaba.ogg
     - /Audio/Lobby/title3.ogg
     - /Audio/Lobby/mod.flip-flap.ogg
     - /Audio/Lobby/Monument.ogg
@@ -13,5 +16,6 @@
     - /Audio/Lobby/pwmur.ogg
     - /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg
     - /Audio/Lobby/every_light_is_blinking_at_once.ogg
-    - /Audio/Lobby/victory.ogg
     - /Audio/Lobby/vibe_ace.ogg
+    - /Audio/_NF/Lobby/victory.ogg # Frontier
+    - /Audio/_NF/Lobby/shibamata.ogg # Frontier
\ No newline at end of file