diff --git a/.github/workflows/deploy-dev.yaml b/.github/workflows/deploy-dev.yaml
index d97b44e..00cbd85 100644
--- a/.github/workflows/deploy-dev.yaml
+++ b/.github/workflows/deploy-dev.yaml
@@ -57,16 +57,20 @@ jobs:
               run: sed -i "s/\${D1_DATABASE_ID_DEV}/${{ secrets.D1_DATABASE_ID_DEV }}/g" wrangler.toml
 
             - name: Enable R2 binding when R2_NAME_DEV is provided
-              if: secrets.R2_NAME_DEV != ''
               env:
                   R2_NAME_DEV: ${{ secrets.R2_NAME_DEV }}
               run: |
-                  echo "🔧 Enabling dev R2 bucket binding for ${R2_NAME_DEV}"
-                  cat <<EOF >> wrangler.toml
-[[env.dev.r2_buckets]]
-binding = "ATTACHMENTS_BUCKET"
-bucket_name = "${R2_NAME_DEV}"
-EOF
+                  if [ -n "$R2_NAME_DEV" ]; then
+                    echo "🔧 Enabling dev R2 bucket binding"
+                    {
+                      echo ''
+                      echo '[[env.dev.r2_buckets]]'
+                      echo 'binding = "ATTACHMENTS_BUCKET"'
+                      echo "bucket_name = \"${R2_NAME_DEV}\""
+                    } >> wrangler.toml
+                  else
+                    echo "⏭️ R2_NAME_DEV not set, skipping R2 binding"
+                  fi
 
             - name: Apply D1 database migrations (dev)
               env:
diff --git a/.github/workflows/push-cloudflare.yaml b/.github/workflows/push-cloudflare.yaml
index db1cd28..f1b8996 100644
--- a/.github/workflows/push-cloudflare.yaml
+++ b/.github/workflows/push-cloudflare.yaml
@@ -68,16 +68,20 @@ jobs:
               run: sed -i "s/\${D1_DATABASE_ID}/${{ secrets.D1_DATABASE_ID }}/g" wrangler.toml
 
             - name: Enable R2 binding when R2_NAME is provided
-              if: secrets.R2_NAME != ''
               env:
                   R2_NAME: ${{ secrets.R2_NAME }}
               run: |
-                  echo "🔧 Enabling R2 bucket binding for ${R2_NAME}"
-                  cat <<EOF >> wrangler.toml
-[[r2_buckets]]
-binding = "ATTACHMENTS_BUCKET"
-bucket_name = "${R2_NAME}"
-EOF
+                  if [ -n "$R2_NAME" ]; then
+                    echo "🔧 Enabling R2 bucket binding"
+                    {
+                      echo ''
+                      echo '[[r2_buckets]]'
+                      echo 'binding = "ATTACHMENTS_BUCKET"'
+                      echo "bucket_name = \"${R2_NAME}\""
+                    } >> wrangler.toml
+                  else
+                    echo "⏭️ R2_NAME not set, skipping R2 binding"
+                  fi
 
             - name: Apply D1 database migrations
               env: