diff --git a/.dockerignore b/.dockerignore
index b698e9e..e22e233 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,4 +3,5 @@
 tools/
 .gitattributes
 CONTRIBUTING.md
+Dockerfile*
 wordlists.json
\ No newline at end of file
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index df7949f..eec3240 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -8,25 +8,25 @@ on:
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        architecture: [amd64, arm64]
+        os: [alpine, debian, ubuntu]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64
+          file: ./Dockerfile.${{ matrix.os }}
+          platforms: linux/${{ matrix.architecture }}
           push: true
-          tags: kkrypt0nn/wordlists:latest
+          tags: kkrypt0nn/wordlists:${{ matrix.os }}-latest
diff --git a/Dockerfile b/Dockerfile.alpine
similarity index 75%
rename from Dockerfile
rename to Dockerfile.alpine
index 3c25973..bb379a0 100644
--- a/Dockerfile
+++ b/Dockerfile.alpine
@@ -1,5 +1,4 @@
 FROM alpine:latest
-# FROM ubuntu:latest
 
 COPY wordlists /wordlists
 
diff --git a/Dockerfile.debian b/Dockerfile.debian
new file mode 100644
index 0000000..e01f731
--- /dev/null
+++ b/Dockerfile.debian
@@ -0,0 +1,5 @@
+FROM debian:latest
+
+COPY wordlists /wordlists
+
+WORKDIR /wordlists
\ No newline at end of file
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
new file mode 100644
index 0000000..9d92b8a
--- /dev/null
+++ b/Dockerfile.ubuntu
@@ -0,0 +1,5 @@
+FROM ubuntu:latest
+
+COPY wordlists /wordlists
+
+WORKDIR /wordlists
\ No newline at end of file
diff --git a/README.md b/README.md
index fce5c14..eb00b4f 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,9 @@
 </h4>
 
 <p align="center">
-  <a href="//hub.docker.com/r/kkrypt0nn/wordlists"><img src="https://img.shields.io/docker/v/kkrypt0nn/wordlists?logo=docker"></a>
+  <a href="//hub.docker.com/r/kkrypt0nn/wordlists"><img src="https://img.shields.io/docker/v/kkrypt0nn/wordlists/alpine-latest?logo=docker"></a>
+  <a href="//hub.docker.com/r/kkrypt0nn/wordlists"><img src="https://img.shields.io/docker/v/kkrypt0nn/wordlists/debian-latest?logo=docker"></a>
+  <a href="//hub.docker.com/r/kkrypt0nn/wordlists"><img src="https://img.shields.io/docker/v/kkrypt0nn/wordlists/ubuntu-latest?logo=docker"></a>
   <a href="//github.com/kkrypt0nn/wordlists"><img src="https://img.shields.io/github/repo-size/kkrypt0nn/wordlists"></a>
   <a href="//github.com/kkrypt0nn/wordlists/commits"><img src="https://img.shields.io/github/last-commit/kkrypt0nn/wordlists"></a>
   <a href="//github.com/kkrypt0nn/wordlists/contributors"><img src="https://img.shields.io/github/contributors/kkrypt0nn/wordlists"></a>
@@ -27,6 +29,16 @@ If you have a wordlist that you wish to see here, please post them [here](https:
 
 If you already have a wordlist ready to be added, make sure to [open a pull request](https://github.com/kkrypt0nn/wordlists/pulls).
 
+## 🐳 Docker Images
+
+There are three Docker images available with for the three main OS images:
+
+- `alpine-latest`
+- `debian-latest`
+- `ubuntu-latest`
+
+These will have a `/wordlists` file with all the wordlists in there for you to use them.
+
 ## 📜 Wordlists
 
 <details>
diff --git a/tools/make_readme.py b/tools/make_readme.py
index d3fc905..072f4ef 100644
--- a/tools/make_readme.py
+++ b/tools/make_readme.py
@@ -40,7 +40,9 @@ readme_template = """<h1 align="center">
 </h4>
 
 <p align="center">
-  <a href="//hub.docker.com/r/kkrypt0nn/wordlists"><img src="https://img.shields.io/docker/v/kkrypt0nn/wordlists?logo=docker"></a>
+  <a href="//hub.docker.com/r/kkrypt0nn/wordlists"><img src="https://img.shields.io/docker/v/kkrypt0nn/wordlists/alpine-latest?logo=docker"></a>
+  <a href="//hub.docker.com/r/kkrypt0nn/wordlists"><img src="https://img.shields.io/docker/v/kkrypt0nn/wordlists/debian-latest?logo=docker"></a>
+  <a href="//hub.docker.com/r/kkrypt0nn/wordlists"><img src="https://img.shields.io/docker/v/kkrypt0nn/wordlists/ubuntu-latest?logo=docker"></a>
   <a href="//github.com/kkrypt0nn/wordlists"><img src="https://img.shields.io/github/repo-size/kkrypt0nn/wordlists"></a>
   <a href="//github.com/kkrypt0nn/wordlists/commits"><img src="https://img.shields.io/github/last-commit/kkrypt0nn/wordlists"></a>
   <a href="//github.com/kkrypt0nn/wordlists/contributors"><img src="https://img.shields.io/github/contributors/kkrypt0nn/wordlists"></a>
@@ -60,6 +62,16 @@ If you have a wordlist that you wish to see here, please post them [here](https:
 
 If you already have a wordlist ready to be added, make sure to [open a pull request](https://github.com/kkrypt0nn/wordlists/pulls).
 
+## 🐳 Docker Images
+
+There are three Docker images available with for the three main OS images:
+
+- `alpine-latest`
+- `debian-latest`
+- `ubuntu-latest`
+
+These will have a `/wordlists` file with all the wordlists in there for you to use them.
+
 ## 📜 Wordlists
 
 [[TOGGLE]]