diff --git a/packaging/container/Agent.Fastlane.Containerfile b/packaging/container/Agent.Fastlane.Containerfile
index 32b8502..dd628d1 100644
--- a/packaging/container/Agent.Fastlane.Containerfile
+++ b/packaging/container/Agent.Fastlane.Containerfile
@@ -7,11 +7,14 @@ RUN dotnet restore agent/src/Monitor.Agent -r linux-x64 --artifacts-path /artifa
 
 COPY source/backend/ ./
 RUN dotnet publish agent/src/Monitor.Agent -m:3 -c Release -r linux-x64 \
-    --self-contained true --no-restore -p:PublishAot=true -p:StripSymbols=true \
+    --self-contained true --no-restore -p:PublishAot=true -p:UseAotAnywhere=false \
+    -p:UseAppHost=true -p:StripSymbols=true \
     -p:DebugType=none -p:DebugSymbols=false --artifacts-path /artifacts -o /out/agent \
     && dotnet publish fleet/tools/fleet-enroll -m:3 -c Release -r linux-x64 \
-    --self-contained true --no-restore -p:PublishAot=true -p:StripSymbols=true \
+    --self-contained true --no-restore -p:PublishAot=true -p:UseAotAnywhere=false \
+    -p:UseAppHost=true -p:StripSymbols=true \
     -p:DebugType=none -p:DebugSymbols=false --artifacts-path /artifacts -o /out/enroll
+RUN test -x /out/agent/monitor-agent && test -x /out/enroll/fleet-enroll
 
 FROM mcr.microsoft.com/dotnet/runtime-deps:10.0-noble-chiseled-extra
 
diff --git a/packaging/container/Probe.Fastlane.Containerfile b/packaging/container/Probe.Fastlane.Containerfile
index 71df8bd..fccb043 100644
--- a/packaging/container/Probe.Fastlane.Containerfile
+++ b/packaging/container/Probe.Fastlane.Containerfile
@@ -6,8 +6,10 @@ RUN dotnet restore probe/src/Monitor.Probe -r linux-x64 --artifacts-path /artifa
 
 COPY source/backend/ ./
 RUN dotnet publish probe/src/Monitor.Probe -m:3 -c Release -r linux-x64 \
-    --self-contained true --no-restore -p:PublishAot=true -p:StripSymbols=true \
+    --self-contained true --no-restore -p:PublishAot=true -p:UseAotAnywhere=false \
+    -p:UseAppHost=true -p:StripSymbols=true \
     -p:DebugType=none -p:DebugSymbols=false --artifacts-path /artifacts -o /out/probe
+RUN test -x /out/probe/monitor-probe
 
 FROM mcr.microsoft.com/dotnet/runtime-deps:10.0-noble-chiseled-extra