diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c59b8d2c..b039a40e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -30,38 +30,38 @@ jobs:
             **/*.go
             go.mod
             go.sum
-      - name: tests
+      - name: Unit Tests
         if: env.GIT_DIFF
         run: |
           make test
 
-  test-e2e:
-    runs-on: ubuntu-latest
-    timeout-minutes: 25
-    steps:
-      - uses: actions/checkout@v3
-      - uses: technote-space/get-diff-action@v6.1.2
-        with:
-          PATTERNS: |
-            **/**.go
-            go.mod
-            go.sum
-      - uses: actions/setup-go@v4
-        if: env.GIT_DIFF
-        with:
-          go-version: "1.20"
-          cache: true
+  # test-integration:
+  #   runs-on: ubuntu-latest
+  #   timeout-minutes: 25
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #     - uses: technote-space/get-diff-action@v6.1.2
+  #       with:
+  #         PATTERNS: |
+  #           **/**.go
+  #           go.mod
+  #           go.sum
+  #     - uses: actions/setup-go@v4
+  #       if: env.GIT_DIFF
+  #       with:
+  #         go-version: "1.20"
+  #         cache: true
 
-      # In this step, this action saves a list of existing images, the cache is
-      # created without them in the post run. It also restores the cache if it
-      # exists.
-      - name: cache docker layer
-        uses: satackey/action-docker-layer-caching@v0.0.11
-        if: env.GIT_DIFF
-        # Ignore the failure of a step and avoid terminating the job.
-        continue-on-error: true
+  #     # In this step, this action saves a list of existing images, the cache is
+  #     # created without them in the post run. It also restores the cache if it
+  #     # exists.
+  #     - name: cache docker layer
+  #       uses: satackey/action-docker-layer-caching@v0.0.11
+  #       if: env.GIT_DIFF
+  #       # Ignore the failure of a step and avoid terminating the job.
+  #       continue-on-error: true
 
-      - name: Test E2E
-        if: env.GIT_DIFF
-        run: |
-          make test-integration
+  #     - name: Integration Tests
+  #       if: env.GIT_DIFF
+  #       run: |
+  #         make test-integration
diff --git a/.golangci.yml b/.golangci.yml
index 85afc247..d2086fab 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -4,8 +4,6 @@ run:
   sort-results: true
   allow-parallel-runners: true
   concurrency: 4
-  skip-dirs:
-    - tests/e2e
 
 linters:
   disable-all: true
@@ -35,15 +33,6 @@ issues:
     - text: "Use of weak random number generator"
       linters:
         - gosec
-    # - text: "ST1003:"
-    #   linters:
-    #     - stylecheck
-    # - text: "ST1016:"
-    #   linters:
-    #     - stylecheck
-    # - text: "leading space"
-    #   linters:
-    #     - nolintlint
 
   max-issues-per-linter: 10000
   max-same-issues: 10000
diff --git a/.mergify.yml b/.mergify.yml
index 68e05d47..ea6e2a4e 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -23,20 +23,4 @@ pull_request_rules:
     actions:
       backport:
         branches:
-          - release/v1.x.x
-  - name: backport patches to v1.x.x-polaris branch
-    conditions:
-      - base=main
-      - label=backport/v1.x.x-polaris
-    actions:
-      backport:
-        branches:
-          - release/v1.x.x-polaris
-  - name: backport patches to v2.x.x branch
-    conditions:
-      - base=main
-      - label=backport/v2.x.x
-    actions:
-      backport:
-        branches:
-          - release/v2.x.x
\ No newline at end of file
+          - release/v1.x.x
\ No newline at end of file