diff --git a/.golangci.yml b/.golangci.yml
index 4221d211dc6..358addd0c13 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -280,10 +280,21 @@ issues:
       - revive
       text: "^unused-parameter: parameter '.*' seems to be unused, consider removing or renaming it as _$"
       path: .*(_test|test)\.go$
+    # Ignore adding package comments for all files. TODO: Ideally, we should add package comments to all the packages files.
     - linters:
       - revive
-      text: "package-comments: package comment should be of the form"
-      path: .*_test\.go$
+      text: "^package-comments: package comment should be of the form \".*\"$"
+      path: .*\.go$
+    # Ignore adding package comments for all files. TODO: Ideally, we should add package comments to all the packages files.
+    - linters:
+      - stylecheck
+      text: "ST1000: at least one file in a package should have a package comment"
+      path: .*\.go$
+    # Ignore adding package comments for all files. TODO: Ideally, we should add package comments to all the packages files.
+    - linters:
+        - revive
+      text: "package-comments: should have a package comment"
+      path: .*\.go$
   # We are disabling default golangci exclusions because we want to help reviewers to focus on reviewing the most relevant
   # changes in PRs and avoid nitpicking.
   exclude-use-default: false