diff --git a/Data_Coupler/Data_Coupler.csproj b/Data_Coupler/Data_Coupler.csproj
index ae2c9f2..afd4219 100644
--- a/Data_Coupler/Data_Coupler.csproj
+++ b/Data_Coupler/Data_Coupler.csproj
@@ -43,7 +43,9 @@
   </ItemGroup>
 
   <!-- Target per generare automaticamente version.json prima del build -->
-  <Target Name="GenerateVersionJson" BeforeTargets="BeforeBuild;BeforeRebuild">
+  <!-- SOLO per sviluppo locale, NON in CI/CD (il workflow lo genera prima del Docker build) -->
+  <Target Name="GenerateVersionJson" BeforeTargets="BeforeBuild;BeforeRebuild" 
+          Condition="'$(ContinuousIntegrationBuild)' != 'true' AND '$(SkipVersionGeneration)' != 'true'">
     <!-- Esegui git per ottenere il tag più recente e informazioni commit -->
     <Exec Command="git describe --tags --abbrev=0 2>nul" ConsoleToMSBuild="true" IgnoreExitCode="true">
       <Output TaskParameter="ConsoleOutput" PropertyName="GitLatestTag" />
@@ -82,7 +84,7 @@
     <!-- Scrivi il file version.json -->
     <WriteLinesToFile File="wwwroot\version.json" Lines="$(FinalVersionJsonContent)" Overwrite="true" />
     
-    <Message Text="Generated version.json with version $(ActualVersion) from git tag" Importance="high" />
+    <Message Text="Generated version.json with version $(ActualVersion) from git tag (local dev build)" Importance="high" />
   </Target>
 
 </Project>
diff --git a/Dockerfile b/Dockerfile
index 0ec7f35..6534981 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,14 +20,15 @@ COPY . .
 
 # Build del progetto principale
 WORKDIR "/src/Data_Coupler"
-RUN dotnet build "Data_Coupler.csproj" -c Release -o /app/build
+RUN dotnet build "Data_Coupler.csproj" -c Release -o /app/build /p:ContinuousIntegrationBuild=true
 
 # Stage 2: Publish
 FROM build AS publish
 RUN dotnet publish "Data_Coupler.csproj" -c Release -o /app/publish \
     /p:SelfContained=false \
     /p:PublishTrimmed=false \
-    /p:PublishSingleFile=false
+    /p:PublishSingleFile=false \
+    /p:ContinuousIntegrationBuild=true
 
 # Stage 3: Runtime
 FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS final