diff --git a/src/Orbit.Api/Middleware/SecurityHeadersMiddleware.cs b/src/Orbit.Api/Middleware/SecurityHeadersMiddleware.cs
index 8dc4032d..fe59ac0f 100644
--- a/src/Orbit.Api/Middleware/SecurityHeadersMiddleware.cs
+++ b/src/Orbit.Api/Middleware/SecurityHeadersMiddleware.cs
@@ -10,7 +10,6 @@ public Task InvokeAsync(HttpContext context)
         headers["Referrer-Policy"] = "strict-origin-when-cross-origin";
         headers["X-XSS-Protection"] = "0";
         headers["Strict-Transport-Security"] = "max-age=31536000; includeSubDomains";
-        headers["Content-Security-Policy"] = "default-src 'self'";
 
         return next(context);
     }
diff --git a/src/Orbit.Api/Program.cs b/src/Orbit.Api/Program.cs
index ac3762c5..69a2edbb 100644
--- a/src/Orbit.Api/Program.cs
+++ b/src/Orbit.Api/Program.cs
@@ -93,7 +93,7 @@
 {
     FirebaseAdmin.FirebaseApp.Create(new FirebaseAdmin.AppOptions
     {
-        Credential = Google.Apis.Auth.OAuth2.GoogleCredential.FromJson(firebaseCredJson)
+        Credential = Google.Apis.Auth.OAuth2.CredentialFactory.FromJson<Google.Apis.Auth.OAuth2.ServiceAccountCredential>(firebaseCredJson).ToGoogleCredential()
     });
 }
 else
@@ -103,7 +103,7 @@
     {
         FirebaseAdmin.FirebaseApp.Create(new FirebaseAdmin.AppOptions
         {
-            Credential = Google.Apis.Auth.OAuth2.GoogleCredential.FromFile(firebaseCredPath)
+            Credential = Google.Apis.Auth.OAuth2.CredentialFactory.FromFile<Google.Apis.Auth.OAuth2.ServiceAccountCredential>(firebaseCredPath).ToGoogleCredential()
         });
     }
 }