diff --git a/mappings_old/metrics/citizens_next_year_age.ktr b/mappings_old/metrics/citizens_next_year_age.ktr
index 6f0f42c..8bb599c 100644
--- a/mappings_old/metrics/citizens_next_year_age.ktr
+++ b/mappings_old/metrics/citizens_next_year_age.ktr
@@ -436,22 +436,18 @@
   <notepads>
   </notepads>
   <connection>
-    <name>business_metrics_connection</name>
-    <server>10.10.31.119</server>
+    <name>ervu-person-registry</name>
+    <server>person-dbhost</server>
     <type>POSTGRESQL</type>
     <access>Native</access>
-    <database>ervu_business_metrics</database>
-    <port>5432</port>
-    <username>ervu_business_metrics</username>
-    <password>Encrypted 657276755ddceddca104c281979414ab64cc9bacc9</password>
+    <database>person-dbname</database>
+    <port>4444</port>
+    <username>person-dbuser</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb79ce10db80b9cf</password>
     <servername/>
     <data_tablespace/>
     <index_tablespace/>
     <attributes>
-      <attribute>
-        <code>EXTRA_OPTION_POSTGRESQL.stringtype</code>
-        <attribute>unspecified</attribute>
-      </attribute>
       <attribute>
         <code>FORCE_IDENTIFIERS_TO_LOWERCASE</code>
         <attribute>N</attribute>
@@ -466,7 +462,7 @@
       </attribute>
       <attribute>
         <code>PORT_NUMBER</code>
-        <attribute>5432</attribute>
+        <attribute>4444</attribute>
       </attribute>
       <attribute>
         <code>PRESERVE_RESERVED_WORD_CASE</code>
@@ -491,18 +487,22 @@
     </attributes>
   </connection>
   <connection>
-    <name>prerson_registry</name>
-    <server>10.10.31.118</server>
+    <name>metrics</name>
+    <server>metrics-dbhost</server>
     <type>POSTGRESQL</type>
     <access>Native</access>
-    <database>ervu-person-registry</database>
-    <port>5432</port>
-    <username>postgres</username>
-    <password>Encrypted 2be98afc86aa7f2e4b11ba562feabf7eb</password>
+    <database>metrics-dbname</database>
+    <port>7777</port>
+    <username>metrics-dbuser</username>
+    <password>Encrypted 657276755ddceddca104c281979414ab64cc9bacc9</password>
     <servername/>
     <data_tablespace/>
     <index_tablespace/>
     <attributes>
+      <attribute>
+        <code>EXTRA_OPTION_POSTGRESQL.stringtype</code>
+        <attribute>unspecified</attribute>
+      </attribute>
       <attribute>
         <code>FORCE_IDENTIFIERS_TO_LOWERCASE</code>
         <attribute>N</attribute>
@@ -517,7 +517,7 @@
       </attribute>
       <attribute>
         <code>PORT_NUMBER</code>
-        <attribute>5432</attribute>
+        <attribute>7777</attribute>
       </attribute>
       <attribute>
         <code>PRESERVE_RESERVED_WORD_CASE</code>
