diff --git a/src/assets/content-creator-screenshot.png b/src/assets/use-cases/content-creator.png
similarity index 100%
rename from src/assets/content-creator-screenshot.png
rename to src/assets/use-cases/content-creator.png
diff --git a/src/assets/use-cases/elizaos.png b/src/assets/use-cases/elizaos.png
new file mode 100644
index 00000000..fb68db58
Binary files /dev/null and b/src/assets/use-cases/elizaos.png differ
diff --git a/src/assets/use-cases/oracle-factory.png b/src/assets/use-cases/oracle-factory.png
new file mode 100644
index 00000000..aae01662
Binary files /dev/null and b/src/assets/use-cases/oracle-factory.png differ
diff --git a/src/assets/web3messaging-screenshot.png b/src/assets/use-cases/web3-messaging.png
similarity index 100%
rename from src/assets/web3messaging-screenshot.png
rename to src/assets/use-cases/web3-messaging.png
diff --git a/src/components/ActionButton.vue b/src/components/ActionButton.vue
deleted file mode 100644
index 02c7f1bf..00000000
--- a/src/components/ActionButton.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<template>
-  <component
-    :is="component"
-    :href="href"
-    :target="target"
-    :rel="rel"
-    :disabled="disabled"
-    :class="buttonClasses"
-  >
-    <Icon :icon="icon" :height="16" />
-    {{ label }}
-  </component>
-</template>
-
-<script setup lang="ts">
-import { Icon } from '@iconify/vue';
-import { computed } from 'vue';
-
-interface Props {
-  variant: 'primary' | 'disabled';
-  label: string;
-  icon: string;
-  href?: string;
-  target?: string;
-  rel?: string;
-  disabled?: boolean;
-}
-
-const props = defineProps<Props>();
-
-const component = computed(() => {
-  return props.href ? 'a' : 'button';
-});
-
-const buttonClasses = computed(() => {
-  const baseClasses =
-    'inline-flex items-center justify-center gap-2 px-5 py-2.5 rounded-md text-sm font-medium w-full transition-all duration-200';
-
-  if (props.variant === 'primary') {
-    return `${baseClasses} bg-blue-600 hover:bg-blue-700 text-white hover:-translate-y-0.5`;
-  } else {
-    return `${baseClasses} bg-gray-50 text-gray-400 border border-gray-200 cursor-not-allowed`;
-  }
-});
-</script>
diff --git a/src/components/ProjectCard.vue b/src/components/ProjectCard.vue
index 8cd2a4ba..3cd9cc2f 100644
--- a/src/components/ProjectCard.vue
+++ b/src/components/ProjectCard.vue
@@ -81,7 +81,6 @@ interface Props {
   icon: string;
   status: 'available' | 'coming-soon' | 'interactive';
   statusLabel: string;
-  buttonVariant: 'primary' | 'disabled';
   buttonLabel: string;
   buttonIcon: string;
   buttonHref?: string;
@@ -92,7 +91,7 @@ interface Props {
   githubLabel?: string;
 }
 
-const props = withDefaults(defineProps<Props>(), {});
+const props = defineProps<Props>();
 
 const statusIcon = computed(() => {
   switch (props.status) {
diff --git a/src/components/UseCaseCard.vue b/src/components/UseCaseCard.vue
index de15bba6..a22a1ffe 100644
--- a/src/components/UseCaseCard.vue
+++ b/src/components/UseCaseCard.vue
@@ -29,12 +29,19 @@
       </div>
 
       <!-- Actions -->
-      <div class="flex flex-wrap gap-4">
-        <Button as="a" :href="demoUrl" target="_blank" rel="noreferrer">
+      <div v-if="githubUrl || demoUrl" class="flex flex-wrap gap-4">
+        <Button
+          v-if="demoUrl"
+          as="a"
+          :href="demoUrl"
+          target="_blank"
+          rel="noreferrer"
+        >
           <Icon :icon="demoIcon" height="18" />
           Try Live Demo
         </Button>
         <Button
+          v-if="githubUrl"
           as="a"
           :href="githubUrl"
           target="_blank"
@@ -60,8 +67,8 @@ interface Props {
   imageUrl: string;
   imageAlt: string;
   features: string[];
-  demoUrl: string;
-  githubUrl: string;
+  demoUrl?: string;
+  githubUrl?: string;
   demoIcon: string;
 }
 
diff --git a/src/components/ui/Button.vue b/src/components/ui/Button.vue
index e696bafd..25e2d1ab 100644
--- a/src/components/ui/Button.vue
+++ b/src/components/ui/Button.vue
@@ -1,7 +1,7 @@
 <template>
   <component
-    :is="as || 'button'"
-    :type="as === 'button' || !as ? 'button' : undefined"
+    :is="as"
+    :type="as === 'button' ? 'button' : undefined"
     :class="buttonClasses"
     v-bind="$attrs"
   >
diff --git a/src/overview/tooling-and-explorers/blockchain-explorer.md b/src/overview/tooling-and-explorers/blockchain-explorer.md
index fad73033..8d14b9ec 100644
--- a/src/overview/tooling-and-explorers/blockchain-explorer.md
+++ b/src/overview/tooling-and-explorers/blockchain-explorer.md
@@ -69,8 +69,8 @@ publicly auditable.
 
 ::: tip 💡 Dev Tip
 
-Use **Bellecour** for development and testing as it's a
-gasless blockchain, then deploy to **Arbitrum** for production workloads.
+Use **Bellecour** for development and testing as it's a gasless blockchain, then
+deploy to **Arbitrum** for production workloads.
 
 :::
 
diff --git a/src/overview/use-case-demo/content-creator.md b/src/overview/use-case-demo/content-creator.md
deleted file mode 100644
index c1262f83..00000000
--- a/src/overview/use-case-demo/content-creator.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-description:
-  Explore the Content Creator demo app showcasing iExec’s DataProtector Sharing
-  module. Try the live demo and browse the GitHub repository to see
-  privacy-first data sharing in action.
----
-
-<script setup>
-import { Icon } from '@iconify/vue';
-</script>
-
-# Content Creator
-
-<a href="https://demo.iex.ec/content-creator/" target="_blank" rel="noreferrer" style="display: inline-block; margin-top: 20px">
-  <img src="/assets/content-creator-screenshot.png" alt="Content Creator screenshot">
-</a>
-
-This is a fairly complete app that aims to demonstrate some of the features from
-**DataProtector Sharing** module.
-
-**Try the demo:**
-
-<a href="https://demo.iex.ec/content-creator/" target="_blank" rel="noreferrer" class="link-as-block">
-  <Icon icon="mdi:art" height="25" style="margin-right: -1px" /> Content Creator Demo
-</a>
-
-**GitHub repository:**
-
-<a href="https://github.com/iExecBlockchainComputing/content-creator-usecase-demo" target="_blank" rel="noreferrer" class="link-as-block">
-  <Icon icon="mdi:github" height="24" /> DataProtector use case demo
-</a>
diff --git a/src/overview/use-case-demo/web3messaging.md b/src/overview/use-case-demo/web3messaging.md
deleted file mode 100644
index 6fce0c41..00000000
--- a/src/overview/use-case-demo/web3messaging.md
+++ /dev/null
@@ -1,63 +0,0 @@
----
-description:
-  Explore Web3Messaging by iExec—enable private, consent-based communication in
-  Web3. Discover tools like Web3Mail and Web3Telegram that protect user data,
-  support targeted messaging, and let users monetize interactions. Live demo and
-  full GitHub code available.
----
-
-<script setup>
-import { Icon } from '@iconify/vue';
-</script>
-
-# Web3Messaging
-
-<a href="https://demo.iex.ec/web3messaging/" target="_blank" rel="noreferrer" style="display: inline-block; margin-top: 20px">
-  <img src="/assets/web3messaging-screenshot.png" alt="Web3Messaging screenshot">
-</a>
-
-In the Web3 ecosystem, blockchain wallets serve as digital identities, creating
-significant privacy risks due to public ledgers containing transaction histories
-and assets.
-
-Web3Messaging, a core iExec use case, enables secure communication between Web3
-users and decentralized applications (dApps) while preserving privacy and
-requiring explicit user consent. It supports targeted messaging without exposing
-personal data, and empowers users to monetize their engagement with received
-communications.
-
-## Key Components:
-
-- **User Consent Management**: Users explicitly authorize sharing their data
-  with third parties
-- **Secure Data Sharing**: Confidential computing enables protected data
-  exchange
-- **Privacy-Preserving Channels**: Third parties can contact users without
-  accessing personal data.
-- **Targeted Communication**: Reach relevant users without revealing their
-  identities.
-- **User Monetization**: Users can earn rewards for engaging with communications
-
-## Available Solutions
-
-**Web3Mail**: Privacy-preserving email communications for Web3 users
-
-**Web3Telegram**: A new solution extending private messaging to Telegram, while
-protecting the user's chat ID.
-
-**Try the demo:**
-
-View our live Web3Messaging demo by connecting your Ethereum wallet.
-
-<a href="https://demo.iex.ec/web3messaging" target="_blank" rel="noreferrer" class="link-as-block">
-  <Icon icon="mdi:art" height="25" style="margin-right: -1px" /> Web3Messaging Demo
-</a>
-
-**GitHub repository:**
-
-Access our full codebase, documentation, and integration guidelines. Run the
-demo locally or within Docker using our instructions.
-
-<a href="https://github.com/iExecBlockchainComputing/web3-messaging-usecase-demo" target="_blank" rel="noreferrer" class="link-as-block">
-  <Icon icon="mdi:github" height="24" /> Web3Messaging use case demo
-</a>
diff --git a/src/overview/use-cases.md b/src/overview/use-cases.md
index 44776ef2..ec905f91 100644
--- a/src/overview/use-cases.md
+++ b/src/overview/use-cases.md
@@ -8,7 +8,7 @@ computing and decentralized data protection.
   <UseCaseCard
     title="Content Creator"
     description="A comprehensive demo showcasing iExec's DataProtector Sharing module. Experience privacy-first data sharing where content creators can securely share their work while maintaining full control over access permissions and monetization."
-    imageUrl="/assets/content-creator-screenshot.png"
+    imageUrl="/assets/use-cases/content-creator.png"
     imageAlt="Content Creator Demo Screenshot"
     :features="['DataProtector Core', 'DataProtector Sharing']"
     demoUrl="https://demo.iex.ec/content-creator/"
@@ -17,16 +17,36 @@ computing and decentralized data protection.
   />
 
 <UseCaseCard
-    title="Web3Messaging"
+    title="Web3 Messaging"
     description="Secure communication platform for Web3 users enabling privacy-preserving messaging through Web3Mail and Web3Telegram. Users maintain control over their data while enabling targeted communication and monetizing their engagement."
-    imageUrl="/assets/web3messaging-screenshot.png"
+    imageUrl="/assets/use-cases/web3-messaging.png"
     imageAlt="Web3Messaging Demo Screenshot"
-    :features="['Web3Mail', 'Web3Telegram', 'DataProtector Core']"
+    :features="['DataProtector Core', 'Web3Mail', 'Web3Telegram']"
     demoUrl="https://demo.iex.ec/web3messaging"
     githubUrl="https://github.com/iExecBlockchainComputing/web3-messaging-usecase-demo"
     demoIcon="mdi:message-processing"
   />
 
+<UseCaseCard
+    title="Oracle Factory"
+    description="Decentralized oracle platform providing secure and verifiable data feeds for smart contracts. Data are fetched through iApps that run on a decentralized confidential computing layer, ensuring privacy-preserving computation and access to verified external data sources for your DeFi and Web3 applications."
+    imageUrl="/assets/use-cases/oracle-factory.png"
+    imageAlt="OracleFactory Demo Screenshot"
+    :features="['Oracle Factory']"
+    demoUrl="https://oracle-factory.iex.ec/gallery"
+    demoIcon="mdi:database-search"
+  />
+
+<UseCaseCard
+    title="AI Agent"
+    description="Showcase of artificial intelligence applications running on iExec's confidential computing infrastructure. Experience privacy-preserving AI inference, machine learning model execution, and secure data analysis with TEE protection."
+    imageUrl="/assets/use-cases/elizaos.png"
+    imageAlt="AI Applications Demo Screenshot"
+    :features="['AI', 'TEE', 'Confidential Computing']"
+    githubUrl="https://github.com/iExecBlockchainComputing/iexec-elizaos-agent"
+    demoIcon="mdi:brain"
+  />
+
 </div>
 
 <script setup>