diff --git a/api-test/src/main/resources/config/Kernel.properties b/api-test/src/main/resources/config/Kernel.properties
deleted file mode 100644
index 756f2a4c59..0000000000
--- a/api-test/src/main/resources/config/Kernel.properties
+++ /dev/null
@@ -1,283 +0,0 @@
-#---------------------------------- End point(s) relative URLs ----------------------------------#
-authclientidsecretkeyURL = /v1/authmanager/authenticate/clientidsecretkey
-authentication = /v1/authmanager/authenticate/useridPwd
-authenticationInternal = /v1/authmanager/authenticate/internal/useridPwd
-keycloakAuthURL = /auth/realms/master/protocol/openid-connect/token
-auditLog_URI = /v1/auditmanager/audits
-CentetMachineUserMappingToMasterData_uri = /v1/masterdata/registrationmachineusermappings
-EmailNotification_URI = /v1/notifier/email/send
-encrypt_URI = /v1/keymanager/encrypt
-decrypt_URI = /v1/keymanager/decrypt
-FetchApplication_URI = /v1/masterdata/applicationtypes
-FetchApplication_lang_URI = /v1/masterdata/applicationtypes/{langcode}
-FetchApplication_id_lang_URI = /v1/masterdata/applicationtypes/{code}/{langcode}
-FetchBiometricAttribute_URI = /v1/masterdata/getbiometricattributesbyauthtype/{langcode}/{biometrictypecode}
-FetchBiometricAuthType_URI = /v1/masterdata/biometrictypes/{langcode}
-FetchBlackListedWord_URI = /v1/masterdata/blacklistedwords/{langcode}
-FetchDevice_lang_URI = /v1/masterdata/devices/{languagecode}
-FetchDevice_id_lang_URI = /v1/masterdata/devices/{languagecode}/{deviceType}
-FetchDeviceSpec_lang_URI = /v1/masterdata/devicespecifications/{langcode}
-FetchDeviceSpec_id_lang_URI = /v1/masterdata/devicespecifications/{langcode}/{devicetypecode}
-FetchDocumentCategories_URI = /v1/masterdata/documentcategories/{langcode}
-FetchDocumentCategories_URI_withcodeAndLangCode = /v1/masterdata/documentcategories/{code}/{langcode}
-FetchDocumentTypes_URI = /v1/masterdata/documenttypes/{documentcategorycode}/{langcode}
-FetchGenderType_URI = /v1/masterdata/gendertypes
-FetchGenderType_id_lang_URI = /v1/masterdata/gendertypes/{langcode}
-FetchHolidays_URI = /v1/masterdata/holidays
-FetchHolidays_id_URI = /v1/masterdata/holidays/{holidayid}
-FetchHolidays_id_lang_URI = /v1/masterdata/holidays/{holidayid}/{langcode}
-FetchIDlist_URI = /v1/masterdata/idtypes/{langcode}
-FetchLocationHierarchy_URI_withlangCode = /v1/masterdata/locations/{langcode}
-FetchLocationHierarchy_URI_locationcode = /v1/masterdata/locations/{locationcode}/{langcode}
-FetchLocationHierarchy_URI_hierarchyname = /v1/masterdata/locations/locationhierarchy/{hierarchyname}
-FetchMachine_URI = /v1/masterdata/machines
-FetchMachine_lang_URI = /v1/masterdata/machines/{langcode}
-FetchMachine_id_lang_URI = /v1/masterdata/machines/{id}/{langcode}
-FetchMachineHistory_URI = /v1/masterdata/machineshistories/{id}/{langcode}/{effdatetimes}
-FetchRegCent_URI = /v1/masterdata/registrationcenters
-FetchRegCent_id_lang_URI = /v1/masterdata/registrationcenters/{id}/{langcode}
-FetchRegCent_loc_lang_URI = /v1/masterdata/getlocspecificregistrationcenters/{langcode}/{locationcode}
-FetchRegCent_hir_name_lang_URI = /v1/masterdata/registrationcenters/{langcode}/{hierarchylevel}/{name}
-FetchRegCent_prox_lang_URI = /v1/masterdata/getcoordinatespecificregistrationcenters/{langcode}/{longitude}/{latitude}/{proximitydistance}
-FetchRegCentHistory_URI = /v1/masterdata/registrationcentershistory/{registrationCenterId}/{langcode}/{effectiveDate}
-FetchRegCentHolidays_URI = /v1/masterdata/getregistrationcenterholidays/{langcode}/{registrationcenterid}/{year}
-FetchRegcentMachUserMaping_URI = /v1/masterdata/getregistrationmachineusermappinghistory/{effdtimes}/{registrationcenterid}/{machineid}/{userid}
-FetchRejectionReason_URI = /v1/masterdata/packetrejectionreasons/{reasoncategorycode}/{langcode}
-FetchTemplate_URI = /v1/masterdata/templates
-FetchTemplate_lang_URI = /v1/masterdata/templates/{langcode}
-FetchTemplate_id_lang_URI = /v1/masterdata/templates/{langcode}/{templatetypecode}
-FetchTitle_URI = /v1/masterdata/title/{langcode}
-fetchAllTemplate = /v1/masterdata/templates/templatetypecodes/{code}
-getApplicantType = /v1/masterdata/getApplicantType
-fetchDeviceHistory = /v1/masterdata/deviceshistories/{id}/{langcode}/{effdatetimes}
-getDocType_DocCatByAppID = /v1/masterdata/applicanttype/{applicantId}/languages
-getDocTypeDocCatByLangCode = /v1/masterdata/validdocuments/{languagecode}
-fetchImmediateChildLocation = /v1/masterdata/locations/immediatechildren/{locationcode}/{langcode}
-getIndividualType = /v1/masterdata/individualtypes
-getRoles = /v1/syncdata/roles
-fetchRegCenter = /v1/masterdata/registrationcenters/validate/{id}/{langCode}/{timestamp}
-fetchRegistrationCenterDeviceHistory = /v1/masterdata/registrationcenterdevicehistory/{regcenterid}/{deviceid}/{effdatetimes}
-getusersBasedOnRegCenter = /v1/syncdata/userdetails/{regid}
-licKeyGenerator = /v1/keymanager/license/generate
-mapLicenseKey = /v1/keymanager/license/permission
-fetchmapLicenseKey = /v1/keymanager/license/permission
-OTPGeneration = /v1/otpmanager/otp/generate
-OTPValidation = /v1/otpmanager/otp/validate
-otpNotifier = /v1/otpnotifier/otp/send
-RIDGenerator_URI = /v1/ridgenerator/generate/rid/{centerid}/{machineid}
-SmsNotification_URI = /v1/notifier/sms/send
-syncConf = /v1/syncdata/configs
-fetchIncrementalData = /v1/syncjob/syncjobdef
-fetchmasterdata = /v1/syncdata/masterdata
-fetchmasterdatawithRID = /v1/syncdata/masterdata/{regcenterId}
-SyncPublicKeyToRegClient_URI = /v1/keymanager/publickey/
-uingenerator = /v1/idgenerator/uin
-validateGenderByName = /v1/masterdata/gendertypes/validate/{gendername}
-validateLocationByName = /v1/masterdata/locations/validate/{locationname}
-tokenIdGenerator_URI = /v1/keymanager/{uin}/{partnercode}
-getRIDByUserId = /v1/authmanager/rid/{appid}/{userid}
-syncMdatawithKeyIndex = /v1/syncdata/clientsettings
-syncMdatawithRegCentIdKeyIndex = /v1/syncdata/clientsettings/{regcenterid}
-uploadpublickey = /v1/syncdata/tpm/publickey
-getUserHistory = /v1/masterdata/users/{id}/{eff_dtimes}
-sendOtp = /v1/authmanager/authenticate/sendotp
-useridOTP = /v1/authmanager/authenticate/useridOTP
-preregSendOtp = /preregistration/v1/login/sendOtp/langcode
-preregValidateOtp = /preregistration/v1/login/validateOtp
-zoneMappingUrl = /v1/masterdata/zoneuser
-zoneNameUrl = /v1/masterdata/zones/zonename
-zoneMappingActivateUrl = /v1/masterdata/zoneuser
-userCenterMappingUrl = /v1/masterdata/usercentermapping
-bulkUploadUrl = /v1/admin/bulkupload
-currentUserURI=/#/uinservices/viewhistory
-actuatorEndpoint=/resident/v1/actuator/env
-actuatorAdminEndpoint=/v1/admin/actuator/env
-actuatorMasterDataEndpoint=/v1/masterdata/actuator/env
-actuatorIDAEndpoint=/idauthentication/v1/actuator/env
-actuatorRegprocEndpoint=/registrationprocessor/v1/registrationtransaction/actuator/env
-actuatorEsignetEndpoint=/v1/esignet/actuator/env
-tokenEndpoint=/v1/esignet/oauth/token
-auditActuatorEndpoint=/v1/auditmanager/actuator/info
-validateBindingEndpoint=ida-binding
-esignetWellKnownEndPoint=/v1/esignet/oidc/.well-known/openid-configuration
-signupSettingsEndPoint=/v1/signup/settings
-esignetActuatorPropertySection=esignet-default.properties
-
-
-
-#---------------------------------- APP IDs ----------------------------------#
-#-- When test rig ran in docker, these values dervied from the environment ---#
-mosip_pms_app_id = partner
-mosip_resident_app_id = resident
-mosip_idrepo_app_id = idrepo
-mosip_regclient_app_id = registrationclient
-mosip_hotlist_app_id = hotlist
-mosip_regprocclient_app_id = regproc
-AuthAppID = resident
-mosip_admin_app_id = admin
-
-
-
-#---------------------------------- Client IDs -------------------------------#
-#-- When test rig ran in docker, these values dervied from the environment ---#
-mosip_pms_client_id = mosip-pms-client
-mosip_partner_client_id = mosip-partner-client
-mosip_resident_client_id = mosip-resident-client
-mosip_idrepo_client_id = mosip-idrepo-client
-mosip_reg_client_id = mosip-reg-client
-mosip_admin_client_id = mosip-admin-client
-mosip_hotlist_client_id = mosip-hotlist-client
-mosip_regproc_client_id = mosip-regproc-client
-mpartner_default_mobile_client_id = mpartner-default-mobile
-mosip_testrig_client_id = mosip-testrig-client
-AuthClientID = mosip-resident-client
-
-
-
-#---------------------------------- Client Secret Keys -----------------------#
-#-- When test rig ran in docker, these values dervied from the environment ---#
-mosip_partner_client_secret =
-mosip_pms_client_secret =
-mosip_resident_client_secret =
-mosip_idrepo_client_secret =
-mosip_reg_client_secret =
-mosip_admin_client_secret =
-mosip_hotlist_client_secret =
-mosip_regproc_client_secret =
-mpartner_default_mobile_secret =
-mosip_testrig_client_secret =
-AuthClientSecret =
-
-
-
-#----------------------------- minio proprties ------------------------------#
-s3-user-key = minioadmin
-s3-user-secret = minioadmin
-s3-host = http://minio.minio:9000
-s3-account = automation
-s3-region = null
-reportExpirationInDays = 3
-s3-account-for-persona-data = personaData
-push-reports-to-s3 = yes
-
-
-#-------------------- Keycloak User Creation proprties ----------------------#
-#-- When test rig ran in docker,few of below dervied from the environment ---#
-new_Resident_User = 111995
-new_Resident_Password = mosip123
-new_Resident_Role = default-roles-mosip,PARTNER_ADMIN
-roles.111995 = PARTNER_ADMIN,default-roles-mosip
-keycloak_UserName = admin
-keycloak_Password = sMDr9Ainw9
-keycloak-external-url = https://iam.qa-inji.mosip.net
-keycloak-realm-id = mosip
-iam-users-to-create = 111997,111998,220005,111992,globaladmin,111887,111999
-iam-users-password = mosip123,mosip123,mosip123,mosip123,mosip123
-roles.220005 = GLOBAL_ADMIN,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ZONAL_ADMIN
-roles.111997 = AUTH_PARTNER,PARTNER_ADMIN,PMS_ADMIN,POLICYMANAGER,REGISTRATION_SUPERVISOR
-roles.111999 = AUTH_PARTNER,PARTNER_ADMIN,PMS_ADMIN,POLICYMANAGER,REGISTRATION_SUPERVISOR
-roles.111887 = AUTH_PARTNER,PARTNER_ADMIN,PMS_ADMIN,REGISTRATION_SUPERVISOR
-roles.111998 = POLICYMANAGER
-roles.111992 = GLOBAL_ADMIN
-roles.globaladmin = GLOBAL_ADMIN,REGISTRATION_ADMIN,uma_authorization,ZONAL_ADMIN,default-roles-mosip
-
-
-#------------------------- DB Connectivity proprties ------------------------#
-#-- When test rig ran in docker,few of below dervied from the environment ---#
-driver_class=org.postgresql.Driver
-pool_size=1
-dialect=org.hibernate.dialect.PostgreSQLDialect
-show_sql=true
-current_session_context_class=thread
-audit_url=jdbc:postgresql://qa-inji.mosip.net:5432/mosip_audit
-audit_username=postgres
-audit_password=2BhgiSpCaT
-audit_default_schema=audit
-DB_PORT=
-installation-domain=
-partner_url=jdbc:postgresql://qa-inji.mosip.net:5432/mosip_ida
-partner_username=postgres
-partner_password=2BhgiSpCaT
-partner_default_schema=partner
-reportLogPath=automationLogAndReport
-postgresqlUser=postgresql
-db-port=5432
-db-server=qa-inji.mosip.net
-hibernate.connection.driver_class=org.postgresql.Driver
-hibernate.connection.pool_size=1
-hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
-hibernate.show_sql=true
-hibernate.current_session_context_class=thread
-db-su-user=postgres
-postgres-password=2BhgiSpCaT
-pms_db_schema=pms
-km_db_schema=keymgr
-master_db_schema=master
-audit_db_schema=audit
-ida_db_schema=ida
-
-
-#------------------------- DSL specific proprties ------------------------#
-#------------------------- We need to see how to have DSL specific proprties file ------------------------#
-packetUtilityBaseUrl=http://localhost:8080
-mountPathForScenario=D:/centralized/mountvolume
-mountPath=/home/mosip/mountvolume
-# Add scenarios to skip from automation and server side
-# supported values "S-scnearioNumber" for server side and "A-scnearioNumber" for automation
-scenariosToSkip=
-# Add scenarios to include in the the execution list
-# Empty if we want to execute all the scenarios---
-scenariosToExecute=
-# supported values yes or no
-useExternalScenarioSheet=yes
-# supported values are 1 to 8
-threadCount=1
-
-#------------------------ Generic properties ------------------------#
-enableDebug=yes
-preconfiguredOtp=111111
-usePreConfiguredOtp=true
-# supported values yes or no. Assume that by Default e-signet is deployed
-eSignetDeployed=yes
-partnerUrlSuffix=oYf63Lax0DY2QkYMRHnrmDqhmO3RMWQagwm0ftgLlkuin1KOND/666/576732
-reportIgnoredTestCases=no
-reportKnownIssueTestCases=no
-servicesNotDeployed=
-esignetMockBaseURL=esignet-insurance.
-sunBirdBaseURL=registry
-slack-webhook-url=
-serverErrorsToMonitor=IDA-MLC-018
-pmsAuthInternal=true
-partner_password=mosip123
-partner_userName=111997
-partner_revamp_userName=111999
-partner_user_password=mosip123
-policytest_password=mosip123
-policytest_userName=111998
-policytest_without_pmrole_userName=111887
-admin_password=mosip123
-admin_userName=220005
-admin_zone_password=mosip123
-admin_zone_userName=globaladmin
-mockNotificationChannel=email,phone
-mountPathForReport=/home/mosip/testrig/report
-
-
-#------------------------- Need to check if these are used or not ------------------------#
-OTPTimeOut = 181
-attempt = 10
-ConfigParameters=mosip.kernel.rid.length,mosip.kernel.uin.length,mosip.kernel.sms.country.code,mosip.kernel.sms.number.length,mosip.kernel.otp.default-length,mosip.kernel.otp.expiry-time,mosip.kernel.otp.key-freeze-time,mosip.kernel.otp.validation-attempt-threshold,mosip.kernel.otp.min-key-length,mosip.kernel.otp.max-key-length,mosip.kernel.licensekey.length,mosip.supported-languages
-# supported values are 0 ,1, 2 based on number of env languages
-langselect=0
-
-
-
-#----------------------------------AuthDemoService Host properties----------------------------------------------------------#
-#authCertsPath=
-authCertsPath=/home/mosip/authcerts
-
-
-
-
-mosip_components_base_urls=
-#auditmanager=api-internal.dev1.mosip.net;idrepository=api-internal.dev1.mosip.net;partnermanager=api-internal.qa-inji.mosip.net;idauthentication=api-internal.qa-inji.mosip.net;policymanager=api-internal.qa-inji.mosip.net
\ No newline at end of file
diff --git a/api-test/src/main/resources/preReg/GetApplicationsApplicationID/GetApplicationsApplicationID.yml b/api-test/src/main/resources/preReg/GetApplicationsApplicationID/GetApplicationsApplicationID.yml
deleted file mode 100644
index 83b927cb94..0000000000
--- a/api-test/src/main/resources/preReg/GetApplicationsApplicationID/GetApplicationsApplicationID.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-GetApplicationsApplicationID:
- Prereg_GetApplicationsApplicationID_All_Valid_Smoke_sid:
- endPoint: /preregistration/v1/applications/{applicationId}
- description: Retrieve the application by application ID
- role: batch
- checkErrorsOnlyInResponse: true
- restMethod: get
- inputTemplate: preReg/GetApplicationsApplicationID/getApplicationsApplicationID
- outputTemplate: preReg/GetApplicationsApplicationID/getApplicationsApplicationIDResult
- input: '{
- "applicationId": "52917592714578"
-}'
- output: '{
- "applicationId": "52917592714578"
-}'
- Prereg_GetApplicationsApplicationID_InValid_applicationID:
- endPoint: /preregistration/v1/applications/{applicationId}
- description: Retrieve the application by invalid application ID
- role: batch
- restMethod: get
- inputTemplate: preReg/GetApplicationsApplicationID/getApplicationsApplicationID
- outputTemplate: preReg/error
- input: '{
- "applicationId": "erwsdhgqw5dcfbz"
-}'
- output: '{
- "errors": [
- {
- "errorCode": "PRG_APP_013"
- }
- ]
-}'
\ No newline at end of file
diff --git a/api-test/src/main/resources/preReg/GetApplicationsApplicationID/getApplicationsApplicationID.hbs b/api-test/src/main/resources/preReg/GetApplicationsApplicationID/getApplicationsApplicationID.hbs
deleted file mode 100644
index 95f5a367e5..0000000000
--- a/api-test/src/main/resources/preReg/GetApplicationsApplicationID/getApplicationsApplicationID.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "applicationId": "{{applicationId}}"
-}
\ No newline at end of file
diff --git a/api-test/src/main/resources/preReg/GetApplicationsApplicationID/getApplicationsApplicationIDResult.hbs b/api-test/src/main/resources/preReg/GetApplicationsApplicationID/getApplicationsApplicationIDResult.hbs
deleted file mode 100644
index 24fe17af94..0000000000
--- a/api-test/src/main/resources/preReg/GetApplicationsApplicationID/getApplicationsApplicationIDResult.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "response": {
- "applicationId": "{{applicationId}}"
- }
-}
\ No newline at end of file
diff --git a/api-test/testNgXmlFiles/preregApi.xml b/api-test/testNgXmlFiles/preregApi.xml
index 45f92e0243..74ef65366b 100644
--- a/api-test/testNgXmlFiles/preregApi.xml
+++ b/api-test/testNgXmlFiles/preregApi.xml
@@ -345,13 +345,6 @@
-
-
-
-
-
-