diff --git a/client/components/forms/ImageInput.vue b/client/components/forms/ImageInput.vue
index b67cb6a3..ff90b5ce 100644
--- a/client/components/forms/ImageInput.vue
+++ b/client/components/forms/ImageInput.vue
@@ -22,7 +22,7 @@
         </div>
         <div v-else class="h-6 text-gray-600 dark:text-gray-400 flex">
           <div class="flex-grow">
-            <img :src="currentUrl" class="h-6 rounded shadow-md">
+            <NuxtImg :src="currentUrl" class="h-6 rounded shadow-md"/>
           </div>
           <a href="#" class="hover:text-nt-blue flex" @click.prevent="clearUrl">
             <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24"
diff --git a/client/components/forms/components/UploadedFile.vue b/client/components/forms/components/UploadedFile.vue
index f0baa118..c690ea6d 100644
--- a/client/components/forms/components/UploadedFile.vue
+++ b/client/components/forms/components/UploadedFile.vue
@@ -4,7 +4,7 @@
     :title="file.file.name"
   >
     <div v-if="file.src && !isImageHide" class="h-20 overflow-hidden flex">
-      <img class="block object-cover object-center w-full" :src="file.src" @error="isImageHide=true">
+      <NuxtImg class="block object-cover object-center w-full" :src="file.src" @error="isImageHide=true"/>
     </div>
     <div v-else class="h-20 flex items-center justify-center">
       <svg class="w-10 h-10 text-gray-500" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
diff --git a/client/components/global/Navbar.vue b/client/components/global/Navbar.vue
index 506cfcb0..5f14d536 100644
--- a/client/components/global/Navbar.vue
+++ b/client/components/global/Navbar.vue
@@ -5,12 +5,8 @@
         <div class="flex items-center">
           <NuxtLink :to="{ name: user ? 'home' : 'index' }"
                     class="flex-shrink-0 font-semibold hover:no-underline flex items-center">
-            <img src="/img/logo.svg" alt="notion tools logo" class="w-8 h-8">
-
-            <span
-              class="ml-2 text-md hidden sm:inline text-black dark:text-white"
-            >
-              OpnForm</span>
+            <NuxtImg src="/img/logo.svg" alt="notion tools logo" class="w-8 h-8"/>
+            <span class="ml-2 text-md hidden sm:inline text-black dark:text-white">OpnForm</span>
           </NuxtLink>
           <workspace-dropdown class="ml-6"/>
         </div>
@@ -57,7 +53,7 @@
                             class="flex items-center justify-center w-full rounded-md  px-4 py-2 text-sm text-gray-700 dark:text-gray-50 hover:bg-gray-50 dark:hover:bg-gray-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-gray-500"
                             dusk="nav-dropdown-button" @click.stop="toggle()"
                     >
-                      <img :src="user.photo_url" class="rounded-full w-6 h-6">
+                      <NuxtImg :src="user.photo_url" class="rounded-full w-6 h-6"/>
                       <p class="ml-2 hidden sm:inline">
                         {{ user.name }}
                       </p>
diff --git a/client/components/global/WorkspaceDropdown.vue b/client/components/global/WorkspaceDropdown.vue
index 2cad14c1..9bfe604b 100644
--- a/client/components/global/WorkspaceDropdown.vue
+++ b/client/components/global/WorkspaceDropdown.vue
@@ -6,10 +6,10 @@
     <template v-if="workspace" #trigger="{toggle}">
       <div class="flex items-center cursor group" role="button" @click.stop="toggle()">
         <div class="rounded-full h-8 8">
-          <img v-if="isUrl(workspace.icon)"
+          <NuxtImg v-if="isUrl(workspace.icon)"
                :src="workspace.icon"
                :alt="workspace.name + ' icon'" class="flex-shrink-0 h-8 w-8 rounded-full shadow"
-          >
+          />
           <div v-else class="rounded-full pt-2 text-xs truncate bg-nt-blue-lighter h-8 w-8 text-center shadow"
                v-text="workspace.icon"
           />
@@ -26,10 +26,10 @@
          :class="{'bg-blue-100 dark:bg-blue-900':workspace.id === worksp.id}" @click.prevent="switchWorkspace(worksp)"
       >
         <div class="rounded-full h-8 w-8 flex-shrink-0" role="button">
