diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f2486d9..7f6827c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,9 +19,13 @@ jobs:
       - uses: actions/checkout@v4
       - run: make UBUNTU=${{ matrix.ubuntu-version }} update
       - run: make UBUNTU=${{ matrix.ubuntu-version }} build
-      - run: |
-          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-          make UBUNTU=${{ matrix.ubuntu-version }} push
+      - name: Log in to docker
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+        if: ${{ github.repository_owner == 'wpilibsuite' && github.ref == 'refs/heads/main' }}
+      - run: make UBUNTU=${{ matrix.ubuntu-version }} push
         if: ${{ github.repository_owner == 'wpilibsuite' && github.ref == 'refs/heads/main' }} 
 
   build-arm:
@@ -35,9 +39,13 @@ jobs:
       - uses: actions/checkout@v4
       - run: make DEBIAN=${{ matrix.debian-version }} update/arm
       - run: make DEBIAN=${{ matrix.debian-version }} build/arm-base
-      - run: |
-          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-          make UBUNTU=${{ matrix.debian-version }} push/arm-base
+      - name: Log in to docker
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+        if: ${{ github.repository_owner == 'wpilibsuite' && github.ref == 'refs/heads/main' }}
+      - run: make UBUNTU=${{ matrix.debian-version }} push/arm-base
         if: ${{ github.repository_owner == 'wpilibsuite' && github.ref == 'refs/heads/main' }} 
 
   build-minimal:
@@ -52,9 +60,13 @@ jobs:
       - uses: actions/checkout@v4
       - run: make UBUNTU=${{ matrix.ubuntu-version }} update
       - run: make UBUNTU=${{ matrix.ubuntu-version }} build/minimal-cross
-      - run: |
-          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-          make UBUNTU=${{ matrix.ubuntu-version }} push/minimal-cross
+      - name: Log in to docker
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+        if: ${{ github.repository_owner == 'wpilibsuite' && github.ref == 'refs/heads/main' }}
+      - run: make UBUNTU=${{ matrix.ubuntu-version }} push/minimal-cross
         if: ${{ github.repository_owner == 'wpilibsuite' && github.ref == 'refs/heads/main' }}
 
       - run: make UBUNTU=${{ matrix.ubuntu-version }} save/minimal-cross
@@ -116,9 +128,12 @@ jobs:
 
     - name: Build image
       run: make UBUNTU=${{ matrix.ubuntu-version }} build/cross-${{ matrix.type }}-${{ matrix.pyversion }}
-
+    - name: Log in to docker
+      uses: docker/login-action@v3
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+      if: ${{ github.repository_owner == 'wpilibsuite' && github.ref == 'refs/heads/main' }}
     - name: Upload image
-      run: |
-          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-          make UBUNTU=${{ matrix.ubuntu-version }} push/cross-${{ matrix.type }}-${{ matrix.pyversion }}
+      run: make UBUNTU=${{ matrix.ubuntu-version }} push/cross-${{ matrix.type }}-${{ matrix.pyversion }}
       if: ${{ github.repository_owner == 'wpilibsuite' && github.ref == 'refs/heads/main' }}