diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f28f42102f519e92ac915b093854061e81c19e8d..f7a18a1f21d4593aebb537f8b9dd94b3ac4d5d03 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,13 +38,13 @@ build:
     paths:
       - ${PRE_COMMIT_HOME}
 
-flake8:
+autoflake:
   extends:
     - .code_changes
     - .pre-commit
   stage: checks
   script:
-    - pre-commit run -a flake8
+    - pre-commit run -a autoflake
 
 format:
   extends:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a57878525e31cfca69f5b20c9095e301aa734913..e1561f068bb8a595f3c883d5261146a94cdb4424 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -51,7 +51,14 @@ repos:
     rev: 0.7.16
     hooks:
       - id: mdformat
-- repo: https://github.com/PyCQA/flake8
-  rev: 5.0.4
-  hooks:
-      - id: flake8
+-   repo: https://github.com/PyCQA/autoflake
+    rev: v1.7.7
+    hooks:
+    -   id: autoflake
+        args:
+        - --recursive
+        - --expand-star-imports
+        - --remove-all-unused-imports
+        - --remove-duplicate-keys
+        - --remove-unused-variables
+        - --in-place