-          <img v-if="isUrl(worksp.icon)"
+          <NuxtImg v-if="isUrl(worksp.icon)"
                :src="worksp.icon"
                :alt="worksp.name + ' icon'" class="flex-shrink-0 h-8 w-8 rounded-full shadow"
-          >
+          />
           <div v-else class="rounded-full flex-shrink-0 pt-1 text-xs truncate bg-nt-blue-lighter h-8 w-8 text-center shadow"
                v-text="worksp.icon"
           />
diff --git a/client/components/open/forms/OpenFormField.vue b/client/components/open/forms/OpenFormField.vue
index a5ebbc97..978ab8cd 100644
--- a/client/components/open/forms/OpenFormField.vue
+++ b/client/components/open/forms/OpenFormField.vue
@@ -71,7 +71,7 @@
           <div v-if="!field.image_block" class="p-4 border border-dashed">
             Open <b>{{ field.name }}'s</b> block settings to upload image.
           </div>
-          <img v-else :alt="field.name" :src="field.image_block" class="max-w-full">
+          <NuxtImg v-else :alt="field.name" :src="field.image_block" class="max-w-full"/>
         </div>
       </template>
     </div>
diff --git a/client/components/open/forms/components/FormStats.vue b/client/components/open/forms/components/FormStats.vue
index 7e30dfa0..a1372759 100644
--- a/client/components/open/forms/components/FormStats.vue
+++ b/client/components/open/forms/components/FormStats.vue
@@ -13,10 +13,10 @@
           </p>
         </div>
       </div>
-      <img src="/img/pages/forms/blurred_graph.png"
+      <NuxtImg src="/img/pages/forms/blurred_graph.png"
            alt="Sample Graph"
            class="mx-auto filter blur-md z-0"
-      >
+      />
 
     </div>
     <Loader v-else-if="isLoading" class="h-6 w-6 text-nt-blue mx-auto" />
diff --git a/client/components/open/forms/components/form-components/FormEditorPreview.vue b/client/components/open/forms/components/form-components/FormEditorPreview.vue
index fd10eddb..01c50410 100644
--- a/client/components/open/forms/components/form-components/FormEditorPreview.vue
+++ b/client/components/open/forms/components/form-components/FormEditorPreview.vue
@@ -16,16 +16,16 @@
             <div id="cover-picture"
                  class="max-h-56 rounded-t-lg w-full overflow-hidden flex items-center justify-center"
             >
-              <img alt="Cover Picture" :src="coverPictureSrc(form.cover_picture)" class="w-full">
+              <NuxtImg alt="Cover Picture" :src="coverPictureSrc(form.cover_picture)" class="w-full"/>
             </div>
           </div>
           <div v-if="form.logo_picture" class="w-full mx-auto p-5 relative"
                :class="{'pt-20':!form.cover_picture, 'max-w-lg': form && (form.width === 'centered')}"
           >
-            <img alt="Logo Picture" :src="coverPictureSrc(form.logo_picture)"
+            <NuxtImg alt="Logo Picture" :src="coverPictureSrc(form.logo_picture)"
                  :class="{'top-5':!form.cover_picture, '-top-10':form.cover_picture}"
                  class="w-20 h-20 object-contain absolute left-5 transition-all"
-            >
+            />
           </div>
         </div>
       </transition>
diff --git a/client/components/open/tables/components/OpenFile.vue b/client/components/open/tables/components/OpenFile.vue
index 2a4e5174..d4832d64 100644
--- a/client/components/open/tables/components/OpenFile.vue
+++ b/client/components/open/tables/components/OpenFile.vue
@@ -8,7 +8,7 @@
          rel="nofollow"
       >
   <div v-if="isImage(file.file_url)" class="w-8 h-8">
-    <img class="object-cover h-full w-full rounded" :src="file.file_url">
+    <NuxtImg class="object-cover h-full w-full rounded" :src="file.file_url"/>
   </div>
   <span v-else
         class="py-1 px-2"
