diff --git a/templates/rhpam70-authoring.yaml b/templates/rhpam70-authoring.yaml
index b80fe54d..8ff57bd9 100644
--- a/templates/rhpam70-authoring.yaml
+++ b/templates/rhpam70-authoring.yaml
@@ -8,9 +8,9 @@ metadata:
     tags: rhpam,jboss,xpaas
     version: 1.4.0
     openshift.io/display-name: Red Hat Process Automation Manager 7.0 authoring environment (non-HA, persistent, with https)
-  name: rhpam70-full-persistent
+  name: rhpam70-authoring
 labels:
-  template: rhpam70-full-persistent
+  template: rhpam70-authoring
   xpaas: 1.4.0
 message: A new persistent Process Automation Manager application have been created in your project.
   The username/password for accessing the KIE Server / Business Central interface is ${KIE_ADMIN_USER}/${KIE_ADMIN_PWD}.
@@ -253,15 +253,6 @@ parameters:
   description: Fully qualified URL to a Maven repository. If unspecified, will fall back to Business Central service.
   name: MAVEN_REPO_URL
   required: false
-- displayName: Maven repository username
-  description: Username to access the Maven repository. If using Business Central, will have to match KIE_ADMIN_USER. No default specified.
-  name: MAVEN_REPO_USERNAME
-  value: adminUser
-  required: false
-- displayName: Maven repository password
-  description: Password to access the Maven repository. If using Business Central, will have to match KIE_ADMIN_PWD. No default specified.
-  name: MAVEN_REPO_PASSWORD
-  required: false
 - displayName: Business Central Volume Capacity
   description: Size of the persistent storage for Business Central's runtime data.
   name: BUSINESS_CENTRAL_VOLUME_CAPACITY
@@ -626,9 +617,9 @@ objects:
           - name: MAVEN_REPO_PATH
             value: "/maven2/"
           - name: MAVEN_REPO_USERNAME
-            value: "${MAVEN_REPO_USERNAME}"
+            value: "${KIE_ADMIN_USER}"
           - name: MAVEN_REPO_PASSWORD
-            value: "${MAVEN_REPO_PASSWORD}"
+            value: "${KIE_ADMIN_PWD}"
           - name: DB_SERVICE_PREFIX_MAPPING
             value: "${APPLICATION_NAME}-mysql=DB"
           - name: DB_JNDI