diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ec15f4b..1771066 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,7 @@ jobs:
       fail-fast: true
       matrix:
         OS: ["debian-bullseye", "debian-bookworm", "fedora-40"]
-        NODE_VERSION: ["18", "20", "22"]
+        NODE_VERSION: ["20", "22"]
         VARIANT: ["", "-nightly"]
     env:
       DOCKER_ARTIFACT_PATH: ./build/${{ matrix.OS }}-${{ matrix.NODE_VERSION }}${{ matrix.VARIANT }}.tar
@@ -46,7 +46,7 @@ jobs:
       fail-fast: true
       matrix:
         OS: ["debian-bullseye", "debian-bookworm", "fedora-40"]
-        NODE_VERSION: ["18", "20", "22"]
+        NODE_VERSION: ["20", "22"]
         VARIANT: ["", "-nightly"]
     env:
       DOCKER_ARTIFACT_PATH: ./build/${{ matrix.OS }}-${{ matrix.NODE_VERSION }}${{ matrix.VARIANT }}.tar
@@ -80,7 +80,7 @@ jobs:
       fail-fast: true
       matrix:
         OS: ["debian-bullseye", "debian-bookworm", "fedora-40"]
-        NODE_VERSION: ["18", "20", "22"]
+        NODE_VERSION: ["20", "22"]
         VARIANT: ["", "-nightly"]
     env:
       DOCKER_ARTIFACT_PATH: ./build/${{ matrix.OS }}-${{ matrix.NODE_VERSION }}${{ matrix.VARIANT }}.tar
