diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index 12dd8d3..bf3b17c 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -5,7 +5,7 @@ on: [pull_request]
 
 jobs:
   build:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     strategy:
       max-parallel: 4
       fail-fast: false
@@ -18,22 +18,33 @@ jobs:
           - "3.11"
           - "3.12"
           - "3.13"
-        include:
-          - os: "ubuntu-latest"
-          - os: "ubuntu-20.04"
-            python-version: "3.6"
-
+    container: ${{ contains(matrix.python-version, '3.6') && 'registry.opensuse.org/home/okurz/container/leap15/containers/leap:openQA-python-client-ci' || '' }}
     steps:
       - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Set up Python ${{ matrix.python-version }}
+        if: matrix.python-version != '3.6'
         uses: actions/setup-python@v6.0.0
         with:
           python-version: ${{ matrix.python-version }}
+      - name: Adjust 3.6 image
+        if: matrix.python-version == '3.6'
+        run: |
+          ln -s /usr/bin/python3 /usr/local/bin/python
+          whoami
+          ls -l /
+          ls -la /github/home/
+          mkdir -p /github/home/.cache/
+          ls -la /github/home/
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install tox tox-gh-actions
       - name: Test with tox
-        run: tox
+        run: |
+          pwd
+          ls -la
+          tox list
+          tox config
+          tox
diff --git a/tox.ini b/tox.ini
index eab878c..9a3d1fc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,10 @@
 envlist = py36,py38,py39,py310,py311,py312,py313,ci
 skip_missing_interpreters = true
 isolated_build = true
+# https://tox.wiki/en/4.11.3/faq.html#testing-end-of-life-python-versions
+# for python3.6
+requires = virtualenv<20.22.0
+
 
 [gh-actions]
 python =