--- /home/mchoma/task/EAP7-1484/templates/eap-xp1-third-party-db-s2i.json
+++ /home/mchoma/task/EAP7-1484/templates/eap73-openjdk11-third-party-db-s2i.json
@@ -4,42 +4,42 @@
     "metadata": {
         "annotations": {
             "iconClass": "icon-eap",
-            "tags": "eap,eap-xp,javaee,java,jboss",
-            "version": "1.0",
-            "openshift.io/display-name": "JBoss EAP XP 1.0 and 3rd party DB driver template",
+            "tags": "eap,javaee,java,jboss",
+            "version": "7.3",
+            "openshift.io/display-name": "JBoss EAP 7.3 (OpenJDK 11) with passthrough TLS & DB driver examples",
             "openshift.io/provider-display-name": "Red Hat, Inc.",
-            "description": "Example of a JBoss EAP XP application with a 3rd party database. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-openshift-templates/blob/eap-xp1/README.adoc",
+            "description": "An example JBoss Enterprise Application Platform application. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/7.3.x/README.adoc.",
             "template.openshift.io/long-description": "This template defines resources needed to develop JBoss Enterprise Application Server based application, including a build configuration, application deployment configuration, using third-party DB drivers and secure communication using passthrough TLS.",
             "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/",
             "template.openshift.io/support-url": "https://access.redhat.com"
         },
-        "name": "eap-xp1-third-party-db-s2i"
+        "name": "eap73-openjdk11-third-party-db-s2i"
     },
     "labels": {
-        "template": "eap-xp1-third-party-db-s2i",
-        "xpaas": "1.0"
+        "template": "eap73-openjdk11-third-party-db-s2i",
+        "xpaas": "7.3"
     },
