diff --git a/Tests/Tests.cs b/Tests/Tests.cs
index bb1561c..97d3a5a 100644
--- a/Tests/Tests.cs
+++ b/Tests/Tests.cs
@@ -75,7 +75,7 @@ static Dictionary<string, string> AddMany(this IDictionary<string, string> a, ID
         var privateIP = docker.Networks.InspectNetworkAsync("bridge").GetAwaiter().GetResult().IPAM.Config[0].Gateway;
         var connString = new NpgsqlConnectionStringBuilder(postgres.Value.GetConnectionString());
         var container = new ContainerBuilder()
-            .WithImage("metabase/metabase:v0.39.7")
+            .WithImage("metabase/metabase:v0.40.8")
             .WithPortBinding(metabasePort, assignRandomHostPort: true)
             .WithWaitStrategy(Wait.ForUnixContainer().UntilMessageIsLogged("Metabase Initialization COMPLETE"))
             .WithEnvironment(new Dictionary<string, string>
diff --git a/metabase-exporter/MetabaseApi.cs b/metabase-exporter/MetabaseApi.cs
index a8249c6..8f2ea40 100644
--- a/metabase-exporter/MetabaseApi.cs
+++ b/metabase-exporter/MetabaseApi.cs
@@ -236,7 +236,7 @@ public async Task<IReadOnlyList<DatabaseId>> GetAllDatabaseIds()
             var response = await sessionManager.Send(request);
             try
             {
-                var databases = JsonConvert.DeserializeObject<JArray>(response);
+                var databases = JsonConvert.DeserializeObject<JObject>(response)["data"];
                 return databases.Select(d => new DatabaseId((int) d["id"])).ToList();
             }
             catch (JsonSerializationException e)