diff --git a/app/Controllers/Provision.php b/app/Controllers/Provision.php
index 72440a6..4fe5e8b 100644
--- a/app/Controllers/Provision.php
+++ b/app/Controllers/Provision.php
@@ -170,27 +170,29 @@ class Provision extends BaseController
             $prov_name = str_replace(".", "_", $pr->internal_url) . ".yml";
             $template_file = $ansible_folder . "/templates/" . $pr->product_id . ".yml";
             //Get the domposer template file
+            $destinationHomeFolder = $_ENV['DESTINATION_HOME_FOLDER'] . $ContainerName;
             $composer_template_contents = file_get_contents($composer_template_path);
             // Do the processing
-            $composer_template_contents = str_replace("WHAT_CONTAINER_NAME", $ContainerName, $composer_template_contents);
+            // $composer_template_contents = str_replace("WHAT_CONTAINER_NAME", $ContainerName, $composer_template_contents);
             //$destinationHomeFolder = "/home/chiefsoft/SITES/" . $ContainerName;
-            $SITE_CONTENTS_GATEWAY = $_ENV['SITE_CONTENTS_GATEWAY'];
-            $SITE_CONTACT_GATEWAY = $_ENV['SITE_CONTACT_GATEWAY'];
-            $MYSQL_PROVISION_DATABASE_PORT = $_ENV['PROVISION_MSQL_DATABASE_IP'] . ":" . $_ENV['PROVISION_MSQL_DATABASE_PORT']; //   "172.16.4.96:3307";
-            $destinationHomeFolder = $_ENV['DESTINATION_HOME_FOLDER'] . $ContainerName;
-            $composer_template_contents = str_replace("DESTINATION_FOLDER", $destinationHomeFolder, $composer_template_contents);
-            $composer_template_contents = str_replace("ALLOCATED_PORT", $allocatedPort, $composer_template_contents);
-            $composer_template_contents = str_replace("CNT_DB_NAME", $ContainerName, $composer_template_contents);
-            $composer_template_contents = str_replace("CNT_DB_PASS", $provisionUID, $composer_template_contents);
-            $composer_template_contents = str_replace("CNT_DB_DATA", $MYSQL_PROVISION_DATABASE_PORT, $composer_template_contents);
-            $composer_template_contents = str_replace("PROVISION_UID_REPLACE", $provisionUID, $composer_template_contents);
-            $composer_template_contents = str_replace("PROVISION_IMAGE_NAME_REPLACE", "registry.chiefsoft.com/pweb/pweb-01-merms-pweb0006c:latest", $composer_template_contents);
-            $composer_template_contents = str_replace("SITE_CONTENTS_URL_REPLACE", $SITE_CONTENTS_GATEWAY, $composer_template_contents);
-            $composer_template_contents = str_replace("SITE_CONTACT_URL_REPLACE", $SITE_CONTACT_GATEWAY, $composer_template_contents);
-
-            $templateRandom = 'P' . rand(1, 6);
-            $composer_template_contents = str_replace("TEMPLATE_NAME_REPLACE", $templateRandom, $composer_template_contents);
+//            $SITE_CONTENTS_GATEWAY = $_ENV['SITE_CONTENTS_GATEWAY'];
+//            $SITE_CONTACT_GATEWAY = $_ENV['SITE_CONTACT_GATEWAY'];
+//            $MYSQL_PROVISION_DATABASE_PORT = $_ENV['PROVISION_MSQL_DATABASE_IP'] . ":" . $_ENV['PROVISION_MSQL_DATABASE_PORT']; //   "172.16.4.96:3307";
+//            $destinationHomeFolder = $_ENV['DESTINATION_HOME_FOLDER'] . $ContainerName;
+//            $composer_template_contents = str_replace("DESTINATION_FOLDER", $destinationHomeFolder, $composer_template_contents);
+//            $composer_template_contents = str_replace("ALLOCATED_PORT", $allocatedPort, $composer_template_contents);
+//            $composer_template_contents = str_replace("CNT_DB_NAME", $ContainerName, $composer_template_contents);
+//            $composer_template_contents = str_replace("CNT_DB_PASS", $provisionUID, $composer_template_contents);
+//            $composer_template_contents = str_replace("CNT_DB_DATA", $MYSQL_PROVISION_DATABASE_PORT, $composer_template_contents);
+//            $composer_template_contents = str_replace("PROVISION_UID_REPLACE", $provisionUID, $composer_template_contents);
+//            $composer_template_contents = str_replace("PROVISION_IMAGE_NAME_REPLACE", "registry.chiefsoft.com/pweb/pweb-01-merms-pweb0006c:latest", $composer_template_contents);
+//            $composer_template_contents = str_replace("SITE_CONTENTS_URL_REPLACE", $SITE_CONTENTS_GATEWAY, $composer_template_contents);
+//            $composer_template_contents = str_replace("SITE_CONTACT_URL_REPLACE", $SITE_CONTACT_GATEWAY, $composer_template_contents);
+//
+//            $templateRandom = 'P' . rand(1, 6);
+//            $composer_template_contents = str_replace("TEMPLATE_NAME_REPLACE", $templateRandom, $composer_template_contents);
 
