diff --git a/.github/workflows/commit.yaml b/.github/workflows/commit.yaml
index 85525e8c5..7c6754157 100644
--- a/.github/workflows/commit.yaml
+++ b/.github/workflows/commit.yaml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ["3.8", "3.9", "3.10.9", "3.11", "3.12"]
+        python-version: ["3.9", "3.10.9", "3.11", "3.12", "3.13"]
 
     steps:
       - name: Checkout repository
diff --git a/README.md b/README.md
index 764f39bff..8b8bf8b93 100644
--- a/README.md
+++ b/README.md
@@ -31,15 +31,15 @@ Install
 pip install napalm
 ```
 
+*Note*: Beginning with release 5.1.0 and later, NAPALM offers support for
+Python 3.9+ only.
+
 *Note*: Beginning with release 5.0.0 and later, NAPALM offers support for
 Python 3.8+ only.
 
 *Note*: Beginning with release 4.0.0 and later, NAPALM offers support for
 Python 3.7+ only.
 
-*Note*: Beginning with release 3.0.0 and later, NAPALM offers support for
-Python 3.6+ only.
-
 
 Upgrading
 =========
diff --git a/setup.py b/setup.py
index a7e9fa615..4819d6106 100644
--- a/setup.py
+++ b/setup.py
@@ -19,19 +19,17 @@
     author="David Barroso, Kirk Byers, Mircea Ulinic",
     author_email="dbarrosop@dravetech.com, ping@mirceaulinic.net, ktbyers@twb-tech.com",
     description="Network Automation and Programmability Abstraction Layer with Multivendor support",
-    license="Apache 2.0",
+    license = "Apache-2.0"
     long_description=long_description,
     long_description_content_type="text/markdown",
     classifiers=[
         "Topic :: Utilities",
-        "License :: OSI Approved :: Apache Software License",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
+        "License :: OSI Approved :: Apache Software License 2.0 (Apache-2.0)",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Operating System :: POSIX :: Linux",
         "Operating System :: MacOS",
     ],