diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml
index c969587..007f634 100644
--- a/.github/workflows/push-trigger.yml
+++ b/.github/workflows/push-trigger.yml
@@ -22,7 +22,7 @@ on:
 
 jobs:
   build-demosdk:
-    uses: mosip/kattu/.github/workflows/maven-build.yml@master
+    uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21
     with:
       SERVICE_LOCATION: ./demosdk
       BUILD_ARTIFACT: demosdk
@@ -36,7 +36,7 @@ jobs:
   publish_to_nexus:
     if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' }}"
     needs: build-demosdk
-    uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master
+    uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master-java21
     with:
       SERVICE_LOCATION: ./demosdk
     secrets:
@@ -50,7 +50,7 @@ jobs:
   sonar_analysis:
     needs: build-demosdk
     if: "${{ github.event_name != 'pull_request' }}"
-    uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master
+    uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21
     with:
       SERVICE_LOCATION: ./demosdk
     secrets:
diff --git a/.github/workflows/release-changes.yml b/.github/workflows/release-changes.yml
deleted file mode 100644
index 2579ea8..0000000
--- a/.github/workflows/release-changes.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Release/pre-release Preparation.
-
-on:
-  workflow_dispatch:
-    inputs:
-      MESSAGE:
-        description: 'Triggered for release or pe-release'
-        required: false
-        default: 'Release Preparation'
-      RELEASE_TAG:
-        description: 'tag to update'
-        required: true
-      SNAPSHOT_TAG:
-        description: 'tag to be replaced'
-        required: true
-      BASE:
-        description: 'base branch for PR'
-        required: true
-jobs:
-  maven-release-preparation:
-    uses: mosip/kattu/.github/workflows/release-changes.yml@master
-    with:
-      MESSAGE: ${{ inputs.MESSAGE }}
-      RELEASE_TAG: ${{ inputs.RELEASE_TAG }}
-      SNAPSHOT_TAG: ${{ inputs.SNAPSHOT_TAG }}
-      BASE: ${{ inputs.BASE }}
\ No newline at end of file
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
deleted file mode 100644
index 73c55b0..0000000
--- a/.github/workflows/tag.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Tagging of repos
-
-on:
-  workflow_dispatch:
-    inputs:
-      TAG:
-        description: 'Tag to be published'
-        required: true
-        type: string
-      BODY:
-        description: 'Release body message'
-        required: true
-        default: 'Changes in this Release'
-        type: string
-      PRE_RELEASE:
-        description: 'Pre-release? True/False'
-        required: true
-        default: False
-        type: string
-      DRAFT:
-        description: 'Draft? True/False'
-        required: false
-        default: False
-        type: string
-
-jobs:
-  tag-branch:
-    uses: mosip/kattu/.github/workflows/tag.yml@master
-    with:
-      TAG: ${{ inputs.TAG }}
-      BODY: ${{ inputs.BODY }}
-      PRE_RELEASE: ${{ inputs.PRE_RELEASE }}
-      DRAFT: ${{ inputs.DRAFT }}
\ No newline at end of file