diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
deleted file mode 100644
index 4516f19..0000000
--- a/.github/workflows/auto-merge.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Dependabot auto-merge
-on: pull_request
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  dependabot:
-    runs-on: ubuntu-latest
-    if: github.actor == 'dependabot[bot]'
-    steps:
-      - name: Enable auto-merge for Dependabot PRs
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 50380d2..5bd6cd6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,16 +13,16 @@ jobs:
       - name: Download repo
         uses: actions/checkout@v4
 
-      - name: Zip southern_company_hacs dir
+      - name: Zip southern_company dir
         run: |
-          cd /home/runner/work/southern-company-hacs/southern-company-hacs/custom_components/southern_company_hacs
-          zip southern_company_hacs.zip -r ./
+          cd /home/runner/work/southern-company-hacs/southern-company/custom_components/southern_company
+          zip southern_company.zip -r ./
 
       - name: Upload zip to release
         uses: svenstaro/upload-release-action@2.9.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: /home/runner/work/southern-company-hacs/southern-company-hacs/custom_components/southern_company_hacs/southern_company_hacs.zip
-          asset_name: southern_company_hacs.zip
+          file: /home/runner/work/southern-company-hacs/southern-company/custom_components/southern_company/southern_company.zip
+          asset_name: southern_company.zip
           tag: ${{ github.ref }}
           overwrite: true
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 6f933ea..f46b443 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -61,3 +61,19 @@ jobs:
 
       - name: Hassfest validation
         uses: "home-assistant/actions/hassfest@master"
+
+  dependabot:
+    runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]'
+    needs:
+      - pre-commit
+      - hacs
+      - hassfest
+    steps:
+      - name: Check out the repository
+        uses: actions/checkout@v4
+      - name: Enable auto-merge for Dependabot PRs
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}