diff --git a/.gitmodules b/.gitmodules
index d3e2b6b..ab3d0db 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "MareAPI"]
 	path = MareAPI
 	url = https://github.com/loporrit/MareAPI.git
+[submodule "Penumbra.Api"]
+	path = Penumbra.Api
+	url = https://github.com/loporrit/Penumbra.Api.git
+[submodule "Glamourer.Api"]
+	path = Glamourer.Api
+	url = https://github.com/loporrit/Glamourer.Api.git
diff --git a/Glamourer.Api b/Glamourer.Api
new file mode 160000
index 0000000..adef0de
--- /dev/null
+++ b/Glamourer.Api
@@ -0,0 +1 @@
+Subproject commit adef0de732cc4cf58d7e28c1b79f4dc54e5964b9
diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj
index fad7d3d..ada7c95 100644
--- a/MareSynchronos/MareSynchronos.csproj
+++ b/MareSynchronos/MareSynchronos.csproj
@@ -43,7 +43,6 @@
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.11" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
     <PackageReference Include="Glamourer.Api" Version="2.0.0" />
-    <PackageReference Include="Penumbra.Api" Version="5.0.0" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.0.2" />
     <PackageReference Include="SonarAnalyzer.CSharp" Version="9.11.0.78383">
       <PrivateAssets>all</PrivateAssets>
@@ -52,6 +51,22 @@
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.32.1" />
   </ItemGroup>
 
+  <ItemGroup  Condition="Exists('..\Penumbra.Api\Penumbra.Api.csproj')">
+    <ProjectReference Include="..\Penumbra.Api\Penumbra.Api.csproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition="!Exists('..\Penumbra.Api\Penumbra.Api.csproj')">
+    <PackageReference Include="Penumbra.Api" Version="5.1.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="Exists('..\Penumbra.Api\Penumbra.Api.csproj')">
+    <ProjectReference Include="..\Glamourer.Api\Glamourer.Api.csproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition="!Exists('..\Glamourer.Api\Glamourer.Api.csproj')">
+    <PackageReference Include="Glamourer.Api" Version="2.0.1" />
+  </ItemGroup>
+
   <PropertyGroup>
     <SourceRevisionId>build$([System.DateTime]::UtcNow.ToString("yyyy-MM-ddTHH:mm:ss:fffZ"))</SourceRevisionId>
     <ImplicitUsings>enable</ImplicitUsings>
diff --git a/Penumbra.Api b/Penumbra.Api
new file mode 160000
index 0000000..b18d7e5
--- /dev/null
+++ b/Penumbra.Api
@@ -0,0 +1 @@
+Subproject commit b18d7e5390793f7310b6d39b8978997854f533f9