diff --git a/assets/main.ts b/assets/main.ts
index 51ad5f78..818585ba 100644
--- a/assets/main.ts
+++ b/assets/main.ts
@@ -3,7 +3,7 @@ import { createApp } from "vue";
 import { createRouter, createWebHistory } from "vue-router";
 import { Autocomplete, Button, Dropdown, Switch, Radio, Field, Tooltip, Modal, Config } from "@oruga-ui/oruga-next";
 import { bulmaConfig } from "@oruga-ui/theme-bulma";
-import { createPinia } from 'pinia'
+import { createPinia } from "pinia";
 import config from "./stores/config";
 import App from "./App.vue";
 import { Container, Settings, Index, Show, ContainerNotFound, PageNotFound, Login } from "./pages";
@@ -21,7 +21,7 @@ const routes = [
     props: true,
   },
   {
-    path: "/container/*",
+    path: "/container/:pathMatch(.*)",
     component: ContainerNotFound,
     name: "container-not-found",
   },
@@ -41,7 +41,7 @@ const routes = [
     name: "login",
   },
   {
-    path: "/*",
+    path: "/:pathMatch(.*)*",
     component: PageNotFound,
     name: "page-not-found",
   },
diff --git a/assets/pages/PageNotFound.vue b/assets/pages/PageNotFound.vue
index 874058ea..bfeb2d92 100644
--- a/assets/pages/PageNotFound.vue
+++ b/assets/pages/PageNotFound.vue
@@ -3,8 +3,8 @@
     <div class="hero-body">
       <div class="container has-text-centered">
         <h1 class="title">
-          Oops,
-          <small class="subtitle">this page doesn't exist</small>
+          404.
+          <small class="subtitle">This page does not exist.</small>
         </h1>
       </div>
     </div>
diff --git a/e2e/cypress/integration/dozzle_routes.spec.js b/e2e/cypress/integration/dozzle_routes.spec.js
new file mode 100644
index 00000000..0817d395
--- /dev/null
+++ b/e2e/cypress/integration/dozzle_routes.spec.js
@@ -0,0 +1,7 @@
+/// <reference types="cypress" />
+
+context("Dozzle routes", { baseUrl: Cypress.env("DOZZLE_DEFAULT") }, () => {
+  it("show", () => {
+    cy.visit("/show?name=dozzle").url().should("include", "/container/");
+  });
+});