diff --git a/.github/workflows/squash.yml b/.github/workflows/squash.yml
index a34b457..fe1d78a 100644
--- a/.github/workflows/squash.yml
+++ b/.github/workflows/squash.yml
@@ -10,11 +10,11 @@ on:
 
 jobs:
   build-docker-24:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
@@ -35,11 +35,11 @@ jobs:
           echo "Running tests for Python version  $PV ( ${PV/./} )"
           make test-py"${PV/./}"
   build-docker-25:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
@@ -51,7 +51,7 @@ jobs:
           for pkg in containerd runc; do sudo apt-get remove $pkg; done
           sudo apt-get update
           sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-          sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu focal stable"
+          sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu jammy stable"
           apt-cache policy docker-ce
           sudo apt-get install docker-ce docker-ce-cli containerd.io
           pip install "tox<4.0.0" setuptools
@@ -65,11 +65,11 @@ jobs:
           echo "Running tests for Python version  $PV ( ${PV/./} )"
           make test-py"${PV/./}"
   build-podman-3:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
diff --git a/Makefile b/Makefile
index cba2f08..09703fd 100644
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,6 @@ CIRCLE_NODE_INDEX ?= 0
 test: prepare
 	tox -- tests
 
-test-py36: prepare
-	tox -e py36 -- tests
-
 test-py37: prepare
 	tox -e py37 -- tests
 
@@ -24,6 +21,9 @@ test-py311: prepare
 test-py312: prepare
 	tox -e py312 -- tests
 
+test-py313: prepare
+	tox -e py313 -- tests
+
 test-unit: prepare
 	tox -- tests/test_unit*
 
diff --git a/tox.ini b/tox.ini
index be55ca2..50eae2e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py37,py38,py39,py310,py311,py312
+envlist = py37,py38,py39,py310,py311,py312,py313
 
 [testenv]
 passenv=