diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml
index 7343fd4d4..f1401f686 100644
--- a/.github/workflows/push-trigger.yml
+++ b/.github/workflows/push-trigger.yml
@@ -212,7 +212,7 @@ jobs:
             SQUASH_LAYERS: '13'
       fail-fast: false
     name: ${{ matrix.SERVICE_NAME }}
-    uses: mosip/kattu/.github/workflows/docker-build.yml@master
+    uses: mosip/kattu/.github/workflows/docker-build.yml@master-java21
     with:
       SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }}
       SERVICE_NAME: ${{ matrix.SERVICE_NAME }}
@@ -319,7 +319,7 @@ jobs:
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
       
   build-maven-uitest-esignet:
-    uses: mosip/kattu/.github/workflows/maven-build-browserStack.yml@develop
+    uses: anup-nehe/kattu/.github/workflows/maven-build-browserStack.yml@develop
     with:
       SERVICE_LOCATION: ./ui-test
       BUILD_ARTIFACT: uitest-esignet
diff --git a/esignet-service/Dockerfile b/esignet-service/Dockerfile
index 059d51064..ddee64eb0 100644
--- a/esignet-service/Dockerfile
+++ b/esignet-service/Dockerfile
@@ -88,7 +88,7 @@ RUN apt-get -y update \
 && mkdir -p ${loader_path} \
 && mkdir -p ${plugins_path} \
 && chmod +x configure_start.sh \
-&& wget https://raw.githubusercontent.com/mosip/artifactory-ref-impl/master/artifacts/src/hsm/client-21.zip -O client.zip \
+&& wget https://raw.githubusercontent.com/mosip/artifactory-ref-impl/master/artifacts/src/hsm/client.zip \
 && chown -R ${container_user}:${container_user} /home/${container_user} \
 && rm -rf /var/lib/apt/lists/*