diff --git a/.gitmodules b/.gitmodules
index 572be87c..d558a943 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,9 @@
 [submodule "music_player"]
 	path = music_player
 	url = https://github.com/neverfa11ing/FlipperMusicRTTTL
+[submodule "fw/RogueMaster"]
+	path = fw/RogueMaster
+	url = https://github.com/RogueMaster/flipperzero-firmware-wPlugins
+[submodule "fw/OFW"]
+	path = fw/OFW
+	url = https://github.com/flipperdevices/flipperzero-firmware
diff --git a/fw/OFW b/fw/OFW
new file mode 160000
index 00000000..222394d3
--- /dev/null
+++ b/fw/OFW
@@ -0,0 +1 @@
+Subproject commit 222394d3ea673d09c3c5d045cde26476deb4d50a
diff --git a/fw/RogueMaster b/fw/RogueMaster
new file mode 160000
index 00000000..d4b4201e
--- /dev/null
+++ b/fw/RogueMaster
@@ -0,0 +1 @@
+Subproject commit d4b4201ec8628cb388981cc26e52ceb0d43a3c50