diff --git a/ui/app/robots.ts b/ui/app/robots.ts
new file mode 100644
index 0000000000..363ebd429f
--- /dev/null
+++ b/ui/app/robots.ts
@@ -0,0 +1,30 @@
+import type { MetadataRoute } from "next"
+
+import { publicConfig } from "../config.public"
+
+const getRobotRules = () => {
+  const { env } = publicConfig
+  switch (env) {
+    case "production":
+      return {
+        rules: {
+          userAgent: "*",
+          disallow: ["/test-widget", "/recherche-apprentissage", "/recherche-apprentissage-formation", "/recherche-emploi"],
+        },
+        sitemap: "https://labonnealternance.apprentissage.beta.gouv.fr/sitemap.xml",
+      }
+
+    default:
+      return {
+        rules: {
+          userAgent: "*",
+          disallow: "/",
+        },
+        sitemap: "",
+      }
+  }
+}
+
+export default function Robots(): MetadataRoute.Robots {
+  return getRobotRules()
+}
diff --git a/ui/components/footer.tsx b/ui/components/footer.tsx
index 5c212af55f..a9c8160b17 100644
--- a/ui/components/footer.tsx
+++ b/ui/components/footer.tsx
@@ -1,6 +1,8 @@
 import { ExternalLinkIcon } from "@chakra-ui/icons"
 import { Box, Container, Divider, Flex, Grid, GridItem, Image, Link, ListItem, UnorderedList } from "@chakra-ui/react"
 import NextLink from "next/link"
+import { useRouter } from "next/router"
+import { useEffect, useState } from "react"
 
 import { publicConfig } from "../config.public"
 
@@ -24,7 +26,19 @@ const lastLink = {
   paddingLeft: { base: 0, lg: 4 },
 }
 
