diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e2153b4..50636c5 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -147,12 +147,14 @@ jobs:
 
       - name: Login to Upbound Marketplace
         uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
+        if: env.XPKG_ACCESS_ID != ''
         with:
           registry: xpkg.upbound.io/upbound
           username: ${{ secrets.XPKG_ACCESS_ID }}
           password: ${{ secrets.XPKG_ACCESS_TOKEN }}
 
       - name: Publish Artifacts
+        if: env.XPKG_ACCESS_ID != ''
         run: |
           make publish BRANCH_NAME=${GITHUB_REF##*/}
         env:
@@ -180,10 +182,10 @@ jobs:
         with:
           skip-login: true
           channel: main
-          version: v0.39.0-384.g0a0c8634
 
       - name: Login to Upbound Marketplace
         uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
+        if: env.XPKG_ACCESS_ID != ''
         with:
           registry: xpkg.upbound.io/upbound
           username: ${{ secrets.XPKG_ACCESS_ID }}