+            $composer_template_contents = $this->prepareTemplateFile($composer_template_contents, $ContainerName, $allocatedPort, $provisionUID);
 
             //Save to the specific path
             $destination_composer_path = $ansible_folder . "/parts/" . $provisionUID . "/docker-compose.yml";
@@ -222,7 +224,7 @@ class Provision extends BaseController
         $MYSQL_PROVISION_DATABASE_PORT = $_ENV['PROVISION_MSQL_DATABASE_IP'] . ":" . $_ENV['PROVISION_MSQL_DATABASE_PORT']; //   "172.16.4.96:3307";
         $destinationHomeFolder = $_ENV['DESTINATION_HOME_FOLDER'] . $ContainerName;
         $templateRandom = 'P' . rand(1, 6);
-
+        $composer_template_contents = str_replace("WHAT_CONTAINER_NAME", $ContainerName, $composer_template_contents);
         $composer_template_contents = str_replace("DESTINATION_FOLDER", $destinationHomeFolder, $composer_template_contents);
         $composer_template_contents = str_replace("ALLOCATED_PORT", $allocatedPort, $composer_template_contents);
         $composer_template_contents = str_replace("CNT_DB_NAME", $ContainerName, $composer_template_contents);
@@ -397,27 +399,31 @@ class Provision extends BaseController
         $prov_name = str_replace(".", "_", $internal_url) . ".yml";
         $template_file = $ansible_folder . "/templates/" . $productId . ".yml";
         //Get the domposer template file
+        $destinationHomeFolder = $_ENV['DESTINATION_HOME_FOLDER'] . $ContainerName;
         $composer_template_contents = file_get_contents($composer_template_path);
         // Do the processing
-        $composer_template_contents = str_replace("WHAT_CONTAINER_NAME", $ContainerName, $composer_template_contents);
-        //$destinationHomeFolder = "/home/chiefsoft/SITES/" . $ContainerName;
-        $SITE_CONTENTS_GATEWAY = $_ENV['SITE_CONTENTS_GATEWAY'];
-        $SITE_CONTACT_GATEWAY = $_ENV['SITE_CONTACT_GATEWAY'];
-        $MYSQL_PROVISION_DATABASE_PORT = $_ENV['PROVISION_MSQL_DATABASE_IP'] . ":" . $_ENV['PROVISION_MSQL_DATABASE_PORT']; //   "172.16.4.96:3307";
-        $destinationHomeFolder = $_ENV['DESTINATION_HOME_FOLDER'] . $ContainerName;
-        $composer_template_contents = str_replace("DESTINATION_FOLDER", $destinationHomeFolder, $composer_template_contents);
-        $composer_template_contents = str_replace("ALLOCATED_PORT", $allocatedPort, $composer_template_contents);
-        $composer_template_contents = str_replace("CNT_DB_NAME", $ContainerName, $composer_template_contents);
-        $composer_template_contents = str_replace("CNT_DB_PASS", $provisionUID, $composer_template_contents);
-        $composer_template_contents = str_replace("CNT_DB_DATA", $MYSQL_PROVISION_DATABASE_PORT, $composer_template_contents);
-        $composer_template_contents = str_replace("PROVISION_UID_REPLACE", $provisionUID, $composer_template_contents);
-        $composer_template_contents = str_replace("PROVISION_IMAGE_NAME_REPLACE", "registry.chiefsoft.com/pweb/pweb-01-merms-pweb0006c:latest", $composer_template_contents);
-        $composer_template_contents = str_replace("SITE_CONTENTS_URL_REPLACE", $SITE_CONTENTS_GATEWAY, $composer_template_contents);
-        $composer_template_contents = str_replace("SITE_CONTACT_URL_REPLACE", $SITE_CONTACT_GATEWAY, $composer_template_contents);
+//        $composer_template_contents = str_replace("WHAT_CONTAINER_NAME", $ContainerName, $composer_template_contents);
+//        //$destinationHomeFolder = "/home/chiefsoft/SITES/" . $ContainerName;
+//        $SITE_CONTENTS_GATEWAY = $_ENV['SITE_CONTENTS_GATEWAY'];
+//        $SITE_CONTACT_GATEWAY = $_ENV['SITE_CONTACT_GATEWAY'];
+//        $MYSQL_PROVISION_DATABASE_PORT = $_ENV['PROVISION_MSQL_DATABASE_IP'] . ":" . $_ENV['PROVISION_MSQL_DATABASE_PORT']; //   "172.16.4.96:3307";
+//        $destinationHomeFolder = $_ENV['DESTINATION_HOME_FOLDER'] . $ContainerName;
+//        $composer_template_contents = str_replace("DESTINATION_FOLDER", $destinationHomeFolder, $composer_template_contents);
+//        $composer_template_contents = str_replace("ALLOCATED_PORT", $allocatedPort, $composer_template_contents);
+//        $composer_template_contents = str_replace("CNT_DB_NAME", $ContainerName, $composer_template_contents);
+//        $composer_template_contents = str_replace("CNT_DB_PASS", $provisionUID, $composer_template_contents);
+//        $composer_template_contents = str_replace("CNT_DB_DATA", $MYSQL_PROVISION_DATABASE_PORT, $composer_template_contents);
+//        $composer_template_contents = str_replace("PROVISION_UID_REPLACE", $provisionUID, $composer_template_contents);
+//        $composer_template_contents = str_replace("PROVISION_IMAGE_NAME_REPLACE", "registry.chiefsoft.com/pweb/pweb-01-merms-pweb0006c:latest", $composer_template_contents);
+//        $composer_template_contents = str_replace("SITE_CONTENTS_URL_REPLACE", $SITE_CONTENTS_GATEWAY, $composer_template_contents);
+//        $composer_template_contents = str_replace("SITE_CONTACT_URL_REPLACE", $SITE_CONTACT_GATEWAY, $composer_template_contents);
+//
+//
+//        $templateRandom = 'P' . rand(1, 6);
+//        $composer_template_contents = str_replace("TEMPLATE_NAME_REPLACE", $templateRandom, $composer_template_contents);
+//
+        $composer_template_contents = $this->prepareTemplateFile($composer_template_contents, $ContainerName, $allocatedPort, $provisionUID);
 
-
-        $templateRandom = 'P' . rand(1, 6);
-        $composer_template_contents = str_replace("TEMPLATE_NAME_REPLACE", $templateRandom, $composer_template_contents);
         //Save to the specific path
         $composerFile = fopen($destination_composer_path, "w") or die("Unable to open file!");
         fwrite($composerFile, $composer_template_contents);