diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index f4d68ec..e3959c4 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -4,10 +4,10 @@ name: Ubuntu
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     branches:
-    - master
+    - main
 
 jobs:
   build:
@@ -17,16 +17,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04, ubuntu-20.04]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        os: [ubuntu-20.04, ubuntu-22.04]
+        python-version: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12', '3.13']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
+        allow-prereleases: true
 
     - name: Show environment
       run: |
@@ -35,14 +36,13 @@ jobs:
 
     - name: Install dependencies
       run: |
-        sudo apt-get -y install minisat
-        python -m pip install --upgrade pip tox
+        sudo apt-get -y install minisat python3-pip tox
 
     - name: Check style
-      if: matrix.os == 'ubuntu-20.04' && matrix.python-version == '3.9'
+      if: matrix.os == 'ubuntu-22.04' && matrix.python-version == '3.12'
       run: |
         tox -e style
 
     - name: Run tests
       run: |
-        tox -e slow
+        tox -e py,slow
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe9df72..5010798 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 2.2 (unreleased)
+
+* Raise minimum Python version to 3.7 and maximum Python version to 3.13 (#28).
+
+
 # 2.1 (2022-01-17)
 
 * Add options to API for removal of static facts from init, and removal of irrelevant operators (Blai Bonet, #14).
diff --git a/README.md b/README.md
index 96e71ef..975838b 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ costs.
 
 # Requirements
 
-Pyperplan requires [Python](https://python.org) >= 3.6.
+Pyperplan requires [Python](https://python.org) >= 3.7.
 
 # Installation
 
diff --git a/setup.py b/setup.py
index 6b08617..c5d0f9e 100644
--- a/setup.py
+++ b/setup.py
@@ -31,12 +31,15 @@
         "Intended Audience :: Science/Research",
         "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "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",
         "Topic :: Scientific/Engineering",
     ],
     install_requires=["wheel"],
-    python_requires=">=3.6",
+    python_requires=">=3.7",
 )