diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 6e465c3..28995a3 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -19,12 +19,11 @@ jobs:
       fail-fast: true
       matrix:
         py-version-img: [
-          ["3.8", "3.8-slim-bullseye"],
-          ["3.9", "3.9-slim-bullseye"],
-          ["3.10", "3.10-slim-bullseye"],
-          ["3.11", "3.11-slim-bullseye"]
+          ["3.9", "3.9-slim-bookworm"],
+          ["3.10", "3.10-slim-bookworm"],
+          ["3.11", "3.11-slim-bookworm"]
         ]
-        mongodb-version: ["4.2", "4.4", "5.0"]
+        mongodb-version: ["4.4", "5.0", "6.0", "7.0"]
         mongodb-port: [12345]
 
     steps:
@@ -82,10 +81,9 @@ jobs:
       fail-fast: true
       matrix:
         py-version-img-tag: [
-          ["3.8", "3.8-slim-bullseye", ""],
-          ["3.9", "3.9-slim-bullseye", ""],
-          ["3.10", "3.10-slim-bullseye", ""],
-          ["3.11", "3.11-slim-bullseye", "latest"],
+          ["3.9", "3.9-slim-bookworm", ""],
+          ["3.10", "3.10-slim-bookworm", ""],
+          ["3.11", "3.11-slim-bookworm", "latest"],
         ]
 
     steps:
diff --git a/examples/petstore-access-control/README.md b/examples/petstore-access-control/README.md
index c6595a6..5c274b5 100644
--- a/examples/petstore-access-control/README.md
+++ b/examples/petstore-access-control/README.md
@@ -79,7 +79,7 @@ Some notes:
 > executing the build command. For example:
 >  
 >    ```bash
->    export PETSTORE_PY_IMAGE=3.8-slim-buster
+>    export PETSTORE_PY_IMAGE=3.11-slim-bookworm
 >    ```
 >  
 > * In case Docker complains about port conflicts or if any of the used ports
diff --git a/examples/petstore/README.md b/examples/petstore/README.md
index 04e2c4d..2979170 100644
--- a/examples/petstore/README.md
+++ b/examples/petstore/README.md
@@ -77,7 +77,7 @@ Some notes:
 > executing the build command. For example:
 >  
 >    ```bash
->    export PETSTORE_PY_IMAGE=3.8-slim-buster
+>    export PETSTORE_PY_IMAGE=3.11-slim-bookworm
 >    ```
 >  
 > * In case Docker complains about port conflicts or if any of the used ports
diff --git a/setup.py b/setup.py
index 618c376..d6f53f7 100644
--- a/setup.py
+++ b/setup.py
@@ -55,7 +55,6 @@
         "Intended Audience :: System Administrators",
         "License :: OSI Approved :: Apache Software License",
         "Natural Language :: English",
-        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",