diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
index 88a63b14c44a7..27a675955041c 100644
--- a/eng/jacoco-test-coverage/pom.xml
+++ b/eng/jacoco-test-coverage/pom.xml
@@ -225,7 +225,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-sdk-template</artifactId>
-      <version>1.0.4-beta.20</version> <!-- {x-version-update;com.azure:azure-sdk-template;current} -->
+      <version>1.0.4-beta.25</version> <!-- {x-version-update;com.azure:azure-sdk-template;current} -->
     </dependency>
 
     <dependency>
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 23e1e2c3d3941..ef828b3ab10b2 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -107,8 +107,8 @@ jobs:
         displayName: 'Build and Package , JDK Version: $(JavaBuildVersion)'
         inputs:
           mavenPomFile: pom.xml
-          goals: 'package'
-          options: '$(DefaultOptions) "-DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -DskipTests -Dinject-codesnippets -Dgenerate-overview -pl $(ProjectList) -am' # We include template-module so we ensure it always builds in CI
+          goals: 'deploy'
+          options: '$(DefaultOptions) -DskipTests -Dinject-codesnippets -Dgenerate-overview -Dspotbugs.skip=true -Dcheckstyle.skip=true -Drevapi.skip=true -pl $(ProjectList) -am -DaltDeploymentRepository=id::default::file://$(Build.ArtifactStagingDirectory)' # We include template-module so we ensure it always builds in CI
           mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: $(JavaBuildVersion)
diff --git a/eng/pipelines/templates/steps/stage-artifacts.yml b/eng/pipelines/templates/steps/stage-artifacts.yml
index 61929573655fa..129684dbd65aa 100644
--- a/eng/pipelines/templates/steps/stage-artifacts.yml
+++ b/eng/pipelines/templates/steps/stage-artifacts.yml
@@ -6,5 +6,10 @@ parameters:
 steps:
   - pwsh: |
       New-Item -Force -Type Directory -Name ${{parameters.TargetFolder}} -Path $(Pipeline.Workspace)
-      Copy-Item $(Pipeline.Workspace)/${{parameters.SourceFolder}}/${{parameters.PackageName}}-[0-9]*.[0-9]*.[0-9]* $(Pipeline.Workspace)/${{parameters.TargetFolder}}
-    displayName: Stage artifacts
\ No newline at end of file
+      $items = Get-ChildItem -Recurse -Path $(Pipeline.Workspace)/${{parameters.SourceFolder}} 
+      Write-Host "Found $($items.Count) total items in source folder"
+      $filteredItems = $items | Where-Object -FilterScript { $_.Name -like "${{parameters.PackageName}}-[0-9]*.[0-9]*.[0-9]*-*" }      
+      Write-Host "Found $($filteredItems.Count) items which match filter criteria"
+      $filteredItems | Copy-Item -Destination $(Pipeline.Workspace)/${{parameters.TargetFolder}}
+      Get-ChildItem $(Pipeline.Workspace)/${{parameters.TargetFolder}}
+    displayName: Stage artifacts
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index f01fead1e5042..93d2bbdc12734 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -35,7 +35,7 @@ com.azure:azure-search-documents;11.0.0;11.1.0-beta.1
 com.azure:azure-security-keyvault-certificates;4.0.4;4.1.0-beta.4
 com.azure:azure-security-keyvault-keys;4.1.4;4.2.0-beta.5
 com.azure:azure-security-keyvault-secrets;4.1.4;4.2.0-beta.4
-com.azure:azure-sdk-template;1.0.4-beta.19;1.0.4-beta.20
+com.azure:azure-sdk-template;1.0.4-beta.24;1.0.4-beta.25
 com.azure:azure-spring-data-cosmos;3.0.0-beta.1;3.0.0-beta.1
 com.azure:azure-storage-blob;12.8.0-beta.1;12.8.0-beta.2
 com.azure:azure-storage-blob-batch;12.6.0-beta.1;12.6.0-beta.2
diff --git a/sdk/template/azure-sdk-template/CHANGELOG.md b/sdk/template/azure-sdk-template/CHANGELOG.md
index aeecf4eeebd08..4ecf7ed2d7ff0 100644
--- a/sdk/template/azure-sdk-template/CHANGELOG.md
+++ b/sdk/template/azure-sdk-template/CHANGELOG.md
@@ -1,6 +1,21 @@
 # Release History
 
-## 1.0.4-beta.20 (Unreleased)
+## 1.0.4-beta.25 (Unreleased)
+
+## 1.0.4-beta.24 (2020-07-13)
+- Test Java Release Pipeline (normal docs, normal sources)
+
+## 1.0.4-beta.23 (2020-07-13)
+- Test Java Release Pipeline (normal docs, normal sources)
+
+## 1.0.4-beta.22 (2020-07-13)
+- Test Java Release Pipeline (normal docs, normal sources)
+
+## 1.0.4-beta.21 (2020-07-13)
+- Test Java Release Pipeline (normal docs, normal sources)
+
+## 1.0.4-beta.20 (2020-07-13)
+- Test Java Release Pipeline (normal docs, normal sources)
 
 ## 1.0.4-beta.19 (2020-05-20)
 - Test Java Release Pipeline (normal docs, normal sources)
diff --git a/sdk/template/azure-sdk-template/pom.xml b/sdk/template/azure-sdk-template/pom.xml
index a8087f8d000be..8e9f67f7e9b45 100644
--- a/sdk/template/azure-sdk-template/pom.xml
+++ b/sdk/template/azure-sdk-template/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-sdk-template</artifactId>
-  <version>1.0.4-beta.20</version> <!-- {x-version-update;com.azure:azure-sdk-template;current} -->
+  <version>1.0.4-beta.25</version> <!-- {x-version-update;com.azure:azure-sdk-template;current} -->
 
   <name>Microsoft Azure SDK for Template</name>
   <description>This package contains Microsoft Azure SDK for Template.</description>