diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 843771b4bc..5c882c4875 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -34,16 +34,12 @@ jobs:
       uses: actions/checkout@master
     - name: Build
       run: docker build -t docker.io/rhcsdashboard/ceph-base:${{ matrix.os }} -f docker/ceph/centos/Dockerfile ./docker/ceph
-#    - name: Google Chat Notification
-#      uses: Co-qn/google-chat-notification@b9227d9daa4638c9782a5bd16c4abb86268127a1
-#      with:
-#        name: Build
-#        url: ${{ secrets.GOOGLE_CHAT_WEBHOOK }}
-#        status: ${{ job.status }}
-#      if: failure()
     - name: Push
+      env:
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
       run: |
-        echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+        echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
         docker push docker.io/rhcsdashboard/ceph-base:${{ matrix.os }}
         docker logout
   build-ceph:
@@ -52,7 +48,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: [main, reef, quincy, pacific]
+        branch: [main, squid, reef, quincy, pacific]
         name: [ceph, ceph-rpm]
         include:
           - centos_version: 9
@@ -65,16 +61,12 @@ jobs:
       uses: actions/checkout@master
     - name: Build
       run: docker build -t docker.io/rhcsdashboard/${{ matrix.name }}:${{ matrix.branch }} -f docker/${{ matrix.dir }}/${{ matrix.branch_dir}}/Dockerfile ./docker/ceph --build-arg CEPH_RELEASE=${{ matrix.branch }} --build-arg VCS_BRANCH=${{ matrix.branch }} --build-arg CENTOS_VERSION=${{ matrix.centos_version }}
-    - name: Google Chat Notification
-      uses: Co-qn/google-chat-notification@b9227d9daa4638c9782a5bd16c4abb86268127a1
-      with:
-        name: Build
-        url: ${{ secrets.GOOGLE_CHAT_WEBHOOK }}
-        status: ${{ job.status }}
-      if: failure()
     - name: Push
+      env:
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
       run: |
-        echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+        echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
         docker push docker.io/rhcsdashboard/${{ matrix.name }}:${{ matrix.branch }}
         docker logout
   build-ceph-e2e:
@@ -82,21 +74,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: [main, reef, quincy, pacific]
+        branch: [main, squid, reef, quincy, pacific]
     steps:
     - name: Checkout
       uses: actions/checkout@master
     - name: Build
       run: docker build -t docker.io/rhcsdashboard/ceph-e2e:${{ matrix.branch }} -f docker/ceph/e2e/Dockerfile ./docker/ceph --build-arg VCS_BRANCH=${{ matrix.branch }}
-    - name: Google Chat Notification
-      uses: Co-qn/google-chat-notification@b9227d9daa4638c9782a5bd16c4abb86268127a1
-      with:
-        name: Build
-        url: ${{ secrets.GOOGLE_CHAT_WEBHOOK }}
-        status: ${{ job.status }}
-      if: failure()
     - name: Push
+      env:
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
       run: |
-        echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+        echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
         docker push docker.io/rhcsdashboard/ceph-e2e:${{ matrix.branch }}
         docker logout