diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 9e74c03..bb7f200 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -13,6 +13,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     environment: PrTest
+    env:
+      AspNetCert: ${{ secrets.AspNetCert }}
 
     steps:
     - uses: actions/checkout@v4
diff --git a/Directory.Build.props b/Directory.Build.props
index b6340c5..aa0c158 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -15,4 +15,11 @@
   <PropertyGroup>
     <WarningsAsErrors>CS8618</WarningsAsErrors>
   </PropertyGroup>
+  
+  <PropertyGroup>
+    <!-- See/Attribution: https://blog.magnusmontin.net/2018/11/05/platform-conditional-compilation-in-net-core/ -->
+    <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
+    <IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
+    <IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/PasswordKeeper.Server/Dockerfile b/PasswordKeeper.Server/Dockerfile
index b134c95..4ffdbce 100644
--- a/PasswordKeeper.Server/Dockerfile
+++ b/PasswordKeeper.Server/Dockerfile
@@ -1,20 +1,24 @@
 FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
 USER $APP_UID
 WORKDIR /app
-EXPOSE 8080
-EXPOSE 8081
+EXPOSE 8000
+EXPOSE 8001
 
 FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
-COPY ["PasswordKeeper.Server/PasswordKeeper.Server.csproj", "PasswordKeeper.Server/"]
 COPY ["PasswordKeeper.BusinessLogic/PasswordKeeper.BusinessLogic.csproj", "PasswordKeeper.BusinessLogic/"]
-COPY ["PasswordKeeper.DataAccess/PasswordKeeper.DataAccess.csproj", "PasswordKeeper.DataAccess/"]
+COPY ["PasswordKeeper.Classes/PasswordKeeper.Classes.csproj", "PasswordKeeper.Classes/"]
 COPY ["PasswordKeeper.DAO/PasswordKeeper.DAO.csproj", "PasswordKeeper.DAO/"]
+COPY ["PasswordKeeper.DataAccess/PasswordKeeper.DataAccess.csproj", "PasswordKeeper.DataAccess/"]
+COPY ["PasswordKeeper.DatabaseMigrations/PasswordKeeper.DatabaseMigrations.csproj", "PasswordKeeper.DatabaseMigrations/"]
 COPY ["PasswordKeeper.DTO/PasswordKeeper.DTO.csproj", "PasswordKeeper.DTO/"]
 COPY ["PasswordKeeper.Interfaces/PasswordKeeper.Interfaces.csproj", "PasswordKeeper.Interfaces/"]
-COPY ["DbMigrate/DbMigrate.csproj", "DbMigrate/"]
-RUN dotnet restore "PasswordKeeper.Server/PasswordKeeper.Server.csproj"§
+COPY ["PasswordKeeper.Server/PasswordKeeper.Server.csproj", "PasswordKeeper.Server/"]
+COPY ["./Directory.Build.props", "/"]
+COPY ["./Directory.Build.targets", "/"]
+
+RUN dotnet restore "PasswordKeeper.Server/PasswordKeeper.Server.csproj"
 COPY . .
 WORKDIR "/src/PasswordKeeper.Server"
 RUN dotnet build "PasswordKeeper.Server.csproj" -c $BUILD_CONFIGURATION -o /app/build
@@ -26,4 +30,8 @@ RUN dotnet publish "PasswordKeeper.Server.csproj" -c $BUILD_CONFIGURATION -o /ap
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
+
+RUN mkdir -p /app/Certificates
+COPY "PasswordKeeper.Server/CertGen/AspNetApp.pfx" /app/Certificates
+
 ENTRYPOINT ["dotnet", "PasswordKeeper.Server.dll"]
diff --git a/PasswordKeeper.Server/PasswordKeeper.Server.csproj b/PasswordKeeper.Server/PasswordKeeper.Server.csproj
index 9009082..f279d39 100644
--- a/PasswordKeeper.Server/PasswordKeeper.Server.csproj
+++ b/PasswordKeeper.Server/PasswordKeeper.Server.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -7,7 +7,7 @@
     <ItemGroup>
         <PackageReference Include="AutoMapper" Version="14.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.3" />
-        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.3"/>
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.3" />
         <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.7.0" />
         <PackageReference Include="MySql.Data" Version="9.2.0" />
         <PackageReference Include="MySql.EntityFrameworkCore" Version="9.0.0" />
@@ -27,4 +27,15 @@
       <ProjectReference Include="..\PasswordKeeper.DataAccess\PasswordKeeper.DataAccess.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Content Include="CertGen\**">
+          <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </Content>
+    </ItemGroup>
+
+    <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
+      <Exec Condition="'$(IsWindows)'=='true'" Command="dotnet dev-certs https -ep CertGen\AspNetApp.pfx -p %AspNetCert%" />
+      <Exec Condition="'$(IsWindows)'=='false'" Command="dotnet dev-certs https -ep CertGen/AspNetApp.pfx -p $AspNetCert" />
+    </Target>
+
 </Project>
diff --git a/PasswordKeeperServer.sln b/PasswordKeeperServer.sln
index c882235..0f8a5ad 100644
--- a/PasswordKeeperServer.sln
+++ b/PasswordKeeperServer.sln
@@ -8,6 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		LICENSE = LICENSE
+		.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PasswordKeeper.DatabaseMigrations", "PasswordKeeper.DatabaseMigrations\PasswordKeeper.DatabaseMigrations.csproj", "{2047B929-7D63-440A-A1C1-BABAE744194B}"