diff --git a/RBLNews.Maui/IaC/build-android.ps1 b/RBLNews.Maui/IaC/build-android.ps1
new file mode 100644
index 0000000..2ecc21b
--- /dev/null
+++ b/RBLNews.Maui/IaC/build-android.ps1
@@ -0,0 +1 @@
+dotnet publish -c Release -r android-arm64 -p:PackageFormat=Apk -f net8.0-android34.0 --sc true
\ No newline at end of file
diff --git a/RBLNews.Maui/RBLNews.Maui.csproj b/RBLNews.Maui/RBLNews.Maui.csproj
index 8f322b9..e74db98 100644
--- a/RBLNews.Maui/RBLNews.Maui.csproj
+++ b/RBLNews.Maui/RBLNews.Maui.csproj
@@ -46,6 +46,10 @@
       <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.26100.0</TargetFrameworks>
     </PropertyGroup>
 
+    <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-android34.0|AnyCPU'">
+      <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
+    </PropertyGroup>
+
     <ItemGroup>
         <!-- App Icon -->
         <MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
@@ -76,4 +80,8 @@
       <ProjectReference Include="..\RBLNews.Shared\RBLNews.Shared.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="IaC\" />
+    </ItemGroup>
+
 </Project>
diff --git a/RBLNews.Shared/Components/Layout/NavMenu.razor b/RBLNews.Shared/Components/Layout/NavMenu.razor
index e348164..ac9beb0 100644
--- a/RBLNews.Shared/Components/Layout/NavMenu.razor
+++ b/RBLNews.Shared/Components/Layout/NavMenu.razor
@@ -14,7 +14,7 @@
     <div class="top-row ps-3 navbar navbar-dark">
         <div class="row">
             <div class="col-12">
-                <Icon Name="IconName.InfoCircle" class="me-2"></Icon>Letztes Update @this.FeedDataService.Feeds?.LastUpdate.ToString("dd.MM.yyyy HH:mm")
+                <Icon Name="IconName.InfoCircle" class="me-2"></Icon>Letztes Update @FeedDataService.Feeds?.LastUpdate.ToString("dd.MM.yyyy HH:mm")
             </div>
         </div>
     </div>
@@ -49,4 +49,10 @@
 @code {
     [Inject]
     private IFeedDataService FeedDataService { get; set; }
+	
+    protected override void OnInitialized()
+    {
+        FeedDataService.DataChanged= () => StateHasChanged();
+    }
+
 }
\ No newline at end of file
diff --git a/RBLNews.Shared/Components/Pages/Feeds.razor b/RBLNews.Shared/Components/Pages/Feeds.razor
index 4683b83..71b0a3e 100644
--- a/RBLNews.Shared/Components/Pages/Feeds.razor
+++ b/RBLNews.Shared/Components/Pages/Feeds.razor
@@ -55,7 +55,6 @@ else
     protected async override Task OnInitializedAsync()
     {
         await FeedDataService.LoadFeeds();
-        StateHasChanged();
     }
 
     private string GetRssSourceName(RssFeedSources source)
diff --git a/RBLNews.Shared/RBLNews.Shared.csproj b/RBLNews.Shared/RBLNews.Shared.csproj
index 02cfa9c..8111154 100644
--- a/RBLNews.Shared/RBLNews.Shared.csproj
+++ b/RBLNews.Shared/RBLNews.Shared.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
diff --git a/RBLNews.Shared/Services/FeedDataService.cs b/RBLNews.Shared/Services/FeedDataService.cs
index 8bba6ec..6a13540 100644
--- a/RBLNews.Shared/Services/FeedDataService.cs
+++ b/RBLNews.Shared/Services/FeedDataService.cs
@@ -7,6 +7,8 @@ namespace RBLNews.Shared.Services
     public interface IFeedDataService
     {
         public RssVM Feeds { get; }
+        
+        public Action DataChanged { get; set; }
 
         Task LoadFeeds();
     }
@@ -16,10 +18,13 @@ namespace RBLNews.Shared.Services
         private static readonly HttpClient httpClient = new();
 
         public RssVM Feeds { get; private set; }
+        
+        public Action DataChanged { get; set; }
 
         public async Task LoadFeeds()
         {
             Feeds = await httpClient.GetFromJsonAsync<RssVM>("https://rblnews.de/api/feeds") ?? new RssVM();
+            DataChanged.Invoke();
         }
     }
 }