diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 95e3131..4eda52c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,19 +16,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v2
-        with:
-          dotnet-version: 7.0.x
-
-      - name: Cache NuGet Packages
-        uses: actions/cache@v3
-        with:
-          key: ${{ runner.os }}-dotnet-nuget
-          path: ~/.nuget/packages
 
       - name: Update Release Drafter
-        if: github.ref == 'refs/heads/main'
+        if: github.ref == 'refs/heads/main' && ${{ steps.last_release.outputs.tag_name }} != null
         id: last_release
         uses: release-drafter/release-drafter@v5
         env:
@@ -44,13 +34,24 @@ jobs:
 
 
       - name: Login to DockerHub
-        if: |
-          ${{ steps.last_release.outputs.tag_name }} != null
+        if: ${{ steps.last_release.outputs.tag_name }} != null
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v2
+        with:
+          dotnet-version: 7.0.x
+
+      - name: Cache NuGet Packages
+        uses: actions/cache@v3
+        with:
+          key: ${{ runner.os }}-dotnet-nuget
+          path: ~/.nuget/packages
+
+
       - name: Restore dependencies
         run: dotnet restore