diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 4649ba1f..65a4d0b1 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.x'
+        python-version: '3.8'
 
     - name: Install dependencies
       run: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5282ca3f..b402e711 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,13 +12,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-18.04, windows-latest, macOS-latest ]
-        python-version: [3.6]
+        os: [ ubuntu-20.04, windows-latest, macOS-latest ]
+        python-version: [3.8]
         include:
           - os: ubuntu-latest
             python-version: 3.7
-          - os: ubuntu-latest
-            python-version: 3.8
           - os: ubuntu-latest
             python-version: 3.9
 
@@ -30,7 +28,7 @@ jobs:
       with:
         path: emodb-src
         key: emodb-ubuntu
-      if: matrix.os == 'ubuntu-18.04'
+      if: matrix.os == 'ubuntu-20.04'
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
@@ -41,7 +39,7 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install --no-install-recommends --yes graphviz libsndfile1 sox
-      if: matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-18.04'
+      if: matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-20.04'
 
     - name: Prepare Windows
       run: choco install sox.portable
@@ -68,10 +66,10 @@ jobs:
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         file: ./coverage.xml
-      if: matrix.os == 'ubuntu-18.04'
+      if: matrix.os == 'ubuntu-20.04'
 
     - name: Test building documentation
       run: |
         python -m sphinx docs/ docs/_build/ -b html -W
         python -m sphinx docs/ build/sphinx/html -b linkcheck
-      if: matrix.os == 'ubuntu-18.04'
+      if: matrix.os == 'ubuntu-20.04'
diff --git a/setup.cfg b/setup.cfg
index 2994005b..882b6dad 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,6 @@ classifiers =
     Operating System :: OS Independent
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9