diff --git a/client/components/pages/OpenFormFooter.vue b/client/components/pages/OpenFormFooter.vue
index b83ddbe8..ec2df13e 100644
--- a/client/components/pages/OpenFormFooter.vue
+++ b/client/components/pages/OpenFormFooter.vue
@@ -8,8 +8,7 @@
       </div>
       <div class="flex justify-center mt-5 md:mt-0">
         <NuxtLink :to="{ name: user ? 'home' : 'index' }" class="flex-shrink-0 font-semibold flex items-center">
-          <img src="/img/logo.svg" alt="notion tools logo" class="w-10 h-10">
-
+          <NuxtImg src="/img/logo.svg" alt="notion tools logo" class="w-10 h-10"/>
           <span class="ml-2 text-xl text-black dark:text-white">
             OpnForm
           </span>
diff --git a/client/components/pages/forms/show/FormQrCode.vue b/client/components/pages/forms/show/FormQrCode.vue
index d01b25a6..7fc5c498 100644
--- a/client/components/pages/forms/show/FormQrCode.vue
+++ b/client/components/pages/forms/show/FormQrCode.vue
@@ -3,7 +3,7 @@
     <h3 class="font-semibold text-xl">QR Code</h3>
     <p>Scan the QR code to open the form (Right click to copy the image)</p>
     <div class="flex items-center">
-      <img v-if="QrUrl" :src="QrUrl" class="m-auto" />
+      <NuxtImg v-if="QrUrl" :src="QrUrl" class="m-auto" />
     </div>
   </div>
 </template>
diff --git a/client/components/pages/templates/SingleTemplate.vue b/client/components/pages/templates/SingleTemplate.vue
index 9706c4f6..fa8ee30c 100644
--- a/client/components/pages/templates/SingleTemplate.vue
+++ b/client/components/pages/templates/SingleTemplate.vue
@@ -17,9 +17,9 @@
     </div>
 
     <div class="aspect-[4/3] rounded-lg shadow-sm overflow-hidden">
-      <img class="group-hover:scale-110 transition-all duration-200 h-full object-cover w-full"
+      <NuxtImg class="group-hover:scale-110 transition-all duration-200 h-full object-cover w-full"
            :src="template.image_url" alt=""
-      >
+      />
     </div>
     <p
       class="text-lg font-semibold leading-tight tracking-tight text-gray-900 mt-4 group-hover:text-blue-500 transition-all duration-150"
diff --git a/client/components/pages/welcome/AiFeature.vue b/client/components/pages/welcome/AiFeature.vue
index 252bcbaa..546d91eb 100644
--- a/client/components/pages/welcome/AiFeature.vue
+++ b/client/components/pages/welcome/AiFeature.vue
@@ -5,8 +5,7 @@
           <div
             class="relative px-4 pt-16 overflow-hidden bg-blue-100 ring-blue-100 ring-1 sm:shadow-lg isolate sm:rounded-2xl sm:px-16 md:pt-20 lg:flex lg:gap-x-20 lg:px-16 lg:pt-0 sm:shadow-gray-600/10">
             <div class="absolute inset-0">
-              <img class="object-cover object-top w-full h-full" src="/img/pages/ai_form_builder/background-pattern-ai.svg" alt="">
-
+              <NuxtImg class="object-cover object-top w-full h-full" src="/img/pages/ai_form_builder/background-pattern-ai.svg" alt=""/>
             </div>
 
             <div class="relative max-w-md mx-auto text-center xl:max-w-lg lg:mx-0 lg:flex-auto lg:py-16 lg:text-left">
@@ -78,8 +77,8 @@
 
             <div
               class="relative px-6 mx-auto mt-8 lg:px-0 sm:mt-12 lg:bottom-0 lg:right-0 lg:absolute lg:max-w-md xl:max-w-none">
-              <img class="rounded-t-2xl ring-1 ring-blue-100 lg:rounded-tr-none"
-              src="/img/pages/ai_form_builder/ai-feature-illustration.svg" alt="App screenshot">
+              <NuxtImg class="rounded-t-2xl ring-1 ring-blue-100 lg:rounded-tr-none"
+              src="/img/pages/ai_form_builder/ai-feature-illustration.svg" alt="App screenshot"/>
 
             </div>
           </div>
