diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
index dc5b03c..5e6325c 100644
--- a/.github/workflows/regression.yml
+++ b/.github/workflows/regression.yml
@@ -16,8 +16,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-2016, windows-latest, ubuntu-16.04, ubuntu-20.04]
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
+        os: [windows-latest, ubuntu-latest]
+        python-version: ["3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
   
     steps:
     
@@ -28,10 +28,10 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
 
-    - name: Install Python 2.7 dependencies
-      if: ${{ matrix.python-version == 2.7 }}
-      run: |
-        pip install mock==1.0.1
+#    - name: Install Python 2.7 dependencies
+#      if: ${{ matrix.python-version == 2.7 }}
+#      run: |
+#        pip install mock==1.0.1
 
     - name: Install common dependencies
       run: |
diff --git a/.github/workflows/vs_ide.yml b/.github/workflows/vs_ide.yml
index 0ddf6d8..065db12 100644
--- a/.github/workflows/vs_ide.yml
+++ b/.github/workflows/vs_ide.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest]
-        python-version: [2.7, 3.8]
+        python-version: [3.10, 3.11]
   
     steps:
     
diff --git a/.reuse/dep5 b/.reuse/dep5
index c890cc6..dc91f72 100644
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -39,5 +39,3 @@ Files: resources/gmake/*
 Copyright: Copyright (C) 1988-2020 Free Software Foundation, Inc.
 License: GPL-3.0-or-later
 Comment: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law.
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b1b62a..acaeed5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,17 @@ All notable changes to this project will be documented in this file.
 Release name format: [2.2.1] - 2020-02-02
 -->
 
+## Next Release
+
+### Fixed
+
+- Fixed CI issues with non-compliant text in `dep5` file
+
+### Removed
+
+- Removed official support of Python 2.7 as its support was dropped by GitHub containers
+
+
 ## [2.1.7] - 2021-04-13
 
 ### Added
diff --git a/README.md b/README.md
index 23a3d3b..b038bed 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 ![GNU](https://img.shields.io/badge/GNU-Make%20|%20GCC-blue?style=flat&logo=GNU&logoColor=white) 
 ![Windows](https://img.shields.io/badge/Windows-7%20|%2010-blue?style=flat&logo=Windows&logoColor=white) 
 ![Linux](https://img.shields.io/badge/Linux-Debian%20Derivatives%20+-blue?style=flat&logo=Linux&logoColor=white) 
-![python](https://img.shields.io/badge/python-2.7%20|%203.5--3.8-blue?style=flat&logo=Python&logoColor=white)  
+![python](https://img.shields.io/badge/python-3.5--3.11-blue?style=flat&logo=Python&logoColor=white)  
 [![standard-readme compliant](https://img.shields.io/badge/readme_style-standard-brightgreen)](https://github.com/RichardLitt/standard-readme)
 [![REUSE Compliance](https://github.com/westerndigitalcorporation/stat/workflows/REUSE%20Compliance/badge.svg?branch=master)](https://api.reuse.software/info/git.fsfe.org/reuse/api)
 [![Regression](https://github.com/westerndigitalcorporation/stat/workflows/Regression/badge.svg?branch=master)](https://github.com/westerndigitalcorporation/stat/actions?query=workflow%3ARegression+branch%3Amaster)
diff --git a/tests/test_statMakefileGenerator.py b/tests/test_statMakefileGenerator.py
index 1a0e793..ff8a7da 100644
--- a/tests/test_statMakefileGenerator.py
+++ b/tests/test_statMakefileGenerator.py
@@ -22,7 +22,7 @@ class TestStatMakefileGenerator(FileBasedTestCase):
     def setUp(self):
         directory = os.path.dirname(attributes.AUTO_GENERATED_MAKEFILE)
         remove(directory)
-        self.buildToolsCrawler = self.patch(CUT, BuildToolsCrawler.__name__, auto_spec=True)
+        self.buildToolsCrawler = self.patch(CUT, BuildToolsCrawler.__name__, autospec=True)
         self.buildToolsCrawler.return_value.getBuildAttributes.return_value = TEST_TOOL_ATTRIBUTES
 
     def tearDown(self):