diff --git a/README.md b/README.md
index 8e83a10..a423a49 100644
--- a/README.md
+++ b/README.md
@@ -58,12 +58,6 @@ Images are automatically updated on a daily basis.
 - [`debian-bookworm-20-nightly`](https://github.com/ivangabriele/docker-tauri/blob/main/dockerfiles/debian-bookworm-20-nightly.Dockerfile)
   - Base: [`rust:1-bookworm`](https://hub.docker.com/_/rust)
   - Debian v12 ("bookworm") + Rust v1 (nightly) + Node v20
-- [`debian-bookworm-18`](https://github.com/ivangabriele/docker-tauri/blob/main/dockerfiles/debian-bookworm-18.Dockerfile)
-  - Base: [`rust:1-bookworm`](https://hub.docker.com/_/rust)
-  - Debian v12 ("bookworm") + Rust v1 + Node v18
-- [`debian-bookworm-18-nightly`](https://github.com/ivangabriele/docker-tauri/blob/main/dockerfiles/debian-bookworm-18-nightly.Dockerfile)
-  - Base: [`rust:1-bookworm`](https://hub.docker.com/_/rust)
-  - Debian v12 ("bookworm") + Rust v1 (nightly) + Node v18
 
 ### Debian v11 ("bullseye")
 
@@ -82,12 +76,6 @@ Images are automatically updated on a daily basis.
 - [`debian-bullseye-20-nightly`](https://github.com/ivangabriele/docker-tauri/blob/main/dockerfiles/debian-bullseye-20-nightly.Dockerfile)
   - Base: [`rust:1-bullseye`](https://hub.docker.com/_/rust)
   - Debian v11 ("bullseye") + Rust v1 (nightly) + Node v20
-- [`debian-bullseye-18`](https://github.com/ivangabriele/docker-tauri/blob/main/dockerfiles/debian-bullseye-18.Dockerfile)
-  - Base: [`rust:1-bullseye`](https://hub.docker.com/_/rust)
-  - Debian v11 ("bullseye") + Rust v1 + Node v18
-- [`debian-bullseye-18-nightly`](https://github.com/ivangabriele/docker-tauri/blob/main/dockerfiles/debian-bullseye-18-nightly.Dockerfile)
-  - Base: [`rust:1-bullseye`](https://hub.docker.com/_/rust)
-  - Debian v11 ("bullseye") + Rust v1 (nightly) + Node v18
 
 ### Fedora v40
 
@@ -106,17 +94,15 @@ Images are automatically updated on a daily basis.
 - [`fedora-40-nightly`](https://github.com/ivangabriele/docker-tauri/blob/main/dockerfiles/fedora-40-nightly.Dockerfile)
   - Base: [`fedora:40`](https://hub.docker.com/_/fedora)
   - Debian v12 ("bookworm") + Rust v1 (nightly) + Node v20
-- [`fedora-40`](https://github.com/ivangabriele/docker-tauri/blob/main/dockerfiles/fedora-40.Dockerfile)
-  - Base: [`fedora:40`](https://hub.docker.com/_/fedora)
-  - Debian v12 ("bookworm") + Rust v1 + Node v18
-- [`fedora-40-nightly`](https://github.com/ivangabriele/docker-tauri/blob/main/dockerfiles/fedora-40-nightly.Dockerfile)
-  - Base: [`fedora:40`](https://hub.docker.com/_/fedora)
-  - Debian v12 ("bookworm") + Rust v1 (nightly) + Node v18
 
 ### Legacy tags
 
 These tags exist but their image is not updated anymore.
 
+- [`debian-bookworm-18`](https://github.com/ivangabriele/docker-tauri/blob/main/dockerfiles/debian-bookworm-18.Dockerfile)
+- [`debian-bookworm-18-nightly`](https://github.com/ivangabriele/docker-tauri/blob/main/dockerfiles/debian-bookworm-18-nightly.Dockerfile)
+- [`debian-bullseye-18`](https://github.com/ivangabriele/docker-tauri/blob/main/dockerfiles/debian-bullseye-18.Dockerfile)
+- [`debian-bullseye-18-nightly`](https://github.com/ivangabriele/docker-tauri/blob/main/dockerfiles/debian-bullseye-18-nightly.Dockerfile)
 - [`fedora-37-20`](https://github.com/ivangabriele/docker-tauri/blob/main/dockerfiles/fedora-37-20.Dockerfile)
 - [`fedora-37-20-nightly`](https://github.com/ivangabriele/docker-tauri/blob/main/dockerfiles/fedora-37-20-nightly.Dockerfile)
 - [`fedora-37-18`](https://github.com/ivangabriele/docker-tauri/blob/main/dockerfiles/fedora-37-18.Dockerfile)
diff --git a/dockerfiles/debian-bookworm-18-nightly.Dockerfile b/dockerfiles/legacy/debian-bookworm-18-nightly.Dockerfile
similarity index 100%
rename from dockerfiles/debian-bookworm-18-nightly.Dockerfile
rename to dockerfiles/legacy/debian-bookworm-18-nightly.Dockerfile
diff --git a/dockerfiles/debian-bookworm-18.Dockerfile b/dockerfiles/legacy/debian-bookworm-18.Dockerfile
similarity index 100%
rename from dockerfiles/debian-bookworm-18.Dockerfile
rename to dockerfiles/legacy/debian-bookworm-18.Dockerfile
diff --git a/dockerfiles/debian-bullseye-18-nightly.Dockerfile b/dockerfiles/legacy/debian-bullseye-18-nightly.Dockerfile
similarity index 100%
rename from dockerfiles/debian-bullseye-18-nightly.Dockerfile
rename to dockerfiles/legacy/debian-bullseye-18-nightly.Dockerfile
diff --git a/dockerfiles/debian-bullseye-18.Dockerfile b/dockerfiles/legacy/debian-bullseye-18.Dockerfile
similarity index 100%
rename from dockerfiles/debian-bullseye-18.Dockerfile
rename to dockerfiles/legacy/debian-bullseye-18.Dockerfile
diff --git a/dockerfiles/fedora-37-18-nightly.Dockerfile b/dockerfiles/legacy/fedora-37-18-nightly.Dockerfile
similarity index 100%
rename from dockerfiles/fedora-37-18-nightly.Dockerfile
rename to dockerfiles/legacy/fedora-37-18-nightly.Dockerfile
diff --git a/dockerfiles/fedora-37-18.Dockerfile b/dockerfiles/legacy/fedora-37-18.Dockerfile
similarity index 100%
rename from dockerfiles/fedora-37-18.Dockerfile
rename to dockerfiles/legacy/fedora-37-18.Dockerfile
diff --git a/dockerfiles/fedora-37-20-nightly.Dockerfile b/dockerfiles/legacy/fedora-37-20-nightly.Dockerfile
similarity index 100%
rename from dockerfiles/fedora-37-20-nightly.Dockerfile
rename to dockerfiles/legacy/fedora-37-20-nightly.Dockerfile
diff --git a/dockerfiles/fedora-37-20.Dockerfile b/dockerfiles/legacy/fedora-37-20.Dockerfile
similarity index 100%
rename from dockerfiles/fedora-37-20.Dockerfile
rename to dockerfiles/legacy/fedora-37-20.Dockerfile