diff --git a/Adaptation/FileHandlers/QS408M/ProcessData.cs b/Adaptation/FileHandlers/QS408M/ProcessData.cs
index b433145..a83c8fa 100644
--- a/Adaptation/FileHandlers/QS408M/ProcessData.cs
+++ b/Adaptation/FileHandlers/QS408M/ProcessData.cs
@@ -295,15 +295,15 @@ public partial class ProcessData : IProcessData
         string employee = txt.Header.Operator;
         DateTime dateTime = GetDateTime(logistics, tickOffset, txt.Header.DateTime);
         // Remove illegal characters \/:*?"<>| found in the Batch
-        string batch = Regex.Replace(txt.Header.Batch, @"[\\,\/,\:,\*,\?,\"",\<,\>,\|]", "_").Split('\r')[0].Split('\n')[0];
-        bool isWaferSlot = !string.IsNullOrEmpty(txt.Header.Wafer) && txt.Header.Wafer.Length is 1 or 2 && int.TryParse(txt.Header.Wafer, out slot);
+        bool isWaferSlot = !string.IsNullOrEmpty(txt.Header.Wafer) && txt.Header.Wafer.Length is 1 or 2 && int.TryParse(txt.Header.Wafer, out slot) && slot < 27;
+        string batch = !isWaferSlot ? logistics.JobID : Regex.Replace(txt.Header.Batch, @"[\\,\/,\:,\*,\?,\"",\<,\>,\|]", "_").Split('\r')[0].Split('\n')[0];
         Descriptor descriptor = isWaferSlot ? GetDescriptor(txt.Header.Batch) : GetDescriptor(txt.Header.Wafer);
         psn = descriptor.PSN;
         rds = descriptor.RDS;
         zone = descriptor.Zone;
-        wafer = descriptor.Wafer;
         layer = descriptor.Layer;
         reactor = descriptor.Reactor;
+        wafer = isWaferSlot ? slot.ToString("00") : descriptor.Wafer;
         if (string.IsNullOrEmpty(employee))
             employee = descriptor.Employee;
         foreach (char c in txt.Header.Title)
@@ -318,13 +318,13 @@ public partial class ProcessData : IProcessData
         }
         if (string.IsNullOrEmpty(lastProcessData.Wafer))
         {
-            lastProcessData.Batch = JobID;
-            lastProcessData.Cassette = JobID;
-            lastProcessData.Employee = JobID;
-            lastProcessData.Recipe = JobID;
-            lastProcessData.Title = JobID;
+            lastProcessData.Batch = logistics.JobID;
+            lastProcessData.Cassette = logistics.JobID;
+            lastProcessData.Employee = logistics.JobID;
+            lastProcessData.Recipe = logistics.JobID;
+            lastProcessData.Title = logistics.JobID;
         }
-        lastProcessData.Wafer = wafer;
+        lastProcessData.Wafer = waferFixed.ToString();
         lastProcessData.Reactor = reactor;
         lastProcessData.RDS = rds;
         string check = "--------";
diff --git a/Adaptation/MET08THFTIRQS408M-Development.yml b/Adaptation/MET08THFTIRQS408M-Development.yml
index 89b4f2a..7888fdc 100644
--- a/Adaptation/MET08THFTIRQS408M-Development.yml
+++ b/Adaptation/MET08THFTIRQS408M-Development.yml
@@ -26,7 +26,7 @@ steps:
     displayName: Configuration
 
   - script: |
-      set nugetSource=https://messa017.infineon.com/v3/index.json
+      set nugetSource=https://eaf-dev-reporting.mes.infineon.com/v3/index.json
       echo %nugetSource%
       echo ##vso[task.setvariable variable=NugetSource;]%nugetSource%
       echo $(NugetSource)
diff --git a/MET08THFTIRQS408M.csproj b/MET08THFTIRQS408M.csproj
index d4d9df8..0914b7d 100644
--- a/MET08THFTIRQS408M.csproj
+++ b/MET08THFTIRQS408M.csproj
@@ -167,7 +167,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Infineon.EAF.Runtime">
-      <Version>2.49.0</Version>
+      <Version>2.49.2</Version>
     </PackageReference>
     <PackageReference Include="System.Text.Json">
       <Version>6.0.3</Version>
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index ef3613a..5f3aa49 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.49.0.0")]
-[assembly: AssemblyFileVersion("2.49.0.0")]
+[assembly: AssemblyVersion("2.49.2.0")]
+[assembly: AssemblyFileVersion("2.49.2.0")]