diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 881cd6c..fc5a3b9 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -13,24 +13,22 @@ env:
 
 jobs:
   docker:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+      - name: Setup Blacksmith Builder
+        uses: useblacksmith/setup-docker-builder@v1
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v6
+        uses: useblacksmith/build-push-action@v2
         with:
           push: true
           tags: luc1412/easyfnstats-image:${{ env.DOCKER_TAG }}
-          cache-from: type=gha,scope=${{ github.workflow }}-${{ github.ref_name }}
-          cache-to: type=gha,scope=${{ github.workflow }}-${{ github.ref_name }},mode=max
       - name: Discord notification
         if: success()
         uses: Ilshidur/action-discord@master
diff --git a/Controllers/ShopImageController.cs b/Controllers/ShopImageController.cs
index 9b75d05..e653ae9 100644
--- a/Controllers/ShopImageController.cs
+++ b/Controllers/ShopImageController.cs
@@ -292,7 +292,7 @@ private async Task<SKBitmap> GenerateLocaleTemplate(Shop shop, SKBitmap template
             var shopSection = shop.Sections.FirstOrDefault(x => x.Id == sectionLocationData.Id);
 
             // Draw the section name if it exists
-            if (sectionLocationData.Name != null)
+            if (sectionLocationData.Name != null && shopSection?.Name != null)
             {
                 using var sectionNamePaint = new SKPaint();
                 sectionNamePaint.IsAntialias = true;