-    "message": "A new EAP based application with SSL support has been created in your project. Please be sure to create the following secrets:\"${CONFIGURATION_NAME}\" containing the datasource configuration details required by the deployed application(s); \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
+    "message": "A new EAP based application with SSL support has been created in your project. Please be sure to create the following secrets:\"${CONFIGURATION_NAME}\" containing the datasource configuration details required by the deployed application(s);  \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
     "parameters": [
         {
             "displayName": "Application Name",
             "description": "The name for the application.",
             "name": "APPLICATION_NAME",
-            "value": "eap-xp1-db-app",
-            "required": true
-        },
-        {
-            "displayName": "EAP XP Image Name",
-            "description": "EAP XP imagestream tag to use, example: jboss-eap-xp1-openjdk11-openshift:1.0",
+            "value": "eap-app",
+            "required": true
+        },
+        {
+            "displayName": "EAP Image Name",
+            "description": "Name of the EAP image to use, example: jboss-eap73-openjdk11-openshift:7.3",
             "name": "EAP_IMAGE_NAME",
-            "value": "jboss-eap-xp1-openjdk11-openshift:1.0",
-            "required": true
-        },
-        {
-            "displayName": "EAP XP Runtime Image Name",
-            "description": "EAP XP Runtime imagestream tag to use, example: jboss-eap-xp1-openjdk11-runtime-openshift:1.0",
+            "value": "jboss-eap73-openjdk11-openshift:7.3",
+            "required": true
+        },
+        {
+            "displayName": "EAP Runtime Image Name",
+            "description": "Name of the EAP image to use, example: jboss-eap73-openjdk11-runtime-openshift:7.3",
             "name": "EAP_RUNTIME_IMAGE_NAME",
-            "value": "jboss-eap-xp1-openjdk11-runtime-openshift:1.0",
+            "value": "jboss-eap73-openjdk11-runtime-openshift:7.3",
             "required": true
         },
         {
@@ -50,6 +50,13 @@
             "required": true
         },
         {
+            "displayName": "Custom https Route Hostname",
+            "description": "Custom hostname for https service route.  Leave blank for default hostname, e.g.: secure-<application-name>-<project>.<default-domain-suffix>",
+            "name": "HOSTNAME_HTTPS",
+            "value": "",
+            "required": false
+        },
+        {
             "displayName": "Git Repository URL",
             "description": "Git source URI for application",
             "name": "SOURCE_REPOSITORY_URL",
@@ -60,7 +67,7 @@
             "displayName": "Git Reference",
             "description": "Git branch/tag reference",
             "name": "SOURCE_REPOSITORY_REF",
-            "value": "1.5",
+            "value": "1.3",
             "required": false
         },
         {
@@ -85,9 +92,9 @@
         },
         {
             "displayName": "Drivers ImageStreamTag",
-            "description": "ImageStreamTag definition for the image containing the drivers and configuration, e.g. jboss-datavirt64-driver-openshift:1.7",
+            "description": "ImageStreamTag definition for the image containing the drivers and configuration, e.g. jboss-datavirt63-driver-openshift:1.1",
             "name": "EXTENSIONS_IMAGE",
-            "value": "jboss-datavirt64-driver-openshift:1.7",
+            "value": "jboss-datavirt63-driver-openshift:1.1",
             "required": true
         },
         {
@@ -116,6 +123,41 @@
             "description": "Topic names, separated by commas. These topics will be automatically created when the broker starts. Also, they will be made accessible as JNDI resources in EAP. Note that all topics used by the application *must* be specified here in order to be created automatically on the remote AMQ broker.",
             "name": "MQ_TOPICS",
             "value": "",
+            "required": false
+        },
+        {
+            "displayName": "Server Keystore Secret Name",
+            "description": "The name of the secret containing the keystore file",
+            "name": "HTTPS_SECRET",
+            "value": "eap-app-secret",
+            "required": true
+        },
+        {
+            "displayName": "Server Keystore Filename",
+            "description": "The name of the keystore file within the secret",
+            "name": "HTTPS_KEYSTORE",
+            "value": "keystore.jks",
+            "required": false
+        },
+        {
+            "displayName": "Server Keystore Type",
+            "description": "The type of the keystore file (JKS or JCEKS)",
+            "name": "HTTPS_KEYSTORE_TYPE",
+            "value": "",
+            "required": false
+        },
+        {
+            "displayName": "Server Certificate Name",
+            "description": "The name associated with the server certificate",
+            "name": "HTTPS_NAME",
+            "value": "jboss",
+            "required": false
+        },
+        {
+            "displayName": "Server Keystore Password",
+            "description": "The password for the keystore and certificate",
+            "name": "HTTPS_PASSWORD",
+            "value": "mykeystorepass",
             "required": false
         },
         {
@@ -203,7 +245,7 @@
             "displayName": "Maven Additional Arguments",
             "description": "Maven additional arguments to use for S2I builds",
             "name": "MAVEN_ARGS_APPEND",
-            "value": "-Dcom.redhat.xpaas.repo.jbossorg -Dcom.redhat.xpaas.repo.redhatga",
+            "value": "",
             "required": false
         },
         {
@@ -220,7 +262,30 @@
         }
     ],
     "objects": [
-
+        {
+            "kind": "Service",
+            "apiVersion": "v1",
+            "spec": {
+                "ports": [
+                    {
+                        "port": 8080,
+                        "targetPort": 8080
+                    }
+                ],
+                "selector": {
+                    "deploymentConfig": "${APPLICATION_NAME}"
+                }
+            },
+            "metadata": {
+                "name": "${APPLICATION_NAME}",
+                "labels": {
+                    "application": "${APPLICATION_NAME}"
+                },
+                "annotations": {
+                    "description": "The web server's http port."
+                }
+            }
+        },
         {
             "kind": "Service",
             "apiVersion": "v1",
@@ -275,23 +340,42 @@
         {
             "kind": "Route",
             "apiVersion": "v1",
-            "id": "${APPLICATION_NAME}-https",
+            "id": "${APPLICATION_NAME}-http",
             "metadata": {
                 "name": "${APPLICATION_NAME}",
                 "labels": {
                     "application": "${APPLICATION_NAME}"
                 },
                 "annotations": {
-                    "description": "Route for application's https service."
+                    "description": "Route for application's http service."
                 }
             },
             "spec": {
                 "to": {
                     "name": "${APPLICATION_NAME}"
+                }
+            }
+        },
+        {
+            "kind": "Route",
+            "apiVersion": "v1",
+            "id": "${APPLICATION_NAME}-https",
+            "metadata": {
+                "name": "secure-${APPLICATION_NAME}",
+                "labels": {
+                    "application": "${APPLICATION_NAME}"
+                },
+                "annotations": {
+                    "description": "Route for application's https service."
+                }
+            },
+            "spec": {
+                "host": "${HOSTNAME_HTTPS}",
+                "to": {
+                    "name": "secure-${APPLICATION_NAME}"
                 },
                 "tls": {
-                    "insecureEdgeTerminationPolicy": "Redirect",
-                    "termination": "edge"
+                    "termination": "passthrough"
                 }
             }
         },
@@ -544,6 +628,11 @@
                                     {
                                         "name": "configuration",
                                         "mountPath": "/etc/eap-environment",
+                                        "readOnly": true
+                                    },
+                                    {
+                                        "name": "eap-keystore-volume",
+                                        "mountPath": "/etc/eap-secret-volume",
                                         "readOnly": true
                                     },
                                     {
@@ -612,6 +701,26 @@
                                         "value": "/etc/eap-environment/*"
                                     },
                                     {
+                                        "name": "HTTPS_KEYSTORE_DIR",
+                                        "value": "/etc/eap-secret-volume"
+                                    },
+                                    {
+                                        "name": "HTTPS_KEYSTORE",
+                                        "value": "${HTTPS_KEYSTORE}"
+                                    },
+                                    {
+                                        "name": "HTTPS_KEYSTORE_TYPE",
+                                        "value": "${HTTPS_KEYSTORE_TYPE}"
+                                    },
+                                    {
+                                        "name": "HTTPS_NAME",
+                                        "value": "${HTTPS_NAME}"
+                                    },
+                                    {
+                                        "name": "HTTPS_PASSWORD",
+                                        "value": "${HTTPS_PASSWORD}"
+                                    },
+                                    {
                                         "name": "MQ_CLUSTER_PASSWORD",
                                         "value": "${MQ_CLUSTER_PASSWORD}"
                                     },
@@ -666,6 +775,12 @@
                                 }
                             },
                             {
+                                "name": "eap-keystore-volume",
+                                "secret": {
+                                    "secretName": "${HTTPS_SECRET}"
+                                }
+                            },
+                            {
                                 "name": "eap-jgroups-keystore-volume",
                                 "secret": {
                                     "secretName": "${JGROUPS_ENCRYPT_SECRET}"