diff --git a/app/Http/Livewire/Project/Application/Revert.php b/app/Http/Livewire/Project/Application/Revert.php
new file mode 100644
index 000000000..f1917ef85
--- /dev/null
+++ b/app/Http/Livewire/Project/Application/Revert.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Http\Livewire\Project\Application;
+
+use App\Models\Application;
+use Livewire\Component;
+use Illuminate\Support\Str;
+
+class Revert extends Component
+{
+    public Application $application;
+    public $images = [];
+    public string $current;
+    public function loadImages()
+    {
+        try {
+            $image = $this->application->uuid;
+            $output = instantRemoteProcess([
+                "docker inspect --format='{{.Config.Image}}' {$this->application->uuid}",
+            ], $this->application->destination->server, throwError: false);
+            $current_tag = Str::of($output)->trim()->explode(":");
+            $this->current = data_get($current_tag, 1);
+
+            $output = instantRemoteProcess([
+                "docker images --format '{{.Repository}}#{{.Tag}}#{{.CreatedAt}}'",
+            ], $this->application->destination->server);
+            $this->images = Str::of($output)->trim()->explode("\n")->filter(function ($item) use ($image) {
+                return Str::of($item)->contains($image);
+            })->map(function ($item) {
+                $item = Str::of($item)->explode('#');
+                if ($item[1] === $this->current) {
+                    $item[1] = $item[1] . " (current)";
+                }
+                return [
+                    'tag' => $item[1],
+                    'createdAt' => $item[2],
+                ];
+            })->toArray();
+        } catch (\Throwable $e) {
+            return generalErrorHandler($e, $this);
+        }
+    }
+}
diff --git a/app/Models/Application.php b/app/Models/Application.php
index df4b47c9d..57ef28501 100644
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -73,7 +73,6 @@ public function gitCommits(): Attribute
                     return "{$this->source->html_url}/{$this->git_repository}/commits/{$this->git_branch}";
                 }
             }
-
         );
     }
     public function baseDirectory(): Attribute
diff --git a/resources/views/components/proxy/loading.blade.php b/resources/views/components/loading.blade.php
similarity index 100%
rename from resources/views/components/proxy/loading.blade.php
rename to resources/views/components/loading.blade.php
diff --git a/resources/views/livewire/project/application/revert.blade.php b/resources/views/livewire/project/application/revert.blade.php
new file mode 100644
index 000000000..2ca8e5e29
--- /dev/null
+++ b/resources/views/livewire/project/application/revert.blade.php
@@ -0,0 +1,27 @@
+<div x-init="$wire.loadImages">
+    <div wire:loading wire:target='loadImages'>
+        <x-loading />
+    </div>
+    <div wire:loading.remove>
+        <div class="flex flex-wrap">
+            @forelse ($images as $image)
+                <div class="w-1/2 p-2">
+                    <div class="rounded-lg shadow-lg bg-coolgray-200 ">
+                        <div class="p-2">
+                            <div class="text-sm font-bold">{{ data_get($image, 'tag') }}</div>
+                            <div class="text-xs">{{ data_get($image, 'createdAt') }}</div>
+                        </div>
+                        <div class="flex justify-end p-2">
+                            <x-inputs.button
+                                wire:click="revertImage('{{ data_get($image, 'name') }}', '{{ data_get($image, 'tag') }}')">
+                                Revert
+                            </x-inputs.button>
+                        </div>
+                    </div>
+                </div>
+            @empty
+                <div>No images found</div>
+            @endforelse
+        </div>
+    </div>
+</div>
diff --git a/resources/views/livewire/server/proxy.blade.php b/resources/views/livewire/server/proxy.blade.php
index 3532c5e49..69a245c18 100644
--- a/resources/views/livewire/server/proxy.blade.php
+++ b/resources/views/livewire/server/proxy.blade.php
@@ -30,7 +30,7 @@
                 </div>
                 <div x-init="$wire.checkProxySettingsInSync">
                     <div wire:loading wire:target="checkProxySettingsInSync">
-                        <x-proxy.loading />
+                        <x-loading />
                     </div>
                     @isset($proxy_settings)
                         <h3>Configuration</h3>
diff --git a/resources/views/project/application/configuration.blade.php b/resources/views/project/application/configuration.blade.php
index 499bb8e09..e4e5a0c52 100644
--- a/resources/views/project/application/configuration.blade.php
+++ b/resources/views/project/application/configuration.blade.php
@@ -42,7 +42,7 @@
                 <livewire:project.application.storages.all :application="$application" />
             </div>
             <div x-cloak x-show="activeTab === 'revert'">
-                <h3>TODO 🚧</h3>
+                <livewire:project.application.revert :application="$application" />
             </div>
             {{-- <div x-cloak x-show="activeTab === 'previews'">
                 <livewire:project.application.previews :application="$application" />