diff --git a/client/components/pages/welcome/Features.vue b/client/components/pages/welcome/Features.vue
index 1251db8a..82ed1883 100644
--- a/client/components/pages/welcome/Features.vue
+++ b/client/components/pages/welcome/Features.vue
@@ -84,8 +84,8 @@
       </div>
       <div class="w-full md:w-1/2 lg:w-7/12 flex items-center justify-center relative w-full"
            :class="{'md:pr-8':index%2==1, 'md:pl-8':index%2==0}">
-        <img loading="lazy" class="block rounded-2xl w-full"
-             :src="step.img" alt="cover-product">
+        <NuxtImg loading="lazy" class="block rounded-2xl w-full"
+             :src="step.img" alt="cover-product"/>
       </div>
     </div>
 
diff --git a/client/components/vendor/appsumo/AppSumoBilling.vue b/client/components/vendor/appsumo/AppSumoBilling.vue
index c57f44b0..de34d66d 100644
--- a/client/components/vendor/appsumo/AppSumoBilling.vue
+++ b/client/components/vendor/appsumo/AppSumoBilling.vue
@@ -1,9 +1,9 @@
 <template>
   <div v-if="user.active_license" class="border p-5 shadow-md rounded-md">
     <div class="w-auto flex flex-col items-center">
-      <img src="/img/appsumo/as-taco-white-bg.png" class="max-w-[60px]" alt="AppSumo">
+      <NuxtImg src="/img/appsumo/as-taco-white-bg.png" class="max-w-[60px]" alt="AppSumo"/>
 
-      <img src="/img/appsumo/as-Select-dark.png" class="max-w-[150px]" alt="AppSumo">
+      <NuxtImg src="/img/appsumo/as-Select-dark.png" class="max-w-[150px]" alt="AppSumo"/>
 
     </div>
     <p class="mt-6">
diff --git a/client/components/vendor/appsumo/AppSumoRegister.vue b/client/components/vendor/appsumo/AppSumoRegister.vue
index 48a61a03..10da03c6 100644
--- a/client/components/vendor/appsumo/AppSumoRegister.vue
+++ b/client/components/vendor/appsumo/AppSumoRegister.vue
@@ -1,8 +1,8 @@
 <template>
   <div v-if="hasValidLicense" class="p-6 bg-white border shadow-md rounded-md">
-    <img src="/img/appsumo/as-taco-white-bg.png" class="max-w-[60px] mx-auto" alt="AppSumo">
+    <NuxtImg src="/img/appsumo/as-taco-white-bg.png" class="max-w-[60px] mx-auto" alt="AppSumo"/>
 
-    <img src="/img/appsumo/as-Select-dark.png" class="max-w-[300px] mx-auto" alt="AppSumo">
+    <NuxtImg src="/img/appsumo/as-Select-dark.png" class="max-w-[300px] mx-auto" alt="AppSumo"/>
 
     <p class="mt-6">
       <span class="text-green-500">We found your AppSumo Lifetime deal license!</span> Just complete the registration form to finalize the activation of
@@ -10,9 +10,9 @@
     </p>
   </div>
   <div v-else-if="hasLicenseError" class="p-6 bg-white border border-red-500 shadow-md rounded-md">
-    <img src="/img/appsumo/as-taco-white-bg.png" class="max-w-[60px] mx-auto" alt="AppSumo">
+    <NuxtImg src="/img/appsumo/as-taco-white-bg.png" class="max-w-[60px] mx-auto" alt="AppSumo"/>
 
-    <img src="/img/appsumo/as-Select-dark.png" class="max-w-[300px] mx-auto" alt="AppSumo">
+    <NuxtImg src="/img/appsumo/as-Select-dark.png" class="max-w-[300px] mx-auto" alt="AppSumo"/>
 
     <p class="mt-6">
       <span class="text-red-600">Invalid AppSumo license</span>. The license was probably already attached to an OpnForm account. Please contact support.
diff --git a/client/error.vue b/client/error.vue
index d98b8fe7..510bbc04 100644
--- a/client/error.vue
+++ b/client/error.vue
@@ -2,7 +2,7 @@
   <NuxtLayout>
     <div class="flex mt-6">
       <div class="w-full md:w-2/3 md:mx-auto md:max-w-md">
-        <img alt="Nice plant as we have nothing else to show!" src="/img/icons/plant.png" class="w-56 mb-5">
+        <NuxtImg alt="Nice plant as we have nothing else to show!" src="/img/icons/plant.png" class="w-56 mb-5"/>
 
         <h1 class="mb-4 font-semibold text-3xl text-gray-900">
           Page Not Found
diff --git a/client/nuxt.config.ts b/client/nuxt.config.ts
index 7a345924..e4a6f88d 100644
--- a/client/nuxt.config.ts
+++ b/client/nuxt.config.ts
@@ -15,6 +15,7 @@ export default defineNuxtConfig({
         '@vueuse/motion/nuxt',
         'nuxt3-notifications',
         'nuxt-simple-sitemap',
+        '@nuxt/image'
         // ... opnformConfig.sentry_dsn ? ['@nuxtjs/sentry'] : [],
     ],
     build: {
diff --git a/client/package.json b/client/package.json
index 781e8daa..393d7361 100644
--- a/client/package.json
+++ b/client/package.json
@@ -22,6 +22,7 @@
   },
   "dependencies": {
     "@hcaptcha/vue3-hcaptcha": "^1.3.0",
+    "@nuxt/image": "^1.1.0",
     "@nuxtjs/sentry": "^8.0.6",
     "@pinia/nuxt": "^0.5.1",
     "@tailwindcss/aspect-ratio": "^0.4.2",
diff --git a/client/pages/ai-form-builder.vue b/client/pages/ai-form-builder.vue
index ef05cf69..5a75bfbe 100644
--- a/client/pages/ai-form-builder.vue
+++ b/client/pages/ai-form-builder.vue
@@ -3,7 +3,7 @@
     <!-- START HERO -->
     <section class="bg-gradient-to-b relative from-white to-gray-100 py-12 sm:py-16 lg:py-20 xl:py-24">
         <div class="absolute inset-0">
-          <img class="w-full h-full object-cover object-top" src="/img/pages/ai_form_builder/background-pattern.svg" alt="">
+          <NuxtImg class="w-full h-full object-cover object-top" src="/img/pages/ai_form_builder/background-pattern.svg" alt=""/>
 
         </div>
 
@@ -42,7 +42,7 @@
           <div
             class="grid lg:grid-cols-3 grid-cols-1 sm:max-w-lg lg:max-w-5xl sm:mx-auto gap-8 sm:gap-10 mt-12 sm:mt-16">
             <div class="flex items-start gap-4">
-              <img class="w-12 h-12 shrink-0" src="/img/pages/ai_form_builder/icon-fast.svg" alt="">
+              <NuxtImg class="w-12 h-12 shrink-0" src="/img/pages/ai_form_builder/icon-fast.svg" alt=""/>
 
               <div>
                 <p class="text-md font-semibold text-gray-900">
@@ -55,7 +55,7 @@
             </div>
 
             <div class="flex items-start gap-4">
-              <img class="w-12 h-12 shrink-0" src="/img/pages/ai_form_builder/icon-customization.svg" alt="">
+              <NuxtImg class="w-12 h-12 shrink-0" src="/img/pages/ai_form_builder/icon-customization.svg" alt=""/>
 
               <div>
                 <p class="text-md font-semibold text-gray-900">
@@ -68,7 +68,7 @@
             </div>
 
             <div class="flex items-start gap-4">
-              <img class="w-12 h-12 shrink-0" src="/img/pages/ai_form_builder/icon-browser.svg" alt="">
+              <NuxtImg class="w-12 h-12 shrink-0" src="/img/pages/ai_form_builder/icon-browser.svg" alt=""/>
 
               <div>
                 <p class="text-md font-semibold text-gray-900">
@@ -103,8 +103,8 @@
           <div
             class="space-y-16 text-center lg:text-left sm:max-w-md sm:mx-auto lg:max-w-none lg:space-y-20 xl:space-y-24 mt-8 sm:mt-12 lg:mt-16">
             <div class="flex flex-col lg:flex-row lg:items-center lg:justify-between gap-8 lg:gap-12">
-              <img class="w-full lg:flex-1 bg-gray-300 lg:shrink-0 rounded-2xl ring-1 ring-gray-200 shadow-sm"
-              src="/img/pages/ai_form_builder/step-1.svg" alt="">
+              <NuxtImg class="w-full lg:flex-1 bg-gray-300 lg:shrink-0 rounded-2xl ring-1 ring-gray-200 shadow-sm"
+              src="/img/pages/ai_form_builder/step-1.svg" alt=""/>
 
 
               <div
@@ -113,7 +113,7 @@
               </div>
 
               <div class="lg:flex-1 lg:shrink-0">
-                <img class="w-auto h-16 hidden lg:block" src="/img/pages/ai_form_builder/icon-create.svg" alt="">
+                <NuxtImg class="w-auto h-16 hidden lg:block" src="/img/pages/ai_form_builder/icon-create.svg" alt=""/>
 
                 <h3 class="text-2xl sm:text-3xl lg:text-4xl font-semibold text-gray-900 lg:mt-8">
                   Building forms made easy
@@ -129,18 +129,16 @@
             </div>
 
             <div class="flex flex-col lg:flex-row lg:items-center lg:justify-between gap-8 lg:gap-12">
-              <img
+              <NuxtImg
                 class="w-full lg:flex-1 bg-gray-300 lg:shrink-0 rounded-2xl ring-1 ring-gray-200 shadow-sm lg:order-3"
-                src="/img/pages/ai_form_builder/step-2.svg" alt="">
-
-
+                src="/img/pages/ai_form_builder/step-2.svg" alt=""/>
               <div
                 class="w-16 h-16 lg:order-2 rounded-full bg-blue-50 border-2 border-blue-200 hidden xl:inline-flex items-center justify-center text-blue-600 text-2xl font-semibold leading-none">
                 2
               </div>
 
               <div class="lg:flex-1 lg:shrink-0 lg:order-1">
-                <img class="w-auto h-16 hidden lg:block" src="/img/pages/ai_form_builder/icon-customization.svg" alt="">
+                <NuxtImg class="w-auto h-16 hidden lg:block" src="/img/pages/ai_form_builder/icon-customization.svg" alt=""/>
 
                 <h3 class="text-2xl sm:text-3xl lg:text-4xl font-semibold text-gray-900 lg:mt-8">
                   Customized forms work wonders
@@ -154,17 +152,15 @@
             </div>
 
             <div class="flex flex-col lg:flex-row lg:items-center lg:justify-between gap-8 lg:gap-12">
-              <img class="w-full lg:flex-1 bg-gray-300 lg:shrink-0 rounded-2xl ring-1 ring-gray-200 shadow-sm"
-              src="/img/pages/ai_form_builder/step-3.svg" alt="">
-
-
+              <NuxtImg class="w-full lg:flex-1 bg-gray-300 lg:shrink-0 rounded-2xl ring-1 ring-gray-200 shadow-sm"
+              src="/img/pages/ai_form_builder/step-3.svg" alt=""/>
               <div
                 class="w-16 h-16 rounded-full bg-blue-50 border-2 border-blue-200 hidden xl:inline-flex items-center justify-center text-blue-600 text-2xl font-semibold leading-none">
                 3
               </div>
 
               <div class="lg:flex-1 lg:shrink-0">
-                <img class="w-auto h-16 hidden lg:block" src="/img/pages/ai_form_builder/icon-share.svg" alt="">
+                <NuxtImg class="w-auto h-16 hidden lg:block" src="/img/pages/ai_form_builder/icon-share.svg" alt=""/>
 
                 <h3 class="text-2xl sm:text-3xl lg:text-4xl font-semibold text-gray-900 lg:mt-8">
                   Share your forms anywhere
@@ -204,7 +200,7 @@
 <!--          <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-6 mt-8 sm:mt-12 lg:mt-16">-->
 <!--            <div-->
 <!--              class="bg-white overflow-hidden rounded-2xl ring-1 ring-gray-200 shadow-sm hover:shadow-lg hover:-translate-y-2 transition-all duration-150">-->
-<!--              <img class="w-full" src="/img/pages/ai_form_builder/examples-placeholder.png" alt="">
+<!--              <NuxtImg class="w-full" src="/img/pages/ai_form_builder/examples-placeholder.png" alt=""/>
 -->
 <!--              <div class="px-4 py-5 sm:p-6">-->
 <!--                <h3 class="text-lg font-semibold text-gray-900">-->
@@ -218,7 +214,7 @@
 
 <!--            <div-->
 <!--              class="bg-white overflow-hidden rounded-2xl ring-1 ring-gray-200 shadow-sm hover:shadow-lg hover:-translate-y-2 transition-all duration-150">-->
-<!--              <img class="w-full" src="/img/pages/ai_form_builder/examples-placeholder.png" alt="">
+<!--              <NuxtImg class="w-full" src="/img/pages/ai_form_builder/examples-placeholder.png" alt=""/>
 -->
 <!--              <div class="px-4 py-5 sm:p-6">-->
 <!--                <h3 class="text-lg font-semibold text-gray-900">-->
@@ -232,7 +228,7 @@
 
 <!--            <div-->
 <!--              class="bg-white overflow-hidden rounded-2xl ring-1 ring-gray-200 shadow-sm hover:shadow-lg hover:-translate-y-2 transition-all duration-150">-->
-<!--              <img class="w-full" src="/img/pages/ai_form_builder/examples-placeholder.png" alt="">
+<!--              <NuxtImg class="w-full" src="/img/pages/ai_form_builder/examples-placeholder.png" alt=""/>
 -->
 <!--              <div class="px-4 py-5 sm:p-6">-->
 <!--                <h3 class="text-lg font-semibold text-gray-900">-->
@@ -246,7 +242,7 @@
 
 <!--            <div-->
 <!--              class="bg-white overflow-hidden rounded-2xl ring-1 ring-gray-200 shadow-sm hover:shadow-lg hover:-translate-y-2 transition-all duration-150">-->
-<!--              <img class="w-full" src="/img/pages/ai_form_builder/examples-placeholder.png" alt="">
+<!--              <NuxtImg class="w-full" src="/img/pages/ai_form_builder/examples-placeholder.png" alt=""/>
 -->
 <!--              <div class="px-4 py-5 sm:p-6">-->
 <!--                <h3 class="text-lg font-semibold text-gray-900">-->
@@ -426,11 +422,11 @@
     <section class="bg-gradient-to-b from-gray-100 to-white py-12 sm:py-16 lg:pt-20 xl:pt-24">
       <div class="px-4 sm:px-6 lg:px-8 max-w-7xl mx-auto">
         <div class="flex items-center justify-center gap-8">
-          <img class="w-auto h-12" src="/img/pages/ai_form_builder/icon-email-input.svg" alt="">
+          <NuxtImg class="w-auto h-12" src="/img/pages/ai_form_builder/icon-email-input.svg" alt=""/>
 
-          <img class="w-auto h-12" src="/img/pages/ai_form_builder/icon-radio-buttons.svg" alt="">
+          <NuxtImg class="w-auto h-12" src="/img/pages/ai_form_builder/icon-radio-buttons.svg" alt=""/>
 
-          <img class="w-auto h-12" src="/img/pages/ai_form_builder/icon-textarea.svg" alt="">
+          <NuxtImg class="w-auto h-12" src="/img/pages/ai_form_builder/icon-textarea.svg" alt=""/>
 
         </div>
 
diff --git a/client/pages/forms/[slug]/index.vue b/client/pages/forms/[slug]/index.vue
index 7904c244..5bd2d485 100644
--- a/client/pages/forms/[slug]/index.vue
+++ b/client/pages/forms/[slug]/index.vue
@@ -3,16 +3,16 @@
     <div v-if="form && !isIframe && (form.logo_picture || form.cover_picture)">
       <div v-if="form.cover_picture">
         <div id="cover-picture" class="max-h-56 w-full overflow-hidden flex items-center justify-center">
-          <img alt="Form Cover Picture" :src="form.cover_picture" class="w-full">
+          <NuxtImg alt="Form Cover Picture" :src="form.cover_picture" class="w-full"/>
         </div>
       </div>
       <div v-if="form.logo_picture" class="w-full p-5 relative mx-auto"
            :class="{'pt-20':!form.cover_picture, 'md:w-3/5 lg:w-1/2 md:max-w-2xl': form.width === 'centered', 'max-w-7xl': (form.width === 'full' && !isIframe) }"
       >
-        <img alt="Logo Picture" :src="form.logo_picture"
+        <NuxtImg alt="Logo Picture" :src="form.logo_picture"
              :class="{'top-5':!form.cover_picture, '-top-10':form.cover_picture}"
              class="w-20 h-20 object-contain absolute left-5 transition-all"
-        >
+        />
       </div>
     </div>
     <div class="w-full mx-auto px-4"
diff --git a/client/pages/home.vue b/client/pages/home.vue
index 3ec09726..01f9b1d8 100644
--- a/client/pages/home.vue
+++ b/client/pages/home.vue
@@ -40,9 +40,9 @@
             </div>
           </div>
           <div v-if="!formsLoading && enrichedForms.length === 0" class="flex flex-wrap justify-center max-w-4xl">
-            <img loading="lazy" class="w-56"
+            <NuxtImg loading="lazy" class="w-56"
                  src="/img/pages/forms/search_notfound.png" alt="search-not-found"
-            >
+            />
 
             <h3 class="w-full mt-4 text-center text-gray-900 font-semibold">
               No forms found
diff --git a/client/pages/index.vue b/client/pages/index.vue
index 16fb0196..e9fa3cb0 100644
--- a/client/pages/index.vue
+++ b/client/pages/index.vue
@@ -2,9 +2,9 @@
   <div>
     <section class="bg-gradient-to-b relative from-white to-gray-100 py-8 sm:py-16 ">
       <div class="absolute inset-0">
-        <img class="w-full h-full object-cover object-top"
+        <NuxtImg class="w-full h-full object-cover object-top"
              src="/img/pages/ai_form_builder/background-pattern.svg" alt=""
-        >
+        />
       </div>
 
       <div class="px-4 sm:px-6 lg:px-8 max-w-7xl mx-auto relative -mb-32 md:-mb-52 lg:-mb-72">
@@ -88,9 +88,9 @@
           <div
             class="-m-2 rounded-xl bg-blue-900/5 p-2 backdrop-blur-sm ring-1 ring-inset ring-blue-900/10 lg:-m-4 lg:rounded-2xl lg:p-4"
           >
-            <img src="/img/pages/welcome/product-cover.jpg"
+            <NuxtImg src="/img/pages/welcome/product-cover.jpg"
                  alt="Product screenshot" loading="lazy" class="rounded-md shadow-2xl ring-1 ring-gray-900/10"
-            >
+            />
           </div>
         </div>
       </div>
diff --git a/client/pages/settings/workspace.vue b/client/pages/settings/workspace.vue
index 902f0f7c..129928b7 100644
--- a/client/pages/settings/workspace.vue
+++ b/client/pages/settings/workspace.vue
@@ -25,9 +25,9 @@
     <div v-else-if="workspace">
       <div class="mt-4 flex group bg-white items-center">
         <div class="flex space-x-4 flex-grow items-center">
-          <img v-if="isUrl(workspace.icon)" :src="workspace.icon" :alt="workspace.name + ' icon'"
+          <NuxtImg v-if="isUrl(workspace.icon)" :src="workspace.icon" :alt="workspace.name + ' icon'"
                class="rounded-full h-12 w-12"
-          >
+          />
           <div v-else class="rounded-2xl bg-gray-100 h-12 w-12 text-2xl pt-2 text-center overflow-hidden"
                v-text="workspace.icon"
           />
diff --git a/client/pages/templates/[slug].vue b/client/pages/templates/[slug].vue
index 990427cf..17d3b9a4 100644
--- a/client/pages/templates/[slug].vue
+++ b/client/pages/templates/[slug].vue
@@ -33,9 +33,9 @@
         <div class="px-4 mx-auto sm:px-6 lg:px-8 max-w-7xl">
           <div class="flex flex-col items-center justify-center max-w-4xl gap-8 mx-auto md:gap-12 md:flex-row">
             <div class="aspect-[4/3] shrink-0 rounded-lg shadow-sm overflow-hidden group max-w-xs">
-              <img class="object-cover w-full h-full transition-all duration-200 group-hover:scale-110"
+              <NuxtImg class="object-cover w-full h-full transition-all duration-200 group-hover:scale-110"
                    :src="template.image_url" alt="Template cover image"
-              >
+              />
             </div>
 
             <div class="flex-1 text-center md:text-left relative">