diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 06a3cdb24fbb5b1a3643475434e6833b2b24e7d4..61f63e595add69e85179df35957d9ca77ca474e2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,8 @@ include:
 stages:
   - build
   - build-test-images
-  - lint
+  # TODO: Re-enable after fixing #82
+  # - lint
   - application-test
   - integration-test
 
@@ -166,14 +167,16 @@ behave-integration:
     expire_in: 1 month
     when: on_failure
 
-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 master to squash commits"
-    # - git reset --soft master
-    - git lint
+# TODO: Fix https://open.greenhost.net/stackspin/single-sign-on/-/issues/82
+#
+# 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 master to squash commits"
+#     - git reset --soft master
+#     - git lint