diff --git a/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj b/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj
index 297309b76..4ccdc81cb 100644
--- a/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj
+++ b/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj
@@ -174,7 +174,7 @@
       <Version>1.2.1</Version>
     </PackageReference>
     <PackageReference Include="Chino.Android">
-      <Version>1.0.0-rc05</Version>
+      <Version>1.0.0-rc06</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/Covid19Radar/Covid19Radar.iOS/AppDelegate.cs b/Covid19Radar/Covid19Radar.iOS/AppDelegate.cs
index d6181b830..f15703cdd 100644
--- a/Covid19Radar/Covid19Radar.iOS/AppDelegate.cs
+++ b/Covid19Radar/Covid19Radar.iOS/AppDelegate.cs
@@ -205,6 +205,11 @@ private void RegisterPlatformTypes(IContainer container)
             container.Register<IExternalNavigationService, ExternalNavigationService>(Reuse.Singleton);
         }
 
+        public void DiagnosisKeysDataMappingApplied()
+        {
+            _exposureDetectionService.Value.DiagnosisKeysDataMappingApplied();
+        }
+
         public void PreExposureDetected()
         {
             var exposureConfiguration = GetEnClient().ExposureConfiguration;
diff --git a/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj b/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj
index 91daf0b1d..6b3f1fa7f 100644
--- a/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj
+++ b/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj
@@ -402,7 +402,7 @@
       <Version>2.0.6</Version>
     </PackageReference>
     <PackageReference Include="Chino.iOS">
-      <Version>1.0.0-rc05</Version>
+      <Version>1.0.0-rc06</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/Covid19Radar/Covid19Radar/Covid19Radar.csproj b/Covid19Radar/Covid19Radar/Covid19Radar.csproj
index 9b58f5179..9746ae2fe 100644
--- a/Covid19Radar/Covid19Radar/Covid19Radar.csproj
+++ b/Covid19Radar/Covid19Radar/Covid19Radar.csproj
@@ -67,7 +67,7 @@
     <PackageReference Include="Xamarin.Forms.Visual.Material" Version="4.6.0.967" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.6.0" />
     <PackageReference Include="CommonServiceLocator" Version="2.0.6" />
-    <PackageReference Include="Chino.Common" Version="1.0.0-rc05" />
+    <PackageReference Include="Chino.Common" Version="1.0.0-rc06" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Controls\CustomDatePicker.cs" />
diff --git a/Covid19Radar/Covid19Radar/Services/ExposureDetectionService.cs b/Covid19Radar/Covid19Radar/Services/ExposureDetectionService.cs
index ffe3a8355..0af8e5125 100644
--- a/Covid19Radar/Covid19Radar/Services/ExposureDetectionService.cs
+++ b/Covid19Radar/Covid19Radar/Services/ExposureDetectionService.cs
@@ -15,6 +15,8 @@ namespace Covid19Radar.Services
 {
     public interface IExposureDetectionService
     {
+        public void DiagnosisKeysDataMappingApplied();
+
         public void PreExposureDetected(ExposureConfiguration exposureConfiguration, string enVersion);
 
         public void ExposureDetected(ExposureConfiguration exposureConfiguration, string enVersion, IList<DailySummary> dailySummaries, IList<ExposureWindow> exposureWindows);
@@ -53,6 +55,19 @@ IExposureDataCollectServer exposureDataCollectServer
             _exposureDataCollectServer = exposureDataCollectServer;
         }
 
+        public void DiagnosisKeysDataMappingApplied()
+        {
+            _loggerService.StartMethod();
+
+            if (_exposureConfigurationRepository.IsDiagnosisKeysDataMappingConfigurationUpdated())
+            {
+                _exposureConfigurationRepository.SetDiagnosisKeysDataMappingAppliedDateTime(DateTime.UtcNow);
+                _exposureConfigurationRepository.SetDiagnosisKeysDataMappingConfigurationUpdated(false);
+            }
+
+            _loggerService.EndMethod();
+        }
+
         public void PreExposureDetected(ExposureConfiguration exposureConfiguration, string enVersion)
         {
             _loggerService.Debug("PreExposureDetected");
@@ -64,12 +79,6 @@ public void ExposureDetected(ExposureConfiguration exposureConfiguration, string
 
             _ = Task.Run(async () =>
             {
-                if (_exposureConfigurationRepository.IsDiagnosisKeysDataMappingConfigurationUpdated())
-                {
-                    _exposureConfigurationRepository.SetDiagnosisKeysDataMappingAppliedDateTime(DateTime.UtcNow);
-                    _exposureConfigurationRepository.SetDiagnosisKeysDataMappingConfigurationUpdated(false);
-                }
-
                 await _userDataRepository.SetExposureDataAsync(
                     dailySummaries.ToList(),
                     exposureWindows.ToList()
@@ -106,12 +115,6 @@ public void ExposureDetected(ExposureConfiguration exposureConfiguration, string
 
             _ = Task.Run(async() =>
             {
-                if (_exposureConfigurationRepository.IsDiagnosisKeysDataMappingConfigurationUpdated())
-                {
-                    _exposureConfigurationRepository.SetDiagnosisKeysDataMappingAppliedDateTime(DateTime.UtcNow);
-                    _exposureConfigurationRepository.SetDiagnosisKeysDataMappingConfigurationUpdated(false);
-                }
-
                 bool isNewExposureDetected = _userDataRepository.AppendExposureData(
                     exposureSummary,
                     exposureInformations.ToList(),
@@ -142,12 +145,6 @@ public void ExposureNotDetected(ExposureConfiguration exposureConfiguration, str
 
             _ = Task.Run(async () =>
             {
-                if (_exposureConfigurationRepository.IsDiagnosisKeysDataMappingConfigurationUpdated())
-                {
-                    _exposureConfigurationRepository.SetDiagnosisKeysDataMappingAppliedDateTime(DateTime.UtcNow);
-                    _exposureConfigurationRepository.SetDiagnosisKeysDataMappingConfigurationUpdated(false);
-                }
-
                 await _exposureDataCollectServer.UploadExposureDataAsync(
                     exposureConfiguration,
                     DeviceInfo.Model,
diff --git a/TempNugetFeed/Chino.Android.1.0.0-rc05.nupkg b/TempNugetFeed/Chino.Android.1.0.0-rc05.nupkg
deleted file mode 100755
index d4e775399..000000000
Binary files a/TempNugetFeed/Chino.Android.1.0.0-rc05.nupkg and /dev/null differ
diff --git a/TempNugetFeed/Chino.Android.1.0.0-rc06.nupkg b/TempNugetFeed/Chino.Android.1.0.0-rc06.nupkg
new file mode 100644
index 000000000..959035587
Binary files /dev/null and b/TempNugetFeed/Chino.Android.1.0.0-rc06.nupkg differ
diff --git a/TempNugetFeed/Chino.Common.1.0.0-rc05.nupkg b/TempNugetFeed/Chino.Common.1.0.0-rc05.nupkg
deleted file mode 100755
index 2e843ef62..000000000
Binary files a/TempNugetFeed/Chino.Common.1.0.0-rc05.nupkg and /dev/null differ
diff --git a/TempNugetFeed/Chino.Common.1.0.0-rc06.nupkg b/TempNugetFeed/Chino.Common.1.0.0-rc06.nupkg
new file mode 100644
index 000000000..798f8eceb
Binary files /dev/null and b/TempNugetFeed/Chino.Common.1.0.0-rc06.nupkg differ
diff --git a/TempNugetFeed/Chino.iOS.1.0.0-rc05.nupkg b/TempNugetFeed/Chino.iOS.1.0.0-rc05.nupkg
deleted file mode 100755
index 8d6d57c4b..000000000
Binary files a/TempNugetFeed/Chino.iOS.1.0.0-rc05.nupkg and /dev/null differ
diff --git a/TempNugetFeed/Chino.iOS.1.0.0-rc06.nupkg b/TempNugetFeed/Chino.iOS.1.0.0-rc06.nupkg
new file mode 100644
index 000000000..51ffeb872
Binary files /dev/null and b/TempNugetFeed/Chino.iOS.1.0.0-rc06.nupkg differ