diff --git a/apps/infoalloggi/src/components/annuncio_card.tsx b/apps/infoalloggi/src/components/annuncio_card.tsx
index 5ebe84f..0c894d5 100644
--- a/apps/infoalloggi/src/components/annuncio_card.tsx
+++ b/apps/infoalloggi/src/components/annuncio_card.tsx
@@ -20,6 +20,7 @@ import {
 import { camereTesti, handleConsegna } from "~/lib/annuncio_details";
 import { cn, formatCurrency } from "~/lib/utils";
 import { useTranslation } from "~/providers/I18nProvider";
+import { VideoPlayer } from "./videoPlayer";
 
 type CardAnnuncioProps = {
 	id: number;
@@ -205,9 +206,11 @@ export const CardAnnuncio = ({
 export const CarouselAnnuncio = ({
 	single,
 	immagini,
+	videos,
 }: {
 	single?: boolean;
 	immagini: string[] | null;
+	videos: string[] | null;
 }) => {
 	const [openModal, setOpenModal] = useState(false);
 	const [idxModal, setIdxModal] = useState(0);
@@ -215,7 +218,6 @@ export const CarouselAnnuncio = ({
 		setIdxModal(position);
 		setOpenModal(true);
 	}
-
 	return (
 		<>
 			<div className="mx-auto my-4 w-full rounded-md text-clip">
@@ -245,11 +247,43 @@ export const CarouselAnnuncio = ({
 										width={800}
 									/>
 									<Maximize2
-										className="absolute right-2 bottom-2 size-6 rounded-md bg-white/70 stroke-2 p-1 transition-opacity duration-150 group-hover:opacity-100 sm:opacity-0"
+										className="absolute right-2 bottom-2 transition-all duration-300 hover:scale-150 origin-bottom-right ease-in-out cursor-pointer size-7 rounded-md bg-white/70 stroke-2 p-1  group-hover:opacity-100 sm:opacity-0"
 										onClick={() => handleOpenModal(idx)}
 									/>
 								</CarouselItem>
 							))}
+							{videos?.map((video, idx) => {
+								if (!video) return null;
+								if (video.includes("youtu")) {
+									return null;
+								} else {
+									return (
+										<CarouselItem
+											className={cn(
+												"group relative",
+												immagini && immagini.length === 1
+													? ""
+													: !single && "md:basis-1/2 lg:basis-1/3",
+											)}
+											key={`videoplayer-${video}`}
+										>
+											<VideoPlayer
+												className="h-72 "
+												coverImage={immagini?.[0] ? immagini[0] : ""}
+												key={`videoplayer-${idx}-${openModal}`}
+												videoSrc={video}
+											/>
+
+											<Maximize2
+												className="absolute right-2 bottom-2 transition-all duration-300 hover:scale-150 origin-bottom-right ease-in-out cursor-pointer size-7 rounded-md bg-white/70 stroke-2 p-1  group-hover:opacity-100 sm:opacity-0"
+												onClick={() =>
+													handleOpenModal(immagini?.length || 0 + idx)
+												}
+											/>
+										</CarouselItem>
+									);
+								}
+							})}
 						</CarouselContent>
 
 						<CarouselPrevious
@@ -277,13 +311,32 @@ export const CarouselAnnuncio = ({
 								<CarouselItem key={`${img}-${idx}-cD`}>
 									<Image
 										alt={`carousel-img-${idx}`}
-										className="mx-auto h-[90vh] w-full rounded-md object-contain sm:w-[80vw]"
+										className="mx-auto h-[90vh] w-full rounded-md object-contain sm:w-[80vw] "
 										height={1080}
 										src={img}
 										width={1920}
 									/>
 								</CarouselItem>
 							))}
+							{videos?.map((video) => {
+								if (!video) return null;
+								if (video.includes("youtu")) {
+									return null;
+								} else {
+									return (
+										<CarouselItem
+											className="relative flex items-center justify-center"
+											key={`carousel-videoplayer-${video}`}
+										>
+											<VideoPlayer
+												className="h-[90vh] absolute w-full mx-auto max-w-fit rounded-md object-contain"
+												coverImage={immagini?.[0] ? immagini[0] : ""}
+												videoSrc={video}
+											/>
+										</CarouselItem>
+									);
+								}
+							})}
 						</CarouselContent>
 
 						<CarouselPrevious
diff --git a/apps/infoalloggi/src/components/videoPlayer.tsx b/apps/infoalloggi/src/components/videoPlayer.tsx
index 4825e37..3e6376f 100644
--- a/apps/infoalloggi/src/components/videoPlayer.tsx
+++ b/apps/infoalloggi/src/components/videoPlayer.tsx
@@ -1,9 +1,9 @@
 "use client";
 
-import { AnimatePresence, motion } from "framer-motion";
+import { AnimatePresence, motion, useInView } from "framer-motion";
 import { Play } from "lucide-react";
 import Image from "next/image";
-import { useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { cn } from "~/lib/utils";
 
 interface VideoPlayerProps {
@@ -22,6 +22,14 @@ export function VideoPlayer({
 	className,
 }: VideoPlayerProps) {
 	const [isPlaying, setIsPlaying] = useState(false);
+	const videoRef = useRef<HTMLDivElement>(null);
+	const inView = useInView(videoRef);
+
+	useEffect(() => {
+		if (!inView) {
+			setIsPlaying(false);
+		}
+	}, [inView]);
 
 	const aspectRatioClasses = {
 		square: "aspect-square",
@@ -36,6 +44,7 @@ export function VideoPlayer({
 				aspectRatioClasses[aspectRatio],
 				className,
 			)}
+			ref={videoRef}
 		>
 			<AnimatePresence mode="wait">
 				{!isPlaying ? (
diff --git a/apps/infoalloggi/src/forms/FormEditAnnuncio.tsx b/apps/infoalloggi/src/forms/FormEditAnnuncio.tsx
index 191915b..2d7d2e9 100644
--- a/apps/infoalloggi/src/forms/FormEditAnnuncio.tsx
+++ b/apps/infoalloggi/src/forms/FormEditAnnuncio.tsx
@@ -454,18 +454,15 @@ export const AnnuncioEditForm = ({ data }: { data: Annunci }) => {
 										<CardTitle>Imagini Annuncio</CardTitle>
 									</CardHeader>
 									<CardContent>
-										{data.url_immagini && data.url_immagini.length > 0 ? (
-											<CarouselAnnuncio
-												immagini={data.url_immagini.map(
+										<CarouselAnnuncio
+											immagini={
+												data.url_immagini?.map(
 													(v) => `/go-api/images/get/${v}`,
-												)}
-												single
-											/>
-										) : (
-											<div className="text-center text-gray-500">
-												Nessuna immagine disponibile
-											</div>
-										)}
+												) || null
+											}
+											single
+											videos={data.url_video}
+										/>
 									</CardContent>
 								</Card>
 							</div>
diff --git a/apps/infoalloggi/src/pages/annuncio/[cod].tsx b/apps/infoalloggi/src/pages/annuncio/[cod].tsx
index 74c2943..931dd59 100644
--- a/apps/infoalloggi/src/pages/annuncio/[cod].tsx
+++ b/apps/infoalloggi/src/pages/annuncio/[cod].tsx
@@ -133,7 +133,10 @@ const AnnuncioView = ({ cod, flag }: Omit<AnnuncioProps, "meta">) => {
 		<AnnuncioContext.Provider value={data}>
 			<TouchProvider>
 				<div className="mx-auto w-full px-2 sm:px-8">
-					<CarouselAnnuncio immagini={data.url_immagini} />
+					<CarouselAnnuncio
+						immagini={data.url_immagini}
+						videos={data.url_video}
+					/>
 
 					<div className="flex flex-col sm:py-8 md:flex-row-reverse md:gap-2">
 						<div className="mb-6 flex flex-col md:mb-0 md:w-1/3">