diff --git a/gatsby-config.js b/gatsby-config.js
index 22441207..5ed9f87e 100644
--- a/gatsby-config.js
+++ b/gatsby-config.js
@@ -34,8 +34,8 @@ module.exports = {
       resolve: `gatsby-source-strapi`,
       options: {
         // apiURL: `http://lb-bitlogic-strapi-dev-48805770.sa-east-1.elb.amazonaws.com:1337`,
-        apiURL: `https://strapi.bitlogic.io`,
-        //apiURL: process.env.STRAPI_URL,
+        // apiURL: `https://strapi.bitlogic.io`,
+        apiURL: process.env.STRAPI_URL,
         queryLimit: 1000,
         collectionTypes: [
           `banners`,
diff --git a/src/components/Banners/BannerActionCall.js b/src/components/Banners/BannerActionCall.js
index 7035e5b0..625f4e08 100644
--- a/src/components/Banners/BannerActionCall.js
+++ b/src/components/Banners/BannerActionCall.js
@@ -1,11 +1,10 @@
 import React from "react"
 import { Link } from "gatsby"
-
 import { getImage, GatsbyImage } from "gatsby-plugin-image"
 import "./BannerActionCall.scss"
 
 const BannerActionCall = ({ banner }) => {
-  const icon = getImage(banner?.logo?.localFile)
+  const icon = getImage(banner?.image?.localFile)
 
   return (
     <div className="bannerActCall">
diff --git a/src/components/Banners/BannerActionCall.scss b/src/components/Banners/BannerActionCall.scss
index 4b800aa5..d6848e68 100644
--- a/src/components/Banners/BannerActionCall.scss
+++ b/src/components/Banners/BannerActionCall.scss
@@ -18,7 +18,7 @@
     max-width: 195px;
   }
   &__logo {
-    flex-basis: 80px;
+    flex-basis: 60px;
     padding-bottom: 30px;
   }
   &__title {
@@ -67,7 +67,7 @@
       margin-top: 7rem;
     }
     &__logo {
-      flex-basis: 135px;
+      flex-basis: 110px;
       padding-bottom: 65px;
       //   transform: translateY(-10%);
     }
diff --git a/src/components/Banners/BannerBgImage.js b/src/components/Banners/BannerBgImage.js
index 4fa9dcea..f224026b 100644
--- a/src/components/Banners/BannerBgImage.js
+++ b/src/components/Banners/BannerBgImage.js
@@ -2,22 +2,18 @@ import React from "react"
 import { Link } from "gatsby"
 import { getImage } from "gatsby-plugin-image"
 import { BgImage } from "gbimage-bridge"
-import { useBanner } from "../../hooks/index"
 import showdown from "showdown"
 import "./BannerBgImage.scss"
 
 import { useTheme } from "../../context/themeContext"
 
 const BannerBgImage = ({ banner }) => {
-  const dataBanner = useBanner()
+
   const { theme } = useTheme()
 
-  const bannerSelected = dataBanner?.allStrapiBanners?.nodes.find(
-    ban => ban.strapiId === banner.id
-  )
-  const { image, imageDarkMode, link, summary } = bannerSelected
+  const { bgImage, bgImageDarkMode, link, title } = banner
 
-  const titles = summary
+  const titles = title
   let converter = new showdown.Converter()
   let post = titles
   let html = converter.makeHtml(post)
@@ -26,12 +22,12 @@ const BannerBgImage = ({ banner }) => {
     return { __html: html }
   }
 
-  const imagen = getImage(image?.localFile)
-  const imagenDM = getImage(imageDarkMode?.localFile)
+  const imagen = getImage(bgImage?.localFile)
+  const imagenDM = getImage(bgImageDarkMode?.localFile)
 
   return (
     <div className="bannerBgImage">
-      {bannerSelected.type === "bgImage" ? (
+      {banner.bgImage ? (
         <BgImage
           image={theme === "dark" && imagenDM ? imagenDM : imagen}
           className="bannerBgImage__bgImage"
diff --git a/src/components/Banners/BannerISO.js b/src/components/Banners/BannerISO.js
index bae980ee..4a77edf6 100644
--- a/src/components/Banners/BannerISO.js
+++ b/src/components/Banners/BannerISO.js
@@ -1,18 +1,13 @@
 import React from "react"
 import { getImage, GatsbyImage } from "gatsby-plugin-image"
-import { useBanner } from "../../hooks/index"
 import showdown from "showdown"
 import "./BannerISO.scss"
 
-const BannerISO = ({ banner, title }) => {
-  const dataBanner = useBanner()
+const BannerISO = ({ banner }) => {
 
-  const bannerSelected = dataBanner?.allStrapiBanners?.nodes.find(
-    ban => ban.strapiId === banner.id
-  )
-  const { logo, summary } = bannerSelected
+  const { title, subtitle, image, imageDarkMode } = banner
 
-  const titles = summary
+  const titles = subtitle
   let converter = new showdown.Converter()
   let post = titles
   let html = converter.makeHtml(post)
@@ -31,7 +26,7 @@ const BannerISO = ({ banner, title }) => {
           ></div>
         </div>
         <div className="bannerISO__image ">
-          <GatsbyImage image={getImage(logo?.localFile)} alt={`img-${title}`} />
+          <GatsbyImage image={getImage(image?.localFile)} alt={`img-${title}`} />
         </div>
       </div>
     </div>
diff --git a/src/components/Banners/BannerLogo.js b/src/components/Banners/BannerLogo.js
index 38f3eca5..e0b35557 100644
--- a/src/components/Banners/BannerLogo.js
+++ b/src/components/Banners/BannerLogo.js
@@ -7,21 +7,15 @@ import { useTheme } from "../../context/themeContext"
 
 import "./BannerLogo.scss"
 
-const BannerLogo = ({ banner, title }) => {
+const BannerLogo = ({ banner }) => {
   const { theme } = useTheme()
+  const { bgImage, bgImageDarkMode, image, imageDarkMode, title } = banner
 
-  const dataBanner = useBanner()
-
-  const bannerSelected = dataBanner?.allStrapiBanners?.nodes.find(
-    ban => ban.strapiId === banner.id
-  )
-  const { image, imageDarkMode, logo, logoDarkMode, summary } = bannerSelected
-
-  const imagen = getImage(image?.localFile)
-  const logoImage = getImage(logo?.localFile)
+  const imagen = getImage(bgImage?.localFile)
+  const logoImage = getImage(image?.localFile)
   // Version Dark Mode
-  const imagenDM = getImage(imageDarkMode?.localFile)
-  const logoDM = getImage(logoDarkMode?.localFile)
+  const imagenDM = getImage(bgImageDarkMode?.localFile)
+  const logoDM = getImage(imageDarkMode?.localFile)
 
   return (
     <>
@@ -40,14 +34,14 @@ const BannerLogo = ({ banner, title }) => {
           <h1 className="BannerLogo__Title">{title}</h1>
         </BgImage>
       )}
-
-      {summary ? (
+{/* 
+      {title ? (
         <div className="BannerLogo__summary">
           <div className="container ">
-            <p className="BannerLogo__summary__txt">{summary}</p>
+            <p className="BannerLogo__summary__txt">{title}</p>
           </div>
         </div>
-      ) : null}
+      ) : null} */}
     </>
   )
 }
diff --git a/src/components/Banners/BannerTop.js b/src/components/Banners/BannerTop.js
index 0da47be5..43bc26d4 100644
--- a/src/components/Banners/BannerTop.js
+++ b/src/components/Banners/BannerTop.js
@@ -6,11 +6,11 @@ import "./BannerTop.scss"
 import { useTheme } from "../../context/themeContext"
 
 const BannerTop = ({ banner }) => {
-  const { image, imageDarkMode, title, summary } = banner
+  const { bgImage, bgImageDarkMode, title, summary } = banner
   const { theme } = useTheme()
 
-  const imageBanner = getImage(image?.localFile)
-  const imageDM = getImage(imageDarkMode?.localFile)
+  const imageBanner = getImage(bgImage?.localFile)
+  const imageDM = getImage(bgImageDarkMode?.localFile)
 
   return (
     <div className="banner">
diff --git a/src/components/BitwayPage/BitwayContainer.js b/src/components/BitwayPage/BitwayContainer.js
index bb67396a..1359c469 100755
--- a/src/components/BitwayPage/BitwayContainer.js
+++ b/src/components/BitwayPage/BitwayContainer.js
@@ -15,13 +15,7 @@ const BitwayPage = () => {
   } = useBitwayPage()
 
   const sections = nodes[0]?.sections
-
-  const bannerData = useBanner()
-
-  const bannerActionCall = bannerData?.allStrapiBanners?.nodes.find(
-    banner => banner.page === "bitway" && banner.type === "actionCall"
-  )
-
+  const bannerActionCall  = nodes[0]?.actionCallBanner
   const { pageTitle, pageDescription, pageKeywords } = nodes[0]?.SEO
 
   // vista desktop
diff --git a/src/components/BlogPage/BlogContainer.js b/src/components/BlogPage/BlogContainer.js
index 45715857..b24c4f05 100644
--- a/src/components/BlogPage/BlogContainer.js
+++ b/src/components/BlogPage/BlogContainer.js
@@ -1,27 +1,20 @@
 import React from "react"
-import { useBanner, useBlog } from "../../hooks"
-
+import { useBlog } from "../../hooks"
 import Layout from "../../components/layout"
 import BlogGrid from "./BlogGrid/BlogGrid"
 import BlogArticle from "./BlogArticle/BlogArticle"
-
 import { Seo, BannerActionCall } from "../index"
 
 import "./BlogContainer.scss"
 
 const Blog = () => {
-  const bannerData = useBanner()
+
   const blogData = useBlog()
+
   const data = blogData?.allStrapiBlogCategory?.nodes
   const dataArticles = blogData?.allStrapiArticle?.nodes
-
-  const bannerBlog = bannerData?.allStrapiBanners?.nodes.find(
-    banner => banner.page === "blog" && banner.type === "bgColor"
-  )
-
-  const bannerActionCall = bannerData?.allStrapiBanners?.nodes.find(
-    banner => banner.page === "blog" && banner.type === "actionCall"
-  )
+  const bannerActionCall = blogData?.allStrapiBlogPage?.nodes[0]?.actionCallBanner
+  const title = blogData?.allStrapiBlogPage?.nodes[0]?.title
 
   const filterArticle = data.map(category => dataArticles.filter(article => category.name === article.blog_category.name))
 
@@ -42,9 +35,9 @@ const Blog = () => {
       )}
       {data.length > 0 && (
         <div className="blog__container">
-          {bannerBlog && (
+          {title && (
             <div className="banner__container">
-              <h3 dangerouslySetInnerHTML={{ __html: bannerBlog.summary }} />
+              <h3 dangerouslySetInnerHTML={{ __html: title }} />
             </div>
           )}
           
diff --git a/src/components/EdTechPage/EdTechContainer.js b/src/components/EdTechPage/EdTechContainer.js
index 5e8b8b12..fcc0031d 100644
--- a/src/components/EdTechPage/EdTechContainer.js
+++ b/src/components/EdTechPage/EdTechContainer.js
@@ -1,5 +1,5 @@
 import * as React from "react"
-import { useEdTech, useBanner } from "../../hooks"
+import { useEdTech } from "../../hooks"
 import { BannerTop, BannerActionCall, Seo } from "../index"
 import Layout from "../layout"
 
@@ -9,17 +9,12 @@ import "./EdtechContainer.scss"
 const EdTech = () => {
   const data = useEdTech()
 
-  const bannerData = useBanner()
   const edTechs = data?.allStrapiEdteches?.nodes
 
   const content = edTechs.map(tech => <Cards key={tech.id} tech={tech} />)
 
-  const bannerTop = bannerData?.allStrapiBanners?.nodes.find(
-    banner => banner.page === "edtech" && banner.type === "top"
-  )
-  const bannerActionCall = bannerData?.allStrapiBanners?.nodes.find(
-    banner => banner.page === "edtech" && banner.type === "actionCall"
-  )
+  const bannerTop = data?.allStrapiEdTechPage?.nodes[0].topBanner
+  const bannerActionCall = data?.allStrapiEdTechPage?.nodes[0].actionCallBanner
 
   const {
     pageTitle,
diff --git a/src/components/HomePage/HomeContainer/HomeContainer.js b/src/components/HomePage/HomeContainer/HomeContainer.js
index 802dd022..18f7cdaf 100644
--- a/src/components/HomePage/HomeContainer/HomeContainer.js
+++ b/src/components/HomePage/HomeContainer/HomeContainer.js
@@ -1,17 +1,34 @@
 import * as React from "react"
 import { useHomePage } from "../../../hooks/index"
 import Layout from "../../layout"
-import { Seo, CustomSection } from "../../index"
+import {
+  Seo,
+  CustomSection,
+  BannerLogo,
+  BannerBgImage,
+  BannerISO,
+  ServiceCards,
+  EdTechCards,
+  PartnersSection,
+} from "../../index"
 
 import "./HomeContainer.scss"
 
 const Home = () => {
-
   const data = useHomePage()
-  
-  const homeSections = data?.allStrapiHome?.nodes[0]?.sections
-  const { pageTitle, pageDescription, pageKeywords } = data?.allStrapiHome?.nodes[0]?.pageMetadata || {}
 
+  const homeSections = data?.allStrapiHome?.nodes[0]?.sections
+  const { pageTitle, pageDescription, pageKeywords } =
+    data?.allStrapiHome?.nodes[0]?.pageMetadata || {}
+  const {
+    topHomeBanner,
+    infoImgBanner,
+    infoBgBanner,
+    infoBanner,
+    servicesBlock,
+    partnersBlock,
+    edtechBlock,
+  } = data?.allStrapiHome?.nodes[0]
 
   return (
     <Layout>
@@ -22,9 +39,29 @@ const Home = () => {
           keywords={pageKeywords}
         />
       )}
-      {homeSections && (
-        <CustomSection sections={homeSections} />
+      {topHomeBanner && <BannerLogo banner={topHomeBanner} />}
+      {servicesBlock && (
+        <ServiceCards
+          title={servicesBlock?.title}
+          services={servicesBlock?.services}
+        />
+      )}
+      {edtechBlock && (
+        <EdTechCards
+          title={edtechBlock.title}
+          edteches={edtechBlock.edteches}
+        />
+      )}
+      {infoBgBanner && <BannerBgImage banner={infoBgBanner} />}
+      {infoImgBanner && <BannerISO banner={infoImgBanner} />}
+      {partnersBlock && (
+        <PartnersSection
+          title={partnersBlock.title}
+          partners={partnersBlock.partners}
+        />
       )}
+      {infoBanner && <BannerBgImage banner={infoBanner} />}
+      {homeSections && <CustomSection sections={homeSections} />}
     </Layout>
   )
 }
diff --git a/src/components/JobsPage/JobsPage.js b/src/components/JobsPage/JobsPage.js
index 3b45abb8..54f2f475 100644
--- a/src/components/JobsPage/JobsPage.js
+++ b/src/components/JobsPage/JobsPage.js
@@ -8,7 +8,7 @@ import './JobsPage.scss'
 
 export default function JobsPage() {
     const jobsData = useJobsPage()
-    const banner = jobsData?.strapiJobsPage?.banner
+    const title = jobsData?.strapiJobsPage?.title
     const { pageTitle, pageDescription, pageKeywords } = jobsData?.strapiJobsPage?.pageMetadata || {}
 
     return (
@@ -20,7 +20,7 @@ export default function JobsPage() {
                     keywords={pageKeywords}
                 />
             )}
-            <MarkdownView markdown={banner} className="banner__head" />
+            <MarkdownView markdown={title} className="banner__head" />
             <div id="cats-portal-widget" className="container widget-container"></div>
             <Helmet>
                 <script>
diff --git a/src/components/ServicesPage/ServicesSection.js b/src/components/ServicesPage/ServicesSection.js
index 77bf3fa2..f716194d 100644
--- a/src/components/ServicesPage/ServicesSection.js
+++ b/src/components/ServicesPage/ServicesSection.js
@@ -1,5 +1,5 @@
 import React from "react"
-import { useServices, useBanner } from "../../hooks"
+import { useServices, useBanner, useServicePage } from "../../hooks"
 import Layout from "../layout"
 import { BannerTop, BannerActionCall, ServiceCard, Seo } from "../index"
 
@@ -9,18 +9,16 @@ const ServicesSection = () => {
   const servicesData = useServices()
   const bannerData = useBanner()
 
+  const servicesPageData = useServicePage()
+
   const servicesList = servicesData?.allStrapiServices?.nodes
 
   const servicesToDisplay = servicesList?.map(service => (
     <ServiceCard key={service.id} service={service} />
   ))
 
-  const bannerTop = bannerData?.allStrapiBanners?.nodes.find(
-    banner => banner.page === "services" && banner.type === "top"
-  )
-  const bannerActionCall = bannerData?.allStrapiBanners?.nodes.find(
-    banner => banner.page === "services" && banner.type === "actionCall"
-  )
+  const bannerTop = servicesPageData?.strapiServicesPage?.topBanner
+  const bannerActionCall = servicesPageData?.strapiServicesPage?.actionCallBanner
 
   const {
     pageDescription,
diff --git a/src/hooks/index.js b/src/hooks/index.js
index 94e86cb1..82cc5fc6 100644
--- a/src/hooks/index.js
+++ b/src/hooks/index.js
@@ -7,6 +7,7 @@ import useHomePage from "./useHomePage"
 import useContactPage from "./useContactPage"
 import useBlog from './useBlog'
 import useJobsPage from "./useJobsPage"
+import useServicePage from "./useServicePage"
 
 export {
   useServices,
@@ -18,4 +19,5 @@ export {
   useContactPage,
   useBlog,
   useJobsPage,
+  useServicePage
 }
diff --git a/src/hooks/useBitwayPage.js b/src/hooks/useBitwayPage.js
index b103bee4..c203a9c3 100755
--- a/src/hooks/useBitwayPage.js
+++ b/src/hooks/useBitwayPage.js
@@ -10,6 +10,27 @@ const useBitwayPage = () => {
             pageTitle
             pageKeywords
           }
+          actionCallBanner {
+            title
+            image {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+            imageDarkMode {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+            link {
+              name
+              pathTo
+            }
+          }
           sections {
             body
             id
@@ -25,6 +46,13 @@ const useBitwayPage = () => {
                   }
                 }
               }
+              imageDark {
+                localFile {
+                  childImageSharp {
+                    gatsbyImageData
+                  }
+                }
+              }
             }
           }
         }
diff --git a/src/hooks/useBlog.js b/src/hooks/useBlog.js
index d27001f8..7cbe94dc 100644
--- a/src/hooks/useBlog.js
+++ b/src/hooks/useBlog.js
@@ -27,11 +27,33 @@ const useBlog = () => {
       }
       allStrapiBlogPage {
         nodes {
+          title
           seo: pageMetadata {
             pageTitle
             pageKeywords
             pageDescription
           }
+          actionCallBanner {
+            title
+            link {
+              name
+              pathTo
+            }
+            image {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+            imageDarkMode {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+          }
         }
       }
     }
diff --git a/src/hooks/useEdTech.js b/src/hooks/useEdTech.js
index 23256ee9..f8540b25 100644
--- a/src/hooks/useEdTech.js
+++ b/src/hooks/useEdTech.js
@@ -3,28 +3,44 @@ import { useStaticQuery, graphql } from "gatsby"
 const useEdTech = () => {
   const query = useStaticQuery(graphql`
     {
-      allStrapiBanners(filter: { page: { eq: "edtech" } }) {
+      allStrapiEdTechPage {
         nodes {
-          enable
-          page
-          type
-          title
-          summary
-          link {
-            pathTo
-            name
-          }
-          logo {
-            localFile {
-              childImageSharp {
-                gatsbyImageData
+          topBanner {
+            title
+            summary
+            bgImageDarkMode {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+            bgImage {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
               }
             }
           }
-          image {
-            localFile {
-              childImageSharp {
-                gatsbyImageData
+          actionCallBanner {
+            title
+            link {
+              name
+              pathTo
+            }
+            imageDarkMode {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+            image {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
               }
             }
           }
diff --git a/src/hooks/useHomePage.js b/src/hooks/useHomePage.js
index c92a24db..72c0e215 100644
--- a/src/hooks/useHomePage.js
+++ b/src/hooks/useHomePage.js
@@ -5,11 +5,155 @@ const useHomePage = () => {
     {
       allStrapiHome {
         nodes {
+          servicesBlock {
+            type
+            title
+            enable
+            services {
+              homeTitle
+              homeIntro
+              iconDarkMode {
+                localFile {
+                  childImageSharp {
+                    gatsbyImageData
+                  }
+                }
+              }
+              icon {
+                localFile {
+                  childImageSharp {
+                    gatsbyImageData
+                  }
+                }
+              }
+            }
+          }
+          partnersBlock {
+            title
+            partners {
+              text
+              imageDark {
+                localFile {
+                  childImageSharp {
+                    gatsbyImageData
+                  }
+                }
+              }
+              image {
+                localFile {
+                  childImageSharp {
+                    gatsbyImageData
+                  }
+                }
+              }
+              caption
+            }
+          }
+          edtechBlock {
+            type
+            title
+            enable
+            edteches {
+              homeTitle
+              homeIntro
+              homeIconDarkMode {
+                localFile {
+                  childImageSharp {
+                    gatsbyImageData
+                  }
+                }
+              }
+              homeIcon {
+                localFile {
+                  childImageSharp {
+                    gatsbyImageData
+                  }
+                }
+              }
+            }
+          }
           pageMetadata {
             pageDescription
             pageKeywords
             pageTitle
           }
+          topHomeBanner {
+            title
+            bgImageDarkMode {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+            bgImage {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+            imageDarkMode {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+            image {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+          }
+          infoImgBanner {
+            title
+            subtitle
+            imageDarkMode {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+            image {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+          }
+          infoBgBanner {
+            title
+            link {
+              name
+              pathTo
+            }
+            bgImageDarkMode {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+            bgImage {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+          }
+          infoBanner {
+            title
+            link {
+              name
+              pathTo
+            }
+          }
           sections {
             title
             type
diff --git a/src/hooks/useJobsPage.js b/src/hooks/useJobsPage.js
index 888337c3..be3bd342 100644
--- a/src/hooks/useJobsPage.js
+++ b/src/hooks/useJobsPage.js
@@ -4,7 +4,7 @@ const useJobsPage = () => {
     const query = useStaticQuery(graphql`
     {
       strapiJobsPage {
-        banner
+        title
         pageMetadata {
           pageDescription
           pageKeywords
diff --git a/src/hooks/useServicePage.js b/src/hooks/useServicePage.js
new file mode 100644
index 00000000..7ac3ad33
--- /dev/null
+++ b/src/hooks/useServicePage.js
@@ -0,0 +1,58 @@
+import { useStaticQuery, graphql } from "gatsby"
+
+const useServicePage = () => {
+  const query = useStaticQuery(graphql`
+    {
+      strapiServicesPage {
+        topBanner {
+          title
+          summary
+          bgImageDarkMode {
+            localFile {
+              childImageSharp {
+                gatsbyImageData
+              }
+            }
+          }
+          bgImage {
+            localFile {
+              childImageSharp {
+                gatsbyImageData
+              }
+            }
+          }
+        }
+        actionCallBanner {
+          title
+          link {
+            name
+            pathTo
+          }
+          imageDarkMode {
+            localFile {
+              childImageSharp {
+                gatsbyImageData
+              }
+            }
+          }
+          image {
+            localFile {
+              childImageSharp {
+                gatsbyImageData
+              }
+            }
+          }
+        }
+        pageMetadata {
+          pageDescription
+          pageKeywords
+          pageTitle
+        }
+
+      }
+    }
+  `)
+  return query
+}
+
+export default useServicePage
diff --git a/src/schema/schema.js b/src/schema/schema.js
index cbd6dc16..11f60488 100644
--- a/src/schema/schema.js
+++ b/src/schema/schema.js
@@ -24,6 +24,30 @@ type StrapiServicesPage implements Node {
   ): Date
   pageMetadata: StrapiServicesPagePageMetadata
   strapiId: Int
+  topBanner: StrapiServicesPageTopBanner
+  actionCallBanner: StrapiServicesPageActionCallBanner
+}
+
+type StrapiServicesPageTopBanner {
+  id: Int
+  title: String
+  summary: String
+  bgImage: LocalFile
+  bgImageDarkMode: LocalFile
+}
+
+type StrapiServicesPageActionCallBanner {
+  id: Int
+  title: String
+  link: StrapiServicesPageActionCallBannerLink
+  image: LocalFile
+  imageDarkMode: LocalFile
+}
+
+type StrapiServicesPageActionCallBannerLink {
+  id: Int
+  name: String
+  pathTo: String
 }
 
 type StrapiServicesPagePageMetadata {
@@ -92,8 +116,149 @@ type StrapiHome implements Node {
   sections: [StrapiHomeSections]
   pageMetadata: StrapiHomePageMetadata
   strapiId: Int
+  topHomeBanner: StrapiHomeTopHomeBanner
+  infoBgBanner: StrapiHomeInfoBgBanner
+  infoImgBanner: StrapiHomeInfoImgBanner
+  infoBanner: StrapiHomeInfoBanner
+  servicesBlock: StrapiHomeServicesBlock
+  edtechBlock: StrapiHomeEdtechBlock
+  partnersBlock: StrapiHomePartnersBlock
+}
+
+type StrapiHomeTopHomeBanner {
+  id: Int
+  title: String
+  image: LocalFile
+  imageDarkMode: LocalFile
+  bgImage: LocalFile
+  bgImageDarkMode: LocalFile
+}
+
+type StrapiHomeInfoBgBanner {
+  id: Int
+  title: String
+  link: StrapiHomeInfoBgBannerLink
+  bgImage: LocalFile
+  bgImageDarkMode: LocalFile
+}
+
+type StrapiHomeInfoBgBannerLink {
+  id: Int
+  name: String
+  pathTo: String
+}
+
+type StrapiHomeInfoImgBanner {
+  id: Int
+  title: String
+  subtitle: String
+  image: LocalFile
+  imageDarkMode: LocalFile
+}
+
+type StrapiHomeInfoBanner {
+  id: Int
+  title: String
+  link: StrapiHomeInfoBannerLink
+}
+
+type StrapiHomeInfoBannerLink {
+  id: Int
+  name: String
+  pathTo: String
+}
+
+type StrapiHomeServicesBlock {
+  id: Int
+  title: String
+  type: String
+  enable: Boolean
+  services: [StrapiHomeServicesBlockServices]
+}
+
+type StrapiHomeServicesBlockServices {
+  id: Int
+  title: String
+  description: String
+  visible: Boolean
+  homeIntro: String
+  homeTitle: String
+  published_at(
+    formatString: String
+    fromNow: Boolean
+    difference: String
+    locale: String
+  ): Date
+  created_at(
+    formatString: String
+    fromNow: Boolean
+    difference: String
+    locale: String
+  ): Date
+  updated_at(
+    formatString: String
+    fromNow: Boolean
+    difference: String
+    locale: String
+  ): Date
+  icon: LocalFile
+  iconDarkMode: LocalFile
+}
+
+type StrapiHomeEdtechBlock {
+  id: Int
+  title: String
+  type: String
+  enable: Boolean
+  edteches: [StrapiHomeEdtechBlockEdteches]
+}
+
+type StrapiHomeEdtechBlockEdteches {
+  id: Int
+  title: String
+  content: String
+  homeIntro: String
+  homeTitle: String
+  published_at(
+    formatString: String
+    fromNow: Boolean
+    difference: String
+    locale: String
+  ): Date
+  created_at(
+    formatString: String
+    fromNow: Boolean
+    difference: String
+    locale: String
+  ): Date
+  updated_at(
+    formatString: String
+    fromNow: Boolean
+    difference: String
+    locale: String
+  ): Date
+  icon: LocalFile
+  homeIcon: LocalFile
+  iconDarkMode: LocalFile
+  homeIconDarkMode: LocalFile
+}
+
+type StrapiHomePartnersBlock {
+  id: Int
+  title: String
+  partners: [StrapiHomePartnersBlockPartners]
+}
+
+type StrapiHomePartnersBlockPartners {
+  id: Int
+  text: String
+  caption: String
+  image: LocalFile
+  imageDark: LocalFile
 }
 
+
+
 type StrapiHomePageMetadata {
   id: Int
   pageTitle: String
@@ -384,6 +549,30 @@ type StrapiEdTechPage implements Node {
   SEO: StrapiEdTechPageSEO
   banners: [StrapiEdTechPageBanners]
   strapiId: Int
+  topBanner: StrapiEdTechPageTopBanner
+  actionCallBanner: StrapiEdTechPageActionCallBanner
+}
+
+type StrapiEdTechPageTopBanner {
+  id: Int
+  title: String
+  summary: String
+  bgImage: LocalFile
+  bgImageDarkMode: LocalFile
+}
+
+type StrapiEdTechPageActionCallBanner {
+  id: Int
+  title: String
+  link: StrapiEdTechPageActionCallBannerLink
+  image: LocalFile
+  imageDarkMode: LocalFile
+}
+
+type StrapiEdTechPageActionCallBannerLink {
+  id: Int
+  name: String
+  pathTo: String
 }
 
 type StrapiEdTechPageSEO {
@@ -497,8 +686,24 @@ type StrapiBitwayPage implements Node {
   strapiId: Int
   banners: [StrapiBitwayPageBanners]
   banner: [StrapiBitwayPageBanner]
+  actionCallBanner: StrapiBitwayPageActionCallBanner
+}
+
+type StrapiBitwayPageActionCallBanner {
+  id: Int
+  title: String
+  link: StrapiBitwayPageActionCallBannerLink
+  image: LocalFile
+  imageDarkMode: LocalFile
 }
 
+type StrapiBitwayPageActionCallBannerLink {
+  id: Int
+  name: String
+  pathTo: String
+}
+
+
 type StrapiBitwayPageBanner {
   id: Int
   enable: Boolean
@@ -1088,6 +1293,22 @@ type StrapiBlogPage implements Node {
   ): Date
   pageMetadata: StrapiBlogPagePageMetadata
   strapiId: Int
+  title: String
+  actionCallBanner: StrapiBlogPageActionCallBanner
+}
+
+type StrapiBlogPageActionCallBanner {
+  id: Int
+  title: String
+  link: StrapiBlogPageActionCallBannerLink
+  image: LocalFile
+  imageDarkMode: LocalFile
+}
+
+type StrapiBlogPageActionCallBannerLink {
+  id: Int
+  name: String
+  pathTo: String
 }
 
 type StrapiBlogPagePageMetadata {