@@ -559,7 +559,7 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>prerson_registry</connection>
+    <connection>ervu-person-registry</connection>
     <sql>WITH
 main_data AS (
 	SELECT
@@ -637,7 +637,7 @@ GROUP BY info_age, info_source</sql>
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>business_metrics_connection</connection>
+    <connection>metrics</connection>
     <schema>init_registration_info</schema>
     <table>citizens_next_year_age</table>
     <commit>1000</commit>
diff --git a/mappings_old/metrics/convert_info_records_from_easu.ktr b/mappings_old/metrics/convert_info_records_from_easu.ktr
index 0e71056..1d929e1 100644
--- a/mappings_old/metrics/convert_info_records_from_easu.ktr
+++ b/mappings_old/metrics/convert_info_records_from_easu.ktr
@@ -435,6 +435,57 @@
   </info>
   <notepads>
   </notepads>
+  <connection>
+    <name>ervu-person-registry</name>
+    <server>person-dbhost</server>
+    <type>POSTGRESQL</type>
+    <access>Native</access>
+    <database>person-dbname</database>
+    <port>4444</port>
+    <username>person-dbuser</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb79ce10db80b9cf</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute>
+        <code>FORCE_IDENTIFIERS_TO_LOWERCASE</code>
+        <attribute>N</attribute>
+      </attribute>
+      <attribute>
+        <code>FORCE_IDENTIFIERS_TO_UPPERCASE</code>
+        <attribute>N</attribute>
+      </attribute>
+      <attribute>
+        <code>IS_CLUSTERED</code>
+        <attribute>N</attribute>
+      </attribute>
+      <attribute>
+        <code>PORT_NUMBER</code>
+        <attribute>4444</attribute>
+      </attribute>
+      <attribute>
+        <code>PRESERVE_RESERVED_WORD_CASE</code>
+        <attribute>Y</attribute>
+      </attribute>
+      <attribute>
+        <code>QUOTE_ALL_FIELDS</code>
+        <attribute>N</attribute>
+      </attribute>
+      <attribute>
+        <code>SUPPORTS_BOOLEAN_DATA_TYPE</code>
+        <attribute>Y</attribute>
+      </attribute>
+      <attribute>
+        <code>SUPPORTS_TIMESTAMP_DATA_TYPE</code>
+        <attribute>Y</attribute>
+      </attribute>
+      <attribute>
+        <code>USE_POOLING</code>
+        <attribute>N</attribute>
+      </attribute>
+    </attributes>
+  </connection>
   <connection>
     <name>metrics</name>
     <server>metrics-dbhost</server>
@@ -466,58 +517,7 @@
       </attribute>
       <attribute>
         <code>PORT_NUMBER</code>
-        <attribute>5432</attribute>
-      </attribute>
-      <attribute>
-        <code>PRESERVE_RESERVED_WORD_CASE</code>
-        <attribute>Y</attribute>
-      </attribute>
-      <attribute>
-        <code>QUOTE_ALL_FIELDS</code>
-        <attribute>N</attribute>
-      </attribute>
-      <attribute>
-        <code>SUPPORTS_BOOLEAN_DATA_TYPE</code>
-        <attribute>Y</attribute>
-      </attribute>
-      <attribute>
-        <code>SUPPORTS_TIMESTAMP_DATA_TYPE</code>
-        <attribute>Y</attribute>
-      </attribute>
-      <attribute>
-        <code>USE_POOLING</code>
-        <attribute>N</attribute>
-      </attribute>
-    </attributes>
-  </connection>
-  <connection>
-    <name>ervu-person-registry</name>
-    <server>person-dbhost</server>
-    <type>POSTGRESQL</type>
-    <access>Native</access>
-    <database>person-dbname</database>
-    <port>4444</port>
-    <username>person-dbuser</username>
-    <password>Encrypted 2be98afc86aa7f2e4cb79ce10db80b9cf</password>
-    <servername/>
-    <data_tablespace/>
-    <index_tablespace/>
-    <attributes>
-      <attribute>
-        <code>FORCE_IDENTIFIERS_TO_LOWERCASE</code>
-        <attribute>N</attribute>
-      </attribute>
-      <attribute>
-        <code>FORCE_IDENTIFIERS_TO_UPPERCASE</code>
-        <attribute>N</attribute>
-      </attribute>
-      <attribute>
-        <code>IS_CLUSTERED</code>
-        <attribute>N</attribute>
-      </attribute>
-      <attribute>
-        <code>PORT_NUMBER</code>
-        <attribute>5432</attribute>
+        <attribute>7777</attribute>
       </attribute>
       <attribute>
         <code>PRESERVE_RESERVED_WORD_CASE</code>
@@ -563,7 +563,6 @@
     <sql>SELECT 
     TO_CHAR(NOW() - INTERVAL '1 day', 'YYYY-MM-DD') AS info_date,
     '300cee57-2ce7-4b82-847b-bfbe14d6c7ea' AS recruitment_id,
-    coalesce(COUNT(hist.id) filter(WHERE res.code in('created','duplicate_updated')), 0) as count_all,
     coalesce(COUNT(hist.id) filter(WHERE res.code in('created')), 0) as count_unique,
     coalesce(COUNT(hist.id) filter(WHERE res.code in( 'flk_error', 'duplicate_ignored', 'duplicate_already_processed')), 0) as count_flk_and_duplicate
 from recruit_association_download_history hist
@@ -625,17 +624,13 @@ join recruit_association_download_result res on hist.recruit_association_downloa
         <stream_name>info_date</stream_name>
       </field>
       <field>
-        <column_name>count_unique</column_name>
+        <column_name>count_completed_record</column_name>
         <stream_name>count_unique</stream_name>
       </field>
       <field>
         <column_name>count_flk_and_duplicate</column_name>
         <stream_name>count_flk_and_duplicate</stream_name>
       </field>
-      <field>
-        <column_name>count_all</column_name>
-        <stream_name>count_all</stream_name>
-      </field>
     </fields>
     <attributes/>
     <cluster_schema/>
diff --git a/mappings_old/metrics/init_registration_from_gir_vu.ktr b/mappings_old/metrics/init_registration_from_gir_vu.ktr
index fe23087..8bc54b1 100644
--- a/mappings_old/metrics/init_registration_from_gir_vu.ktr
+++ b/mappings_old/metrics/init_registration_from_gir_vu.ktr
@@ -436,22 +436,18 @@
   <notepads>
   </notepads>
   <connection>
-    <name>business_metrics_connection</name>
-    <server>10.10.31.119</server>
+    <name>ervu-person-registry</name>
+    <server>person-dbhost</server>
     <type>POSTGRESQL</type>
     <access>Native</access>
-    <database>ervu_business_metrics</database>
-    <port>5432</port>
-    <username>ervu_business_metrics</username>
-    <password>Encrypted 657276755ddceddca104c281979414ab64cc9bacc9</password>
+    <database>person-dbname</database>
+    <port>4444</port>
+    <username>person-dbuser</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb79ce10db80b9cf</password>
     <servername/>
     <data_tablespace/>
     <index_tablespace/>
     <attributes>
-      <attribute>
-        <code>EXTRA_OPTION_POSTGRESQL.stringtype</code>
-        <attribute>unspecified</attribute>
-      </attribute>
       <attribute>
         <code>FORCE_IDENTIFIERS_TO_LOWERCASE</code>
         <attribute>N</attribute>
@@ -466,7 +462,7 @@
       </attribute>
       <attribute>
         <code>PORT_NUMBER</code>
-        <attribute>5432</attribute>
+        <attribute>4444</attribute>
       </attribute>
       <attribute>
         <code>PRESERVE_RESERVED_WORD_CASE</code>
@@ -491,18 +487,22 @@
     </attributes>
   </connection>
   <connection>
-    <name>prerson_registry</name>
-    <server>10.10.31.118</server>
+    <name>metrics</name>
+    <server>metrics-dbhost</server>
     <type>POSTGRESQL</type>
     <access>Native</access>
-    <database>ervu-person-registry</database>
-    <port>5432</port>
-    <username>postgres</username>
-    <password>Encrypted 2be98afc86aa7f2e4b11ba562feabf7eb</password>
+    <database>metrics-dbname</database>
+    <port>7777</port>
+    <username>metrics-dbuser</username>
+    <password>Encrypted 657276755ddceddca104c281979414ab64cc9bacc9</password>
     <servername/>
     <data_tablespace/>
     <index_tablespace/>
     <attributes>
+      <attribute>
+        <code>EXTRA_OPTION_POSTGRESQL.stringtype</code>
+        <attribute>unspecified</attribute>
+      </attribute>
       <attribute>
         <code>FORCE_IDENTIFIERS_TO_LOWERCASE</code>
         <attribute>N</attribute>
@@ -517,7 +517,7 @@
       </attribute>
       <attribute>
         <code>PORT_NUMBER</code>
-        <attribute>5432</attribute>
+        <attribute>7777</attribute>
       </attribute>
       <attribute>
         <code>PRESERVE_RESERVED_WORD_CASE</code>
@@ -559,7 +559,7 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>prerson_registry</connection>
+    <connection>ervu-person-registry</connection>
     <sql>SELECT 
     TO_CHAR(NOW() - INTERVAL '1 day', 'YYYY-MM-DD') AS info_date,
     '300cee57-2ce7-4b82-847b-bfbe14d6c7ea' AS recruitment_id,
@@ -616,7 +616,7 @@ JOIN public.decision d ON d.recruit_id = r.id;</sql>
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>business_metrics_connection</connection>
+    <connection>metrics</connection>
     <schema>init_registration_info</schema>
     <table>init_registration_from_gir_vu</table>
     <commit>1000</commit>
diff --git a/mappings_old/metrics/records_info_id_uk_id_ern.ktr b/mappings_old/metrics/records_info_id_uk_id_ern.ktr
index ab7b5b5..b94513b 100644
--- a/mappings_old/metrics/records_info_id_uk_id_ern.ktr
+++ b/mappings_old/metrics/records_info_id_uk_id_ern.ktr
@@ -430,7 +430,7 @@
     <created_date>2024/12/10 14:21:53.612</created_date>
     <modified_user>-</modified_user>
     <modified_date>2024/12/10 14:21:53.612</modified_date>
-    <key_for_session_key/>
+    <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
     <is_key_private>N</is_key_private>
   </info>
   <notepads>
@@ -462,7 +462,7 @@
       </attribute>
       <attribute>
         <code>PORT_NUMBER</code>
-        <attribute>5432</attribute>
+        <attribute>4444</attribute>
       </attribute>
       <attribute>
         <code>PRESERVE_RESERVED_WORD_CASE</code>
@@ -517,7 +517,7 @@
       </attribute>
       <attribute>
         <code>PORT_NUMBER</code>
-        <attribute>5432</attribute>
+        <attribute>7777</attribute>
       </attribute>
       <attribute>
         <code>PRESERVE_RESERVED_WORD_CASE</code>
@@ -822,10 +822,6 @@ FROM p18_p_v;</sql>
         <column_name>info_age</column_name>
         <stream_name>info_age</stream_name>
       </field>
-      <field>
-        <column_name>count_all</column_name>
-        <stream_name>count_all</stream_name>
-      </field>
       <field>
         <column_name>records_with_id_uk</column_name>
         <stream_name>records_with_id_uk</stream_name>