diff --git a/BTCPayServer.Data/Migrations/20240405004015_cleanup_invoice_events.cs b/BTCPayServer.Data/Migrations/20240405004015_cleanup_invoice_events.cs
index a053c79f0..1231c3f2a 100644
--- a/BTCPayServer.Data/Migrations/20240405004015_cleanup_invoice_events.cs
+++ b/BTCPayServer.Data/Migrations/20240405004015_cleanup_invoice_events.cs
@@ -19,8 +19,8 @@ namespace BTCPayServer.Migrations
                 ALTER TABLE ""InvoiceEvents"" DROP CONSTRAINT IF EXISTS ""PK_InvoiceEvents"";
                 ALTER TABLE ""InvoiceEvents"" DROP COLUMN IF EXISTS ""UniqueId"";
                 CREATE INDEX IF NOT EXISTS ""IX_InvoiceEvents_InvoiceDataId"" ON ""InvoiceEvents""(""InvoiceDataId"");
-                VACUUM (FULL, ANALYZE) ""InvoiceEvents"";
-            ", true);
+            ");
+            migrationBuilder.Sql(@"VACUUM (FULL, ANALYZE) ""InvoiceEvents"";", true);
         }
 
         /// <inheritdoc />
diff --git a/BTCPayServer.Data/Migrations/20240405052858_cleanup_address_invoices.cs b/BTCPayServer.Data/Migrations/20240405052858_cleanup_address_invoices.cs
index fe645053e..b5ac18383 100644
--- a/BTCPayServer.Data/Migrations/20240405052858_cleanup_address_invoices.cs
+++ b/BTCPayServer.Data/Migrations/20240405052858_cleanup_address_invoices.cs
@@ -18,7 +18,8 @@ namespace BTCPayServer.Migrations
             migrationBuilder.Sql(@"
 DELETE FROM ""AddressInvoices"" WHERE ""Address"" LIKE '%_LightningLike';
 ALTER TABLE ""AddressInvoices"" DROP COLUMN IF EXISTS ""CreatedTime"";
-VACUUM (FULL, ANALYZE) ""AddressInvoices"";", true);
+");
+            migrationBuilder.Sql(@"VACUUM (FULL, ANALYZE) ""AddressInvoices"";", true);
         }
 
         /// <inheritdoc />
diff --git a/BTCPayServer.Tests/docker-compose.yml b/BTCPayServer.Tests/docker-compose.yml
index 1beab8aeb..dbc6d56ab 100644
--- a/BTCPayServer.Tests/docker-compose.yml
+++ b/BTCPayServer.Tests/docker-compose.yml
@@ -205,7 +205,7 @@ services:
       - bitcoind
 
   postgres:
-    image:  postgres:13.4
+    image:  postgres:13.13
     environment:
         POSTGRES_HOST_AUTH_METHOD: trust
     ports: