diff --git a/apps/docs/public/supabase-cloud/auth-settings.webp b/apps/docs/pages/contributor-guides/images/auth-settings.webp
similarity index 100%
rename from apps/docs/public/supabase-cloud/auth-settings.webp
rename to apps/docs/pages/contributor-guides/images/auth-settings.webp
diff --git a/apps/docs/public/supabase-cloud/db-push-result.webp b/apps/docs/pages/contributor-guides/images/db-push-result.webp
similarity index 100%
rename from apps/docs/public/supabase-cloud/db-push-result.webp
rename to apps/docs/pages/contributor-guides/images/db-push-result.webp
diff --git a/apps/docs/public/supabase-cloud/db-url.webp b/apps/docs/pages/contributor-guides/images/db-url.webp
similarity index 100%
rename from apps/docs/public/supabase-cloud/db-url.webp
rename to apps/docs/pages/contributor-guides/images/db-url.webp
diff --git a/apps/docs/public/supabase-cloud/match-env.webp b/apps/docs/pages/contributor-guides/images/match-env.webp
similarity index 100%
rename from apps/docs/public/supabase-cloud/match-env.webp
rename to apps/docs/pages/contributor-guides/images/match-env.webp
diff --git a/apps/docs/public/supabase-cloud/new-project.webp b/apps/docs/pages/contributor-guides/images/new-project.webp
similarity index 100%
rename from apps/docs/public/supabase-cloud/new-project.webp
rename to apps/docs/pages/contributor-guides/images/new-project.webp
diff --git a/apps/docs/pages/contributor-guides/supabase-cloud.mdx b/apps/docs/pages/contributor-guides/supabase-cloud.mdx
index 09af27cc..47dab8fa 100644
--- a/apps/docs/pages/contributor-guides/supabase-cloud.mdx
+++ b/apps/docs/pages/contributor-guides/supabase-cloud.mdx
@@ -1,6 +1,11 @@
 import Image from 'next/image';
 import { Steps } from 'nextra/components';
 import { Callout } from 'nextra/components';
+import DBUrl from './images/db-url.webp';
+import DBPushResult from './images/db-push-result.webp';
+import AuthSettings from './images/auth-settings.webp';
+import MatchEnvVariables from './images/match-env.webp';
+import NewProject from './images/new-project.webp';
 
 # Supabase Cloud Setup
 
@@ -25,7 +30,7 @@ If your requirement matches any of the above, then this guide is for you.
     title="YouTube video player"
     frameborder="0"
     allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
-    className="nx-my-4 nx-nx-rounded-md nx-my-4"
+    className="nx-my-4 nx-rounded-md"
     allowfullscreen
   ></iframe>
 </div>
@@ -40,16 +45,7 @@ For this step you need to have signed up for supabase and create an account, jus
 
 Once you have an account just click on the _New Project_ on your dashboard. After that you should see a similar screen to the below, fill in the fields.
 
-<div className="nx-w-full nx-flex nx-items-center nx-justify-center">
-  <Image
-    src={`${process.env.imagePath}/supabase-cloud/new-project.webp`}
-    alt="New project in supabase"
-    quality="100"
-    width={500}
-    height={500}
-    className="nx-rounded-md nx-my-4"
-  />
-</div>
+<Image src={NewProject} alt="New project in supabase" quality="100" />
 
 <Callout>
   Make sure you save your database password somewhere, else you won't be able to get it back
@@ -70,16 +66,7 @@ Follow the instruction in your terminal to generate your access token. Paste the
 
 - Go to the supabase dashboard, go to your project, click on the settings icon on the left side bar
 
-<div className="nx-w-full nx-flex nx-items-center nx-justify-center">
-  <Image
-    src={`${process.env.imagePath}/supabase-cloud/db-url.webp`}
-    alt="DB URL in the supabase dashboard"
-    quality="100"
-    width={500}
-    height={500}
-    className="nx-rounded-md nx-my-4"
-  />
-</div>
+<Image src={DBUrl} alt="DB URL in the supabase dashboard" quality="100" />
 
 - Copy the URL in the image above for your `db url`
 - Paste it somewhere
@@ -97,31 +84,13 @@ pnpm supabase db push --db-url "URL HERE"
 
 #### Result
 
-<div className="nx-w-full nx-flex nx-items-center nx-justify-center">
-  <Image
-    src={`${process.env.imagePath}/supabase-cloud/db-push-result.webp`}
-    alt="Result of supabase db push"
-    quality="100"
-    width={500}
-    height={500}
-    className="nx-rounded-md nx-my-4"
-  />
-</div>
+<Image src={DBPushResult} alt="Result of supabase db push" quality="100" />
 
 ### Configure Auth in your Supabase project
 
 Here we will update our email configurations, to prevent supabase from sending confirmation emails on signup. This is because we don't have email confirmation setup on ClassroomIO, this feature will come later. If you don't disable it, you won't be able to signup into the application.
 
-<div className="nx-w-full nx-flex nx-items-center nx-justify-center">
-  <Image
-    src={`${process.env.imagePath}/supabase-cloud/auth-settings.webp`}
-    alt="Authentication configuration"
-    quality="100"
-    width={500}
-    height={500}
-    className="nx-rounded-md nx-my-4"
-  />
-</div>
+<Image src={AuthSettings} alt="Authentication configuration" quality="100" />
 
 ### Add configurations to your environment variables
 
@@ -135,16 +104,7 @@ PUBLIC_SUPABASE_ANON_KEY=
 
 To get the correct environment variables, follow the instructions in this image
 
-<div className="nx-w-full nx-flex nx-items-center nx-justify-center">
-  <Image
-    src={`${process.env.imagePath}/supabase-cloud/match-env.webp`}
-    alt="Source of supabase environment variables"
-    quality="100"
-    width={500}
-    height={500}
-    className="nx-rounded-md nx-my-4"
-  />
-</div>
+<Image src={MatchEnvVariables} alt="Source of supabase environment variables" quality="100" />
 
 ### Tada - That's all
 
diff --git a/apps/docs/public/signup/dashboard-homepage-signedin.webp b/apps/docs/pages/quickstart/images/dashboard-homepage-signedin.webp
similarity index 100%
rename from apps/docs/public/signup/dashboard-homepage-signedin.webp
rename to apps/docs/pages/quickstart/images/dashboard-homepage-signedin.webp
diff --git a/apps/docs/public/signup/dashboard-homepage-signedout.webp b/apps/docs/pages/quickstart/images/dashboard-homepage-signedout.webp
similarity index 100%
rename from apps/docs/public/signup/dashboard-homepage-signedout.webp
rename to apps/docs/pages/quickstart/images/dashboard-homepage-signedout.webp
diff --git a/apps/docs/public/signup/onboarding-page1.webp b/apps/docs/pages/quickstart/images/onboarding-page1.webp
similarity index 100%
rename from apps/docs/public/signup/onboarding-page1.webp
rename to apps/docs/pages/quickstart/images/onboarding-page1.webp
diff --git a/apps/docs/public/signup/onboarding-page2.webp b/apps/docs/pages/quickstart/images/onboarding-page2.webp
similarity index 100%
rename from apps/docs/public/signup/onboarding-page2.webp
rename to apps/docs/pages/quickstart/images/onboarding-page2.webp
diff --git a/apps/docs/public/signup/signup-page.webp b/apps/docs/pages/quickstart/images/signup-page.webp
similarity index 100%
rename from apps/docs/public/signup/signup-page.webp
rename to apps/docs/pages/quickstart/images/signup-page.webp
diff --git a/apps/docs/pages/quickstart/signup.mdx b/apps/docs/pages/quickstart/signup.mdx
index 5ef6ad43..24221c31 100644
--- a/apps/docs/pages/quickstart/signup.mdx
+++ b/apps/docs/pages/quickstart/signup.mdx
@@ -1,5 +1,10 @@
 import Image from 'next/image';
 import { Steps } from 'nextra/components';
+import DashboardHomePageSignedin from './images/dashboard-homepage-signedin.webp';
+import DashboardHomePageSignedout from './images/dashboard-homepage-signedout.webp';
+import DashboardOnboardingPage1 from './images/onboarding-page1.webp';
+import DashboardOnboardingPage2 from './images/onboarding-page2.webp';
+import DashboardSignupPage from './images/signup-page.webp';
 
 # Signing Up for ClassroomIO
 
@@ -10,60 +15,25 @@ Signing up is currently disabled on production. Potential customers can only boo
 
 Got to [app.classroomio.com](https://app.classroomio.com). Click on the signup button on the top right to take you to the Sign up page.
 
-<Image
-  src={`${process.env.imagePath}/signup/dashboard-homepage-signedout.webp`}
-  alt="Dashboard before signin"
-  quality="100"
-  width={500}
-  height={500}
-  className="nx-rounded-md nx-my-4"
-/>
+<Image src={DashboardHomePageSignedout} alt="Dashboard before signin" quality="100" />
 
 ### Create an account
 
 Once you are on the signup page, enter your email and a password made up of 6 or more characters.
 
-<Image
-  src={`${process.env.imagePath}/signup/signup-page.webp`}
-  alt="Dashboard signin page"
-  quality="100"
-  width={500}
-  height={500}
-  className="nx-rounded-md nx-my-4"
-/>
+<Image src={DashboardSignupPage} alt="Dashboard signin page" quality="100" />
 
 ### Complete the onboarding
 
 Upon completing the signup flow, you will be redirected to the onboarding page. Here you can enter your fullname and your organization details and next you would share how you heard of ClassroomIO
 
-<Image
-  src={`${process.env.imagePath}/signup/onboarding-page1.webp`}
-  alt="Dashboard onboarding page 1"
-  quality="100"
-  width={500}
-  height={500}
-  className="nx-rounded-md nx-my-4"
-/>
-<Image
-  src={`${process.env.imagePath}/signup/onboarding-page2.webp`}
-  alt="Dashboard onboarding page 2"
-  quality="100"
-  width={500}
-  height={500}
-  className="nx-rounded-md nx-my-4"
-/>
+<Image src={DashboardOnboardingPage1} alt="Dashboard onboarding page 1" quality="100" />
+<Image src={DashboardOnboardingPage2} alt="Dashboard onboarding page 2" quality="100" />
 
 ### Welcome to the dashboard
 
 After you go through the onboarding, you are successfully signed up and you are ready to start using the platform.
 
-<Image
-  src={`${process.env.imagePath}/signup/dashboard-homepage-signedin.webp`}
-  alt="Dashboard after signing in"
-  quality="100"
-  width={500}
-  height={500}
-  className="nx-rounded-md nx-my-4"
-/>
+<Image src={DashboardHomePageSignedin} alt="Dashboard after signing in" quality="100" />
 
 </Steps>