diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8f54e2b..3d95fa3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,9 +26,9 @@ jobs:
         echo "ADDON_LIST=['grott', 'grott-current']" >> $GITHUB_ENV
         echo "DOCKER_ARGS=--no-latest --test" >> $GITHUB_ENV
     - name: "ARGS: grott-edge" # Build of addon edge version
-      if: github.ref == 'refs/heads/master' && (github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.type == 'edge'))
+      if: github.ref == 'refs/heads/main' && (github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.type == 'edge'))
       run: |
-        echo "ADDON_LIST=['grott-edge']" >> $GITHUB_ENV
+        echo "ADDON_LIST=['grott-current']" >> $GITHUB_ENV
         echo "DOCKER_ARGS=--no-cache" >> $GITHUB_ENV
     - name: "ARGS: grott" # Build of addon release version
       if: startsWith(github.ref, 'refs/tags/') && github.event_name == 'push'
@@ -54,7 +54,7 @@ jobs:
     - uses: actions/checkout@v3
     - name: Login to docker
       uses: docker/login-action@v2
-      if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
+      if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}