diff --git a/build/aro/openshift-templates/openshift-app-build-template.yml b/build/aro/openshift-templates/app-build-template.yml
similarity index 100%
rename from build/aro/openshift-templates/openshift-app-build-template.yml
rename to build/aro/openshift-templates/app-build-template.yml
diff --git a/build/aro/webapp-build-artifacts.yml b/build/aro/webapp-build-artifacts.yml
index b241f5b41..2f3687e3b 100644
--- a/build/aro/webapp-build-artifacts.yml
+++ b/build/aro/webapp-build-artifacts.yml
@@ -39,14 +39,8 @@ jobs:
   - task: CopyFiles@2
     displayName: 'Copy OpenShift App Build Template'
     inputs:
-      sourceFolder: '$(Build.SourcesDirectory)/build/aro'
-      contents: 'openshift-app-build-template.yml'
-      targetFolder: $(Build.ArtifactStagingDirectory)
-  - task: CopyFiles@2
-    displayName: 'Copy OpenShift Web App Deploy Template'
-    inputs:
-      sourceFolder: '$(Build.SourcesDirectory)/deploy/aro/openshift-templates'
-      contents: 'openshift-webapp-deploy-template.yml'
+      sourceFolder: '$(Build.SourcesDirectory)/build/aro/openshift-templates'
+      contents: 'app-build-template.yml'
       targetFolder: $(Build.ArtifactStagingDirectory)
   - task: PublishBuildArtifacts@1
     displayName: 'Publish Artifact: drop'