diff --git a/README.md b/README.md
index 59133e78d..afd9f661e 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ docker run -d --name speedtest-tracker --restart unless-stopped \
     -e APP_URL=http://localhost \
     -e DB_CONNECTION=sqlite \
     -v ${PWD}:/config \
-    lscr.io/linuxserver/speedtest-tracker:latest
+    lscr.io/linuxserver/speedtest-tracker:0.20.6
 ```
 
 #### Docker Compose
@@ -50,9 +50,12 @@ services:
         volumes:
             - /path/to/data:/config
             - /path/to-custom-ssl-keys:/config/keys
-        image: lscr.io/linuxserver/speedtest-tracker:latest
+        image: lscr.io/linuxserver/speedtest-tracker:0.20.6
         restart: unless-stopped
 ```
+## Image version
+
+A full list of released versions can be found here: https://fleet.linuxserver.io/image?name=linuxserver/speedtest-tracker
 
 For more environment configuration see the docs: https://docs.speedtest-tracker.dev/getting-started/environment-variables
 
diff --git a/app/Filament/Pages/Dashboard.php b/app/Filament/Pages/Dashboard.php
index 77e1e9169..3737cf9bf 100644
--- a/app/Filament/Pages/Dashboard.php
+++ b/app/Filament/Pages/Dashboard.php
@@ -87,8 +87,8 @@ protected function getHeaderWidgets(): array
             RecentUploadChartWidget::make(),
             RecentPingChartWidget::make(),
             RecentJitterChartWidget::make(),
-            RecentUploadLatencyChartWidget::make(),
             RecentDownloadLatencyChartWidget::make(),
+            RecentUploadLatencyChartWidget::make(),
         ];
     }
 }
diff --git a/app/Jobs/Speedtests/ExecuteOoklaSpeedtest.php b/app/Jobs/Speedtests/ExecuteOoklaSpeedtest.php
index 6aed3e31b..995884519 100644
--- a/app/Jobs/Speedtests/ExecuteOoklaSpeedtest.php
+++ b/app/Jobs/Speedtests/ExecuteOoklaSpeedtest.php
@@ -64,6 +64,7 @@ public function handle(): void
             $message = collect(array_filter($messages, 'json_validate'))->last();
 
             $this->result->update([
+                'server_id' => $this->serverId,
                 'data' => json_decode($message, true),
                 'status' => ResultStatus::Failed,
             ]);
@@ -100,6 +101,7 @@ protected function checkForInternetConnection(): bool
 
         if ($ping->ping() === false) {
             $this->result->update([
+                'server_id' => $this->serverId,
                 'data' => [
                     'type' => 'log',
                     'level' => 'error',
diff --git a/app/Mail/SpeedtestCompletedMail.php b/app/Mail/SpeedtestCompletedMail.php
index 351f7f130..66890aa36 100644
--- a/app/Mail/SpeedtestCompletedMail.php
+++ b/app/Mail/SpeedtestCompletedMail.php
@@ -48,7 +48,7 @@ public function content(): Content
                 'service' => Str::title($this->result->service),
                 'serverName' => $this->result->server_name,
                 'serverId' => $this->result->server_id,
-                'isp' => $event->result->isp,
+                'isp' => $this->result->isp,
                 'ping' => round($this->result->ping, 2).' ms',
                 'download' => Number::toBitRate(bits: $this->result->download_bits, precision: 2),
                 'upload' => Number::toBitRate(bits: $this->result->upload_bits, precision: 2),
diff --git a/app/Mail/SpeedtestThresholdMail.php b/app/Mail/SpeedtestThresholdMail.php
index 5fd24ff1c..6fb93ee09 100644
--- a/app/Mail/SpeedtestThresholdMail.php
+++ b/app/Mail/SpeedtestThresholdMail.php
@@ -48,7 +48,7 @@ public function content(): Content
                 'service' => Str::title($this->result->service),
                 'serverName' => $this->result->server_name,
                 'serverId' => $this->result->server_id,
-                'isp' => $event->result->isp,
+                'isp' => $this->result->isp,
                 'url' => url('/admin/results'),
                 'metrics' => $this->metrics,
             ],
diff --git a/config/speedtest.php b/config/speedtest.php
index a15e925bc..16eae1d2e 100644
--- a/config/speedtest.php
+++ b/config/speedtest.php
@@ -4,9 +4,9 @@
 
 return [
 
-    'build_date' => Carbon::parse('2024-06-11'),
+    'build_date' => Carbon::parse('2024-06-12'),
 
-    'build_version' => 'v0.20.5',
+    'build_version' => 'v0.20.6',
 
     /**
      * General settings.
diff --git a/package-lock.json b/package-lock.json
index b5d257857..fe33a5fd0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1115,9 +1115,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.4.798",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.798.tgz",
-            "integrity": "sha512-by9J2CiM9KPGj9qfp5U4FcPSbXJG7FNzqnYaY4WLzX+v2PHieVGmnsA4dxfpGE3QEC7JofpPZmn7Vn1B9NR2+Q==",
+            "version": "1.4.800",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.800.tgz",
+            "integrity": "sha512-G8yyAReBP8m0XaW9BBH5NOJe4ZGYDDsPYkgLCG8xU6HwGKzrT0Jj51uAHkt1D+9ZxHPoGFSSZqqSN7HxAiP+0g==",
             "dev": true,
             "license": "ISC"
         },
@@ -1231,9 +1231,9 @@
             }
         },
         "node_modules/foreground-child": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-            "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.0.tgz",
+            "integrity": "sha512-CrWQNaEl1/6WeZoarcM9LHupTo3RpZO2Pdk1vktwzPiQTsJnAKJmm3TACKeG5UZbWDfaH2AbvYxzP96y0MT7fA==",
             "dev": true,
             "license": "ISC",
             "dependencies": {
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index d897c2ff5..8a03ce90c 100644
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -25,5 +25,15 @@
         <div class="col-span-full">
             @livewire(\App\Filament\Widgets\RecentJitterChartWidget::class)
         </div>
+
+        <div class="col-span-full">
+            @livewire(\App\Filament\Widgets\RecentDownloadLatencyChartWidget::class)
+        </div>
+
+        <div class="col-span-full">
+            @livewire(\App\Filament\Widgets\RecentUploadLatencyChartWidget::class)
+        </div>
+
     </div>
+
 </x-app-layout>