-const Footer = ({ ressources = "" }: { ressources?: string }) => {
+const Footer = () => {
+  const { pathname } = useRouter()
+  const [ressource, setRessource] = useState<string>()
+
+  useEffect(() => {
+    if (pathname === "/acces-recruteur") {
+      setRessource("recruter")
+    }
+    if (pathname === "/organisme-de-formation") {
+      setRessource("cfa")
+    }
+  }, [])
+
   return (
     <Box as="footer" borderTop="1px solid" borderTopColor="info" paddingTop={6} marginTop={12}>
       <Container variant={"responsiveContainer"}>
@@ -116,7 +130,7 @@ const Footer = ({ ressources = "" }: { ressources?: string }) => {
                 </NextLink>
               </ListItem>
               <ListItem {...basicLink}>
-                <NextLink legacyBehavior passHref href={`/ressources${ressources ? "#" + ressources : ""}`}>
+                <NextLink legacyBehavior passHref href={{ pathname: "/ressources", hash: ressource }}>
                   <Link aria-label="Accès à la page Ressources">Ressources</Link>
                 </NextLink>
               </ListItem>
diff --git a/ui/next.config.js b/ui/next.config.js
index e04fd0a9cc..491f3408b7 100644
--- a/ui/next.config.js
+++ b/ui/next.config.js
@@ -78,35 +78,15 @@ const nextConfig = withImages({
     hideSourceMaps: false,
     widenClientFileUpload: true,
   },
-  async rewrites() {
-    return [
-      {
-        source: "/robots.txt",
-        destination: "/api/robots",
-      },
-    ]
-  },
   async headers() {
     return [
       {
         source: "/:path*",
         headers: [
-          {
-            key: "X-Content-Type-Options",
-            value: "nosniff",
-          },
           {
             key: "Content-Security-Policy",
             value: inline(contentSecurityPolicy + " frame-ancestors 'none';"),
           },
-          {
-            key: "Referrer-Policy",
-            value: "unsafe-url",
-          },
-          {
-            key: "Strict-Transport-Security",
-            value: "max-age=31536000; includeSubDomains",
-          },
         ],
       },
       {
diff --git a/ui/pages/acces-recruteur.tsx b/ui/pages/acces-recruteur.tsx
index eb90ef5a20..4043622c3d 100644
--- a/ui/pages/acces-recruteur.tsx
+++ b/ui/pages/acces-recruteur.tsx
@@ -61,7 +61,7 @@ const AccesRecruteur = () => (
       </Container>
       <Box mb={3}>&nbsp;</Box>
     </Box>
-    <Footer ressources="recruteur" />
+    <Footer />
   </Box>
 )
 
diff --git a/ui/pages/api/robots.ts b/ui/pages/api/robots.ts
deleted file mode 100644
index 2a27e4bc6b..0000000000
--- a/ui/pages/api/robots.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Production only, nginx is parameter with a static page for all other environment
-import { NextApiRequest, NextApiResponse } from "next"
-
-const getRobotContent = () => {
-  console.log(process.env.NEXT_PUBLIC_ENV)
-  switch (process.env.NEXT_PUBLIC_ENV) {
-    case "production":
-      return `User-agent: * \nDisallow: /test-widget \nDisallow: /recherche-apprentissage \nDisallow: /recherche-apprentissage-formation \nDisallow: /recherche-emploi \nSitemap: https://labonnealternance.apprentissage.beta.gouv.fr/sitemap.xml`
-    default:
-      return `User-agent: * \nDisallow: /`
-  }
-}
-
-export default function handler(req: NextApiRequest, res: NextApiResponse) {
-  console.log(process.env.NEXT_PUBLIC_ENV)
-  res.setHeader("Content-Type", "text/plain")
-  res.status(200).send(getRobotContent())
-}
diff --git a/ui/pages/metiers/[forJob].tsx b/ui/pages/metiers/[forJob].tsx
index 7325c21cd7..efbf69d19f 100644
--- a/ui/pages/metiers/[forJob].tsx
+++ b/ui/pages/metiers/[forJob].tsx
@@ -6,7 +6,6 @@ import { find, sortBy } from "lodash"
 import NextLink from "next/link"
 import { useRouter } from "next/router"
 import { NextSeo } from "next-seo"
-import React from "react"
 
 import Breadcrumb from "../../components/breadcrumb"
 import Footer from "../../components/footer"
@@ -60,6 +59,7 @@ export default function ForJob(props) {
 
             <Text marginTop="0px" mb={[2, 2, 2, 0]}>
               <Text as="span">Emploi en alternance et formation en alternance en </Text>
+
               <NextLink legacyBehavior href={buildLinkForTownAndJob({ name: "France" }, currentJob)} passHref>
                 <Link
                   title={`Voir les emplois en alternance et formation en alternance en ${currentJob.name} sur l'ensemble du territoire`}
@@ -80,7 +80,6 @@ export default function ForJob(props) {
                       title={`Voir les emplois en alternance et formation en alternance en ${currentJob.name} à ${currentTown.name}`}
                       textDecoration="underline"
                       fontWeight={700}
-                      href={buildLinkForTownAndJob(currentTown, currentJob)}
                     >
                       {currentJob.name} à {currentTown.name}
                     </Link>
diff --git a/ui/pages/organisme-de-formation.tsx b/ui/pages/organisme-de-formation.tsx
index 64c2233d00..0402b4be87 100644
--- a/ui/pages/organisme-de-formation.tsx
+++ b/ui/pages/organisme-de-formation.tsx
@@ -1,6 +1,5 @@
 import { Box, Container, Text } from "@chakra-ui/react"
 import { NextSeo } from "next-seo"
-import React from "react"
 
 import OffresAutoExposees from "@/components/HomeComponents/OffresAutoExposees"
 import PromoRessources from "@/components/Ressources/promoRessources"
@@ -59,7 +58,7 @@ const Organisme = () => {
         </Container>
       </Box>
 
-      <Footer ressources="cfa" />
+      <Footer />
     </Box>
   )
 }
diff --git a/ui/tsconfig.json b/ui/tsconfig.json
index 391bcc985b..bad1fe0cc2 100644
--- a/ui/tsconfig.json
+++ b/ui/tsconfig.json
@@ -6,7 +6,7 @@
     "baseUrl": ".",
     "skipLibCheck": true,
     "strict": false,
-    // "strictNullChecks": true,
+    "strictNullChecks": false,
     // "strictBindCallApply": true,
     "forceConsistentCasingInFileNames": true,
     "noEmit": true,
diff --git a/ui/utils/buildLinkForTownAndJob.ts b/ui/utils/buildLinkForTownAndJob.ts
index cabbf5d185..5c8adbb2f1 100644
--- a/ui/utils/buildLinkForTownAndJob.ts
+++ b/ui/utils/buildLinkForTownAndJob.ts
@@ -1,6 +1,40 @@
-export const buildLinkForTownAndJob = (town, job) => {
-  const result = `/recherche-apprentissage?&display=list&displayMap=false&job_name=${encodeURIComponent(job.name)}&romes=${job.romes.join(",")}${
-    town.name !== "France" ? `&radius=30&lat=${town.lat}&lon=${town.lon}&zipcode=${town.zip}&insee=${town.insee}&address=${encodeURIComponent(town.name)}` : ""
-  }`
-  return result
+import { UrlObject } from "url"
+
+interface Town {
+  name: string
+  lat?: number
+  lon?: number
+  zip?: string
+  insee?: string
+}
+
+interface Job {
+  name: string
+  romes: string[]
+}
+
+export const buildLinkForTownAndJob = (town: Town, job: Job): UrlObject => {
+  const pathname = "/recherche-apprentissage"
+  const query: Record<string, string | boolean | string[]> = {
+    display: "list",
+    displayMap: false,
+    job_name: encodeURIComponent(job.name),
+    romes: job.romes.join(","),
+  }
+
+  if (town.name !== "France") {
+    Object.assign(query, {
+      radius: "30",
+      lat: town.lat.toString(),
+      lon: town.lon.toString(),
+      zipcode: town.zip,
+      insee: town.insee,
+      address: encodeURIComponent(town.name),
+    })
+  }
+
+  return {
+    pathname,
+    query,
+  }
 }