diff --git a/pmp-ui/src/app/features/resources/shared/mater-data-common-body/mater-data-common-body.component.html b/pmp-ui/src/app/features/resources/shared/mater-data-common-body/mater-data-common-body.component.html
index a43d7879d..cd1ee7d67 100644
--- a/pmp-ui/src/app/features/resources/shared/mater-data-common-body/mater-data-common-body.component.html
+++ b/pmp-ui/src/app/features/resources/shared/mater-data-common-body/mater-data-common-body.component.html
@@ -16,6 +16,9 @@
                 [value]="primaryData[field.name]"
                 required
               />
+              <mat-hint *ngIf="field.maxLength === primaryData[field.name].length">
+                {{'policy.max-limit'|translate}}
+              </mat-hint>
             </mat-form-field>
             <mat-form-field style="width:950px" *ngIf="field.showInSingleView === 'true' && field.inputType === 'textarea' && primaryData[field.name] === '{}'">
               <textarea
@@ -37,7 +40,7 @@
                 id="{{field.name}}"
                 #keyboardRef
                 #{{field.name}}
-                (blur)="captureValue($event, field.name, 'primary')"
+                (keyup)="captureValue($event, field.name, 'primary')"
                 matInput
                 [maxLength]="field.maxLength"
                 placeholder="{{
@@ -47,6 +50,9 @@
                 required={{field.ismandatory}}
                 rows="7" cols="40"
               ></textarea>
+              <mat-hint *ngIf="field.maxLength === primaryData[field.name].length">
+                {{'policy.max-limit'|translate}}
+              </mat-hint>
             </mat-form-field>
             <mat-form-field *ngIf="field.showInSingleView === 'true' && field.inputType === 'dropdown'">
               <mat-select
diff --git a/pmp-ui/src/app/features/resources/shared/mater-data-common-body/mater-data-common-body.component.scss b/pmp-ui/src/app/features/resources/shared/mater-data-common-body/mater-data-common-body.component.scss
index 0fa69e801..8132dca16 100644
--- a/pmp-ui/src/app/features/resources/shared/mater-data-common-body/mater-data-common-body.component.scss
+++ b/pmp-ui/src/app/features/resources/shared/mater-data-common-body/mater-data-common-body.component.scss
@@ -11,3 +11,7 @@ mat-form-field{
   margin-top: 14px;
 }
 
+.mat-form-field-appearance-legacy .mat-hint {
+  color: #ffc107;
+}
+
diff --git a/pmp-ui/src/assets/config.json b/pmp-ui/src/assets/config.json
index 3f62bbc47..a91f80491 100644
--- a/pmp-ui/src/assets/config.json
+++ b/pmp-ui/src/assets/config.json
@@ -1,7 +1,7 @@
 {
     "primaryLangCode": "eng",
     "secondaryLangCode": "ara",
-    "baseUrl": "https://api-internal.dev.mosip.net/",
+    "baseUrl": "https://api-internal.dev-staging.mosip.net/",
     "pmpUrl":"/",
     "version":"v1/"
 } 
diff --git a/pmp-ui/src/assets/i18n/ara.json b/pmp-ui/src/assets/i18n/ara.json
index 0e75998af..4618f6339 100644
--- a/pmp-ui/src/assets/i18n/ara.json
+++ b/pmp-ui/src/assets/i18n/ara.json
@@ -385,6 +385,7 @@
     "language": "إنجليزي",
     "keyboard-tooltip": "انقر للحصول على لوحة المفاتيح الافتراضية (الإنجليزية)",
     "update": "تحديث",
+    "max-limit": "تم الوصول إلى الحد الأقصى",
     "validationMessages": {
       "name": {
         "required": "اسم السياسة مطلوب",
diff --git a/pmp-ui/src/assets/i18n/eng.json b/pmp-ui/src/assets/i18n/eng.json
index 8f0885b9d..6dc3ba9d0 100644
--- a/pmp-ui/src/assets/i18n/eng.json
+++ b/pmp-ui/src/assets/i18n/eng.json
@@ -378,6 +378,7 @@
     "language": "English",
     "keyboard-tooltip": "Click for Virtual Keyboard (English)",
     "update": "Update",
+    "max-limit": "Max limit reached",
     "validationMessages": {
       "name": {
         "required": "Policy Name is required",
diff --git a/pmp-ui/src/assets/i18n/fra.json b/pmp-ui/src/assets/i18n/fra.json
index e7d2878da..7f59c45b6 100644
--- a/pmp-ui/src/assets/i18n/fra.json
+++ b/pmp-ui/src/assets/i18n/fra.json
@@ -381,6 +381,7 @@
     "language": "Anglais",
     "keyboard-tooltip": "Cliquez pour le clavier virtuel (anglais)",
     "update": "Mise à jour",
+    "max-limit": "Limite maximale atteinte",
     "validationMessages": {
       "name": {
         "required": "Le nom de la stratégie est requis",
diff --git a/pmp-ui/src/assets/i18n/hin.json b/pmp-ui/src/assets/i18n/hin.json
index abc6c3be3..191707102 100644
--- a/pmp-ui/src/assets/i18n/hin.json
+++ b/pmp-ui/src/assets/i18n/hin.json
@@ -381,6 +381,7 @@
     "language": "अंग्रेज़ी",
     "keyboard-tooltip": "वर्चुअल कीबोर्ड के लिए क्लिक करें (अंग्रेज़ी)",
     "update": "अद्यतन",
+    "max-limit": "अधिकतम सीमा तक पहुँच गया",
     "validationMessages": {
       "name": {
         "required": "पॉलिसी का नाम आवश्यक है",
diff --git a/pmp-ui/src/assets/i18n/kan.json b/pmp-ui/src/assets/i18n/kan.json
index 9516136df..9e03585e8 100644
--- a/pmp-ui/src/assets/i18n/kan.json
+++ b/pmp-ui/src/assets/i18n/kan.json
@@ -381,6 +381,7 @@
     "language": "ಆಂಗ್ಲ",
     "keyboard-tooltip": "ವರ್ಚುವಲ್ ಕೀಬೋರ್ಡ್‌ಗಾಗಿ ಕ್ಲಿಕ್ ಮಾಡಿ (ಇಂಗ್ಲಿಷ್)",
     "update": "ನವೀಕರಿಸಿ",
+    "max-limit": "ಗರಿಷ್ಠ ಮಿತಿಯನ್ನು ತಲುಪಿದೆ",
     "validationMessages": {
       "name": {
         "required": "ನೀತಿಯ ಹೆಸರು ಅಗತ್ಯವಿದೆ",
diff --git a/pmp-ui/src/assets/i18n/tam.json b/pmp-ui/src/assets/i18n/tam.json
index 693d3c377..9708e6d52 100644
--- a/pmp-ui/src/assets/i18n/tam.json
+++ b/pmp-ui/src/assets/i18n/tam.json
@@ -381,6 +381,7 @@
     "language": "ஆங்கிலம்",
     "keyboard-tooltip": "மெய்நிகர் விசைப்பலகைக்கு (ஆங்கிலம்) கிளிக் செய்யவும்",
     "update": "புதுப்பிக்கவும்",
+    "max-limit": "அதிகபட்ச வரம்பை எட்டிவிட்டது",
     "validationMessages": {
       "name": {
         "required": "பாலிசியின் பெயர் தேவை",