diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd482a02a657313f362893aaa5f494f2fe115b8c..1bed9b4210e42925b924fc6b8c307dc4dc59feda 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,6 @@ include:
 
 stages:
   - build
-  # TODO: Re-enable after fixing #82
   - lint
   # TODO: Re-enable after fixing #73
   # - application-test
@@ -208,8 +207,6 @@ behave-integration:
     when: on_failure
 
 
-# TODO: Fix https://open.greenhost.net/stackspin/single-sign-on/-/issues/82
-#
 pylint:
   stage: build
   variables:
@@ -221,18 +218,6 @@ pylint:
       - test/lint/pylint/Dockerfile
       - test/lint/pylint/requirements.txt
       - .gitlab-ci.yml
-#
-# pylint-lint:
-#   stage: lint
-#   variables:
-#     GIT_AUTHOR_NAME: "RUNNER"
-#     GIT_AUTHOR_EMAIL: "runner@greenhost.net"
-#     PYLINT_PLUGINS: "pylint_flask pylint_flask_sqlalchemy"
-#   image: ${CI_REGISTRY_IMAGE}/pylint:${CI_COMMIT_REF_NAME}
-#   script:
-#     - echo "Reverting back to main to squash commits"
-#     - git reset --soft main
-#     - git lint
 
 pylint-lint:
   stage: lint