diff --git a/src/pages/all-products/index.astro b/src/pages/all-products/index.astro
index 7d29ae3..8b006ce 100644
--- a/src/pages/all-products/index.astro
+++ b/src/pages/all-products/index.astro
@@ -3,6 +3,51 @@ import BaseLayout from '@/layouts/BaseLayout.astro';
 import Header from '@/components/common/Header.astro';
 import Footer from '@/components/common/Footer.astro';
 
+const productImages: Record<string, string> = {
+  '/ท่อ-ppr-thai-ppr': '/images/products-cropped/foot-ppr1.jpg',
+  '/ท่อพีพีอาร์ตราช้าง': '/images/products-cropped/ppr-pipe_000C.jpg',
+  '/pp-r-pp-rct-poloplast': '/images/products-cropped/ppr_000C.jpg',
+  '/ท่อhdpe': '/images/products-cropped/hdpe001.jpg',
+  '/ท่อ-upvc': '/images/products-cropped/upvc-pipe_000C.jpg',
+  '/ท่อไซเลอร์': '/images/products-cropped/SYLER01.jpg',
+  '/ท่อและข้อต่อpvc': '/images/products-cropped/pvc-pipe_000C.jpg',
+  '/ท่อระบายน้ำ-3-ชั้น-ไซเลนท': '/images/products-cropped/XYLENT_001.png',
+  '/ท่อพีพีอาร์': '/images/products-cropped/foot-ppr1.jpg',
+  '/เครื่องเชื่อม-hdpe': '/images/products-cropped/HDPE-Welding2.jpg',
+  '/เครื่องเชื่อมท่อพีพีอา': '/images/products-cropped/pipe-coupling-machine_000.jpg',
+  '/groove-coupling': '/images/products-cropped/mech_000C.jpg',
+  '/pipe-coupling': '/images/products-cropped/MECH_001.jpg',
+  '/dukelarrsen': '/images/products-cropped/Dukelarrsen_000C.jpg',
+  '/เม็กกรู๊ฟ-คับปลิ้ง': '/images/products-cropped/mech_000C.jpg',
+  '/สปริทริงแฮงเกอร์-sr19-adjustable-split-ring-hanger': '/images/products-cropped/SR19_000C.jpg',
+  '/เควิสแฮงเกอร์': '/images/products-cropped/clevis-hanger_000C.jpg',
+  '/แคล้มประกับ-ชุบรุ้ง-ชุบ': '/images/products-cropped/clamp_000C.jpg',
+  '/แคล้มฟันจระเข้-beam-clamp': '/images/products-cropped/beam-clamp_000C.jpg',
+  '/แคล้มหยดน้ำ-adjustable-band-hanger': '/images/products-cropped/band-hanger_000C.jpg',
+  '/แคล้มเลเวล-level-clamp': '/images/products-cropped/level-clamp_000C.jpg',
+  '/ยูโบลท์-u-bolt': '/images/products-cropped/u-bolt_000C.jpg',
+  '/ยูโบลท์-ประกับ-u-bolt-clamp': '/images/products-cropped/u-bolt-clamp_000C.jpg',
+  '/ยูโบลท์เหล็กแผ่น-ยูแบน-strap': '/images/products-cropped/strap_000C.jpg',
+  '/เจโบลท์-แอลโบลท์-j-bolt-l-bolt': '/images/products-cropped/j-bolt_000C.jpg',
+  '/น็อต-แหวน-สกรู-hex-nut-flat-washer-hexagon-head-screw': '/images/products-cropped/bolt-nut_000C.jpg',
+  '/พุกต่างๆ': '/images/products-cropped/anchor_000C.jpg',
+  '/พุกเหล็ก-sleeve-anchor-bolt': '/images/products-cropped/sleeve-anchor_000C.jpg',
+  '/สตัดเกลียวตลอด-เหล็ก-threaded-rod': '/images/products-cropped/threaded-rod_000C.jpg',
+  '/วาล์ว-valve': '/images/products-cropped/valve_000C.jpg',
+  '/durgo-avvs': '/images/products-cropped/durgo_000C.jpg',
+  '/water-pump': '/images/products-cropped/water-pump_000C.jpg',
+  '/หัวจ่ายแอร์-ball-jet': '/images/products-cropped/Eye-Ball.jpg',
+  '/grilles': '/images/products-cropped/grilles_000C.jpg',
+  '/อุปกรณ์ดับเพลิง': '/images/products-cropped/extinguishers_000C.jpg',
+  '/ฉนวนหุ้มท่อ-pipe-insulation': '/images/products-cropped/Thermobreak_-LS_0.png',
+  '/เทอร์โมเบรค-thermobreak': '/images/products-cropped/Thermobreak_-LS_0.png',
+  '/realflex': '/images/products-cropped/realflex_000C.jpg',
+  '/water-treatment': '/images/products-cropped/water-treatment_000C.jpg',
+  '/ระบบรั้ว': '/images/products-cropped/vineman_000C.jpg',
+  '/ระบบรั้วไวน์แมน-vineman-2': '/images/products-cropped/vineman_000C.jpg',
+  '/รั้วเทวดา': '/images/products-cropped/Banner-TDV2.jpg',
+};
+
 const productCategories = [
   {
     name: 'ท่อ | Pipe',
@@ -142,7 +187,7 @@ const productCategories = [
                 <div class="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 gap-4">
                   {category.products.map(product => (
                     <a href={product.slug} class="block p-4 rounded-xl border border-gray-200 hover:border-green-500 hover:bg-green-50 transition-all text-center">
-                      <img src={category.image} alt={product.name} class="w-full h-24 object-cover rounded-lg mb-3" onerror="this.src='/images/logo/dealplustech-logo.png'" />
+                      <img src={productImages[product.slug] || category.image} alt={product.name} class="w-full h-24 object-cover rounded-lg mb-3" onerror="this.src='/images/logo/dealplustech-logo.png'" />
                       <span class="text-sm sm:text-base text-secondary-700 font-medium">{product.name}</span>
                     </a>
                   ))}