diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index bc7f17b..a842388 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,10 +4,13 @@ version: 2
 updates:
   - package-ecosystem: "gomod"
     directory: "/" # Location of package manifests
-    default_labels:
-        - "🤖 Dependencies"
+    labels:
+      - "🤖 Dependencies"
     schedule:
-        interval: "daily"
-    automerged_updates:
-        -   match:
-                dependency_name: "gofiber/fiber/*"
+      interval: daily
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule: 
+      interval: daily
+    labels: 
+      - "🤖 Dependencies"
diff --git a/.github/workflows/dependabot_automerge.yml b/.github/workflows/dependabot_automerge.yml
new file mode 100644
index 0000000..2bf542a
--- /dev/null
+++ b/.github/workflows/dependabot_automerge.yml
@@ -0,0 +1,39 @@
+name: Dependabot auto-merge
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  wait_for_checks:
+    runs-on: ubuntu-latest
+    steps:
+       - name: Wait for check is finished
+         uses: lewagon/wait-on-check-action@v1.0.0
+         id: wait_for_checks
+         with:
+             ref: ${{ github.event.pull_request.head.sha || github.sha }}
+             running-workflow-name: wait_for_checks
+             check-regexp: Tests
+             repo-token: ${{ secrets.PR_TOKEN }}
+             wait-interval: 10
+  dependabot:
+    needs: [wait_for_checks]
+    name: Dependabot auto-merge
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.3.4
+        with:
+          github-token: "${{ secrets.PR_TOKEN }}"
+      - name: Enable auto-merge for Dependabot PRs
+        if: ${{steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
+        run: |
+            gh pr review --approve "$PR_URL"
+            gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.PR_TOKEN}}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2a988d3..f40d5cd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,18 +1,24 @@
-on: [push, pull_request]
-name: Test
+on: [ push, pull_request ]
+name: Tests
 jobs:
-  Build:
-    strategy:
-      matrix:
-        go-version: [1.14.x]
-        platform: [ubuntu-latest, windows-latest]
-    runs-on: ${{ matrix.platform }}
-    steps:
-    - name: Install Go
-      uses: actions/setup-go@v1
-      with:
-        go-version: ${{ matrix.go-version }}
-    - name: Fetch Repository
-      uses: actions/checkout@v2
-    - name: Run Test
-      run: go test -race
\ No newline at end of file
+    Tests:
+        name: Tests
+        strategy:
+            matrix:
+                go-version:
+                    - 1.15.x
+                    - 1.16.x
+                    - 1.18.x
+                platform:
+                    - ubuntu-latest
+                    - windows-latest
+        runs-on: '${{ matrix.platform }}'
+        steps:
+            -   name: Install Go
+                uses: actions/setup-go@v3
+                with:
+                    go-version: ${{ matrix.go-version }}
+            -   name: Fetch Repository
+                uses: actions/checkout@v3
+            -   name: Run Test
+                run: go test -race