diff --git a/.github/workflows/push_trigger.yml b/.github/workflows/push_trigger.yml
index a3fbcbc3..db903681 100644
--- a/.github/workflows/push_trigger.yml
+++ b/.github/workflows/push_trigger.yml
@@ -32,7 +32,7 @@ jobs:
         gpg2 --import ./.github/keys/mosipgpgkey_pub.gpg 
         gpg2 --quiet --batch --passphrase=${{secrets.gpg_secret}}  --allow-secret-key-import --import ./.github/keys/mosipgpgkey_sec.gpg 
      
-    - uses: actions/cache@v1
+    - uses: actions/cache@v3
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -53,7 +53,7 @@ jobs:
       run: find -name '*.jar' -executable -type f  -exec zip release.zip {} +
 
     - name: Upload the springboot jars 
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: release
         path: ./release.zip
@@ -94,7 +94,7 @@ jobs:
         gpg2 --import ./.github/keys/mosipgpgkey_pub.gpg 
         gpg2 --quiet --batch --passphrase=${{secrets.gpg_secret}}  --allow-secret-key-import --import ./.github/keys/mosipgpgkey_sec.gpg 
      
-    - uses: actions/cache@v1
+    - uses: actions/cache@v3
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -136,8 +136,8 @@ jobs:
       SERVICE_LOCATION: kernel/kernel-keymanager-service
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/download-artifact@v1
+      - uses: actions/checkout@v3
+      - uses: actions/download-artifact@v4
         with:
           name: release
           path: ./
@@ -200,7 +200,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/download-artifact@v1
+      - uses: actions/download-artifact@v4
         with:
           name: release
           path: ./
@@ -278,7 +278,7 @@ jobs:
           sudo apt-get --yes install gnupg2
           gpg2 --import ./.github/keys/mosipgpgkey_pub.gpg
           gpg2 --quiet --batch --passphrase=${{secrets.gpg_secret}}  --allow-secret-key-import --import ./.github/keys/mosipgpgkey_sec.gpg
-      - uses: actions/cache@v1
+      - uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
diff --git a/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/keymanagerservice/repository/PartnerCertificateStoreRepository.java b/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/keymanagerservice/repository/PartnerCertificateStoreRepository.java
index 27be03e5..e4b4a6bd 100644
--- a/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/keymanagerservice/repository/PartnerCertificateStoreRepository.java
+++ b/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/keymanagerservice/repository/PartnerCertificateStoreRepository.java
@@ -58,5 +58,5 @@ public interface PartnerCertificateStoreRepository extends JpaRepository<Partner
 	 * @param partnerDomain Partner Domain
 	 * @return PartnerCertificateStore
 	 */
-	PartnerCertificateStore findByCertThumbprintAndPartnerDomain(String certThumbprint, String partnerDomain);
+	List<PartnerCertificateStore> findByCertThumbprintAndPartnerDomain(String certThumbprint, String partnerDomain);
 }
diff --git a/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/partnercertservice/helper/PartnerCertManagerDBHelper.java b/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/partnercertservice/helper/PartnerCertManagerDBHelper.java
index e58815d0..e5f461c6 100644
--- a/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/partnercertservice/helper/PartnerCertManagerDBHelper.java
+++ b/kernel/kernel-keymanager-service/src/main/java/io/mosip/kernel/partnercertservice/helper/PartnerCertManagerDBHelper.java
@@ -67,9 +67,9 @@ public boolean isCertificateExist(String certThumbprint, String partnerDomain){
     }
 
     public boolean isPartnerCertificateExist(String certThumbprint, String partnerDomain){
-        PartnerCertificateStore partnerCertificate = partnerCertificateStoreRepository
+        List<PartnerCertificateStore> partnerCertificateList = partnerCertificateStoreRepository
                                                      .findByCertThumbprintAndPartnerDomain(certThumbprint, partnerDomain);
-        if (Objects.nonNull(partnerCertificate)) {
+        if (!partnerCertificateList.isEmpty()) {
             return true;
         }
         return false;
diff --git a/kernel/kernel-keymanager-service/src/test/java/io/mosip/kernel/keymanagerservice/test/integration/KeymanagerIntegrationTest.java b/kernel/kernel-keymanager-service/src/test/java/io/mosip/kernel/keymanagerservice/test/integration/KeymanagerIntegrationTest.java
index 3e23b680..7857e43c 100644
--- a/kernel/kernel-keymanager-service/src/test/java/io/mosip/kernel/keymanagerservice/test/integration/KeymanagerIntegrationTest.java
+++ b/kernel/kernel-keymanager-service/src/test/java/io/mosip/kernel/keymanagerservice/test/integration/KeymanagerIntegrationTest.java
@@ -334,7 +334,7 @@ public void encryptWithMultipleAliasReferenceId() throws Exception {
 		ResponseWrapper<SignatureResponseDto> responseWrapper = objectMapper.readValue(
 				result.getResponse().getContentAsString(), new TypeReference<ResponseWrapper<SignatureResponseDto>>() {
 				});
-		assertThat(responseWrapper.getErrors().get(0).getErrorCode(), is("KER-KMA-005"));
+		assertThat(responseWrapper.getErrors().get(0).getErrorCode(), is("KER-KMS-002"));
 	}
 
 	@WithUserDetails("reg-processor")
@@ -366,7 +366,7 @@ public void encryptWithEmptyAliasReferenceId() throws Exception {
 		ResponseWrapper<SignatureResponseDto> responseWrapper = objectMapper.readValue(
 				result.getResponse().getContentAsString(), new TypeReference<ResponseWrapper<SignatureResponseDto>>() {
 				});
-		assertThat(responseWrapper.getErrors().get(0).getErrorCode(), is("KER-KMA-005"));
+		assertThat(responseWrapper.getErrors().get(0).getErrorCode(), is("KER-KMS-002"));
 	}
 
 }
\ No newline at end of file
diff --git a/kernel/keys-generator/Dockerfile b/kernel/keys-generator/Dockerfile
index e3e7a3b8..289cd842 100644
--- a/kernel/keys-generator/Dockerfile
+++ b/kernel/keys-generator/Dockerfile
@@ -67,7 +67,10 @@ ADD configure_start.sh configure_start.sh
 
 RUN chmod +x configure_start.sh
 
-ADD target/keys-generator-*.jar keys-generator.jar
+ADD ./target/*.jar /target/
+RUN find /target -name '*.jar' -executable -type f "-print0" | xargs "-0" cp -t / \
+    && rm -rf /target \
+    && mv /*.jar ${work_dir}/keys-generator.jar
 
 ENTRYPOINT [ "/configure_start.sh" ]
 
diff --git a/kernel/pom.xml b/kernel/pom.xml
index 47571a57..5d29c7ae 100644
--- a/kernel/pom.xml
+++ b/kernel/pom.xml
@@ -30,7 +30,7 @@
 
 	<modules>
 		<module>kernel-keymanager-service</module>
-		<!-- <module>keys-generator</module> -->
+		<module>keys-generator</module>
 	</modules>