diff --git a/.credo.exs b/.credo.exs
index 580cb2705..947280f56 100644
--- a/.credo.exs
+++ b/.credo.exs
@@ -69,8 +69,8 @@
         # You can also customize the exit_status of each check.
         # If you don't want TODO comments to cause `mix credo` to fail, just
         # set this value to 0 (zero).
-        {Credo.Check.Design.TagTODO, exit_status: 2},
-        {Credo.Check.Design.TagFIXME},
+        {Credo.Check.Design.TagTODO, exit_status: 0},
+        {Credo.Check.Design.TagFIXME, exit_status: 0},
 
         {Credo.Check.Readability.FunctionNames},
         {Credo.Check.Readability.LargeNumbers},
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c86097ad..bd94d146b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,4 +42,4 @@ unit-testing:
 analysis:
   stage: analysis
   script:
-    - mix credo list --only=warnings
+    - mix credo list --only=warnings,todo,fixme