diff --git a/azure-pipelines/middleware-launcher-android-ci-cd.yml b/azure-pipelines/middleware-launcher-android-ci-cd.yml
index 8402a194..f0b7e80b 100644
--- a/azure-pipelines/middleware-launcher-android-ci-cd.yml
+++ b/azure-pipelines/middleware-launcher-android-ci-cd.yml
@@ -65,7 +65,7 @@ stages:
- task: JavaToolInstaller@0
inputs:
- versionSpec: "11"
+ versionSpec: "17"
jdkArchitectureOption: "x64"
jdkSourceOption: "PreInstalled"
diff --git a/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj b/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj
index 6c222b60..16502345 100644
--- a/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj
+++ b/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj
@@ -17,7 +17,7 @@
Resources\Resource.designer.cs
Off
false
- v11.0
+ v13.0
true
11.0
diff --git a/src/fiskaltrust.AndroidLauncher.Grpc/Properties/AndroidManifest.xml b/src/fiskaltrust.AndroidLauncher.Grpc/Properties/AndroidManifest.xml
index 15c18671..08c11393 100644
--- a/src/fiskaltrust.AndroidLauncher.Grpc/Properties/AndroidManifest.xml
+++ b/src/fiskaltrust.AndroidLauncher.Grpc/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj b/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj
index cdc0b4fd..bc9508a5 100644
--- a/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj
+++ b/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj
@@ -19,7 +19,7 @@
Resource
Off
false
- v12.0
+ v13.0
Properties\AndroidManifest.xml
Resources
Assets
diff --git a/src/fiskaltrust.AndroidLauncher.Http/Properties/AndroidManifest.xml b/src/fiskaltrust.AndroidLauncher.Http/Properties/AndroidManifest.xml
index 92b1c3ff..23dc6f47 100644
--- a/src/fiskaltrust.AndroidLauncher.Http/Properties/AndroidManifest.xml
+++ b/src/fiskaltrust.AndroidLauncher.Http/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj b/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj
index 8541ef22..9fe61966 100644
--- a/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj
+++ b/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj
@@ -19,7 +19,7 @@
Resource
Off
false
- v12.0
+ v13.0
Properties\AndroidManifest.xml
Resources
Assets
diff --git a/submodules/middleware b/submodules/middleware
new file mode 160000
index 00000000..7ba05758
--- /dev/null
+++ b/submodules/middleware
@@ -0,0 +1 @@
+Subproject commit 7ba057588f9e98315f1cc5ff8bfbe0337e7e3839