diff --git a/delete-serverless-service-build-pack/Jenkinsfile b/delete-serverless-service-build-pack/Jenkinsfile
index f21b7c7625..1dc34e2112 100644
--- a/delete-serverless-service-build-pack/Jenkinsfile
+++ b/delete-serverless-service-build-pack/Jenkinsfile
@@ -12,6 +12,7 @@ import groovy.transform.Field
 /**
  * The Service delete workflow for service types: API, function & website
 */
+
 @Field def configModule
 @Field def configLoader
 @Field def scmModule
@@ -26,7 +27,7 @@ import groovy.transform.Field
 @Field def service_config
 @Field def context_map = [:]
 @Field def is_service_deletion = true;
-
+@Field def current_environment_id
 node {
 	echo "Starting delete service job with params : $params"
 
@@ -82,10 +83,17 @@ node {
 			error "Service Id is not available."
 		}
 
+		if(!service_config){
+			error "Failed to fetch service metadata from catalog"
+		}
 		environmentMetadataLoader.initialize(service_config, configLoader, scmModule, null, env.BUILD_URL, env.BUILD_ID, g_base_url + "/jazz/environments", auth_token)
 		def environmentList = environmentMetadataLoader.getEnvironmentLogicalIds()
 		echo "Environment List: $environmentList"
 
+		if (!events) { error "Can't load events module"	} //Fail here
+		events.initialize(configLoader, service_config, "SERVICE_DELETION", "", "", g_base_url + "/jazz/events")
+		context_map = [created_by : service_config['created_by']]
+
 		if (environmentIds.size() > 0) {
 			//validate each id in environment catalog
 			for (_eId in environmentIds) {
@@ -99,11 +107,7 @@ node {
 			}
 		} else if (environmentList.size() == 0) {
 			echo "$repo_name doesn't contain any active environment logical id in environment catalog!"
-		}
-
-		if (!events) { error "Can't load events module"	} //Fail here
-		events.initialize(configLoader, service_config, "SERVICE_DELETION", "", "", g_base_url + "/jazz/events")
-		context_map = [created_by : service_config['created_by']]
+		}		
 
 		dir(repo_name){
 			echo "loadServerlessConfig......."
@@ -136,6 +140,7 @@ node {
 					updateServiceNameConfig()
 					def path = getResourcePath()
 					for (_envId in environmentIds) {
+						current_environment_id = _envId
 						try {
 							def branch = environmentMetadataLoader.getEnvironmentBranchName(_envId)
 							if (branch && branch != 'NA') {
@@ -164,6 +169,7 @@ node {
 					updateServiceNameConfig()
 
 					for (_envId in environmentIds) {
+						current_environment_id = _envId
 						try {
 							def branch = environmentMetadataLoader.getEnvironmentBranchName(_envId)
 							if (branch && branch != 'NA') {
@@ -186,6 +192,7 @@ node {
 			case "WEBSITE":
 				stage('Undeploy Website') {
 					for (_envId in environmentIds) {
+						current_environment_id = _envId
 						try {
 							def branch = environmentMetadataLoader.getEnvironmentBranchName(_envId)
 							echo "Branch ::: $branch"
@@ -224,16 +231,16 @@ node {
 }
 
 
-def handleFailureEvent(ex){
+def handleFailureEvent(errorMessage){
 	if (is_service_deletion) {
-		events.sendFailureEvent('DELETE_PROJECT', ex.getMessage(), context_map)
+		events.sendFailureEvent('DELETE_PROJECT', errorMessage, context_map)
 		send_status_email("FAILED")
-		error "deleteProject failed. "+ ex.getMessage()
+		error "deleteProject failed. "+ errorMessage
 	} else {
-		echo "error occured when Deleting  Environment: " + ex
+		echo "error occured when Deleting  Environment: " + errorMessage
 		send_status_email("FAILED")
-		events.sendFailureEvent('DELETE_ENVIRONMENT', ex.getMessage(), null, _envId)
-		error "Environment cleanup for " + _envId + " failed! " + ex.getMessage()
+		events.sendFailureEvent('DELETE_ENVIRONMENT', errorMessage, null, current_environment_id)
+		error "Environment cleanup for " + current_environment_id + " failed! " + errorMessage
 	}
 }
 
@@ -262,7 +269,7 @@ def unDeployService(stage) {
 
 			echo "Service undeployed"
 		} catch (ex) {
-			handleFailureEvent(ex)
+			handleFailureEvent(ex.getMessage())
 		}
 	}
 }
@@ -283,7 +290,7 @@ def checkoutSCM(repo_name) {
 					[credentialsId: configLoader.REPOSITORY.CREDENTIAL_ID, url: repo_url]
 				]])
 		} catch (ex) {
-			handleFailureEvent(ex)
+			error "checkout SCM failed."
 		}
 	}
 }
@@ -302,7 +309,7 @@ def updateServiceNameConfig() {
 		sh "sed -i -- 's/name: \${self:service}/name: ${configLoader.INSTANCE_PREFIX}-${service_config['domain']}-${service_config['service']}/g' serverless.yml"
 		writeServerlessFile()
 	} catch (ex) {
-		handleFailureEvent(ex)
+		handleFailureEvent(ex.getMessage())
 	}
 }
 
@@ -352,7 +359,7 @@ def updateSwaggerConfig() {
 			sh "sed -i -- 's/{conf-accId}/${roleId}/g' ./swagger/swagger.json"
 		}
 	} catch (ex) {
-		handleFailureEvent(ex)
+		handleFailureEvent(ex.getMessage())
 	}
 }
 
@@ -414,7 +421,7 @@ def cleanUpApiGatewayResources(stage, path) {
 					}
 				}
 			} catch (ex) {
-				handleFailureEvent(ex)
+				handleFailureEvent(ex.getMessage())
 			}
 			if (resource_id != null && resource_id != "") {
 				def status_json = sh(
@@ -432,7 +439,7 @@ def cleanUpApiGatewayResources(stage, path) {
 				echo "Resource Id does not exists in API gateway."
 			}
 		} catch (ex) {
-			handleFailureEvent(ex)
+			handleFailureEvent(ex.getMessage())
 		}
 	}
 }
@@ -493,7 +500,7 @@ def cleanUpApiDocs(stage) {
 			def apiRootFolder = getApiDocsFolder(stage)
 			sh "aws s3 rm s3://${apiRootFolder}/${service_config['domain']}/${service_config['service']}/${stage} --recursive"
 		} catch (ex) {
-			handleFailureEvent(ex)
+			handleFailureEvent(ex.getMessage())
 		}
 	}
 }
@@ -544,17 +551,48 @@ def getResourcePath() {
 		resourcepath = (basePath + "/" + pathInfo).replaceAll("//", "/")
 		return resourcepath
 	} catch (ex) {
-		handleFailureEvent(ex)
+		handleFailureEvent(ex.getMessage())
 	}
 }
 
+
+def generateAssetInfo(environment){
+	def assetInfo = [:]
+	def s3Bucket
+	def assetBase
+	
+	if (configLoader.JAZZ.BUCKET_PER_SERVICE == "true") {
+		if (service_config['s3_bucket_name']) {
+			s3Bucket = service_config['s3_bucket_name']
+		} else {
+			handleFailureEvent("Failed to get S3 bucket information from service catalog.")
+		}
+		assetBase = "${s3Bucket}"
+		assetInfo['asset_name'] = "${s3Bucket}-${environment}"
+	} else {
+		if (environment.endsWith("-dev")) {
+			s3Bucket = utilModule.getBucket('dev')
+		} else {
+			s3Bucket = utilModule.getBucket(environment)
+		}
+		assetBase = "${s3Bucket}/${service_config['domain']}-${service_config['service']}"
+		assetInfo['asset_name'] = "${s3Bucket}-${service_config['domain']}-${service_config['service']}-${environment}"
+	}
+
+	assetInfo['s3Bucket'] = s3Bucket
+	assetInfo['asset_info'] = "${assetBase}/${environment}"
+	assetInfo['folder_name'] = "${assetBase}"
+
+	return assetInfo
+}
+
 /**
  * Undeploy the website. Delete the web folder from S3 bucket
  * @param stage
  * @return
  */
 def unDeployWebsite(stage) {
-	echo "unDeployWebsite::${service_config['service']}::${['domain']} ${['stage']}"
+	echo "unDeployWebsite::${service_config['service']}::${service_config['domain']} ${stage}"
 
 	withCredentials([
 		[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: configLoader.AWS_CREDENTIAL_ID, secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']
@@ -565,27 +603,31 @@ def unDeployWebsite(stage) {
 			sh "aws configure set profile.cloud-api.aws_secret_access_key $AWS_SECRET_ACCESS_KEY"
 			sh "aws configure set preview.cloudfront true"
 
-			def bucketName
-			if (stage.endsWith("-dev")) {
-				bucketName = utilModule.getBucket('dev')
-			} else {
-				bucketName = utilModule.getBucket(stage)
-			}
-			echo "BucketName :: $bucketName" 
-			def bucketUrl = "${bucketName}/${service_config['domain']}-${service_config['service']}/${stage}"
-			echo "BucketURL :: $bucketUrl" 
-			def _exists = checkIfWebsiteExists(bucketUrl)
+			def assetInfo = generateAssetInfo(stage)
+			echo "BucketName :: ${assetInfo['s3Bucket']} and BucketURL :: ${assetInfo['asset_info']}" 
+			def _exists = checkIfWebsiteExists(assetInfo['asset_info'])
 			if (_exists) {
-				sh "aws s3 rm s3://${bucketUrl} --recursive"
-				cleanupS3BucketPolicy(stage, bucketName)
+				cleanupS3BucketPolicy(stage, assetInfo)
+				sh "aws s3 rm s3://${assetInfo['asset_info']} --recursive"				
 			}
-			def serviceS3FolderUrl = "${bucketName}/${service_config['domain']}-${service_config['service']}"
-			if (!checkIfBucketFolderHasObjects(serviceS3FolderUrl)) {
-				echo "Cleaning up service folder since service folder is empty:: $serviceS3FolderUrl"
-				sh "aws s3 rm s3://${serviceS3FolderUrl} --recursive"
+			def isEmpty 
+
+			if (configLoader.JAZZ.BUCKET_PER_SERVICE == "true") {
+				isEmpty = isBucketEmpty(assetInfo['folder_name'])
+			} else {
+				isEmpty = isBucketFolderEmpty(assetInfo['folder_name'])
+			}
+
+			if (_exists && isEmpty) {
+				echo "Cleaning up service folder since service folder is empty:: ${assetInfo['asset_info']}"
+				if (configLoader.JAZZ.BUCKET_PER_SERVICE == "true") {
+					sh "aws s3 rb s3://${assetInfo['folder_name']} --force"					
+				} else {
+					sh "aws s3 rm s3://${assetInfo['folder_name']} --recursive"
+				}
 			}
 		} catch (ex) {
-			handleFailureEvent(ex)
+			handleFailureEvent(ex.getMessage())
 		}
 	}
 }
@@ -606,13 +648,24 @@ def checkIfWebsiteExists(bucketUrl) {
 	return status
 }
 
-def checkIfBucketFolderHasObjects(bucketFolderName){
-	def status = true;
+def isBucketEmpty(bucketName){
+	def status = false;
+	try {
+		sh("aws s3api list-objects --bucket ${bucketName}  --output json --query '[length(Contents[])]'")
+	} catch (ex) {
+		echo "Bucket $bucketName is empty"
+		status = true
+	}
+	return status
+}
+
+def isBucketFolderEmpty(bucketFolderName){
+	def status = false;
 	try {
 		sh("aws s3 ls s3://${bucketFolderName}  --output json --query '[length(Contents[])]'")
 	} catch (ex) {
 		echo "Bucket $bucketFolderName is empty"
-		status = false
+		status = true
 	}
 	return status
 }
@@ -624,7 +677,7 @@ def checkIfBucketFolderHasObjects(bucketFolderName){
  * @param stage
  * @return
  */
-def cleanupS3BucketPolicy(stage, bucket) {
+def cleanupS3BucketPolicy(stage, assetInfo) {
 	echo "cleanupS3BucketPolicy called"
 
 	withCredentials([
@@ -635,9 +688,8 @@ def cleanupS3BucketPolicy(stage, bucket) {
 			sh "aws configure set profile.cloud-api.aws_access_key_id $AWS_ACCESS_KEY_ID"
 			sh "aws configure set profile.cloud-api.aws_secret_access_key $AWS_SECRET_ACCESS_KEY"
 			sh "aws configure set preview.cloudfront true"
-			def folderName = "${service_config['domain']}-${service_config['service']}/${stage}"
 			def bucketPolicy = sh(
-				script: "aws s3api get-bucket-policy --bucket ${bucket} --output json",
+				script: "aws s3api get-bucket-policy --bucket ${assetInfo['s3Bucket']} --output json",
 				returnStdout: true
 			).trim()
 			def policyObject = parseJson(parseJson(bucketPolicy).Policy)
@@ -645,23 +697,25 @@ def cleanupS3BucketPolicy(stage, bucket) {
 			policyObjectUpdated.Version = policyObject.Version
 			policyObjectUpdated.Id = policyObject.Id
 			def statements = []
-			def resourcePattern = "${bucket}/${folderName}/"
 			for (items in policyObject.Statement) {
-				if (items.Sid != folderName || !(items.Resource.indexOf(resourcePattern) > -1)) {
+				if ((items.Sid != "list-${assetInfo['asset_name']}")) {
 					def copy = [:]
 					copy.putAll(items)
 					statements.add(copy)
 				}
 			}
-			policyObjectUpdated.Statement = statements
-			def policy_json = JsonOutput.toJson(policyObjectUpdated)
-			//def bucketName = bucket
-			updateBucketPolicy(policy_json, bucket)
+
+			echo "updated Policy : $statements"
+			if (statements.size() > 0) {
+				policyObjectUpdated.Statement = statements
+				def policy_json = JsonOutput.toJson(policyObjectUpdated)
+				updateBucketPolicy(policy_json, assetInfo['s3Bucket'])
+			}
             resetCredentials()
 		} catch (ex) {
             resetCredentials()
 			if (ex.getMessage().indexOf("groovy.json.internal.LazyMap") < 0) {
-				handleFailureEvent(ex)
+				handleFailureEvent(ex.getMessage())
 			}
 		}
 	}
@@ -684,7 +738,7 @@ def updateBucketPolicy(policy_json, bucketName){
 				--bucket "+ bucketName + " \
 				--policy \'${policy_json}\'"
 	} catch (e) {
-		handleFailureEvent(ex)
+		handleFailureEvent(ex.getMessage())
 	}
 }
 /**
@@ -718,44 +772,47 @@ def cleanupCloudFrontDistribution(stage) {
 			if ((ex.getMessage()).indexOf("getDistributionId Failed") > -1) {
 				echo "Could not find a CloudFront distribution Id for service: ${service_config['service']} and environment $stage"
 			} else {
-				handleFailureEvent(ex)
+				handleFailureEvent(ex.getMessage())
 			}
 		}
 	}
-
 }
 
 /**
- * Get the CloudFront distribution Id corresponding to the service
- * @param service
- * @param stage
- * @return
+ * Get dist Id if exists
+ *
  */
-def getDistributionId(stage) {
+def getDistributionId(environment) {
 	def distributionID
-	def outputStr
 	try {
-		def cloudFrontId = "${configLoader.INSTANCE_PREFIX}-${stage}-static-website-origin-${service_config['domain']}-${service_config['service']}"
-		echo "CloudFront ID: $cloudFrontId"
-		outputStr = sh(
-			script: "aws cloudfront list-distributions \
-				--output json \
-				--query \"DistributionList.Items[?Origins.Items[?Id=='${cloudFrontId}']].{Distribution:domainName, Id:Id}\"",
-			returnStdout: true
-		)
-
+		def outputStr = listDistribution(environment)
 		if (outputStr) {
+			echo "### OutputStr for getting Distribution Id: $outputStr"
 			def outputObj = new JsonSlurper().parseText(outputStr)
-
-			if (outputObj) {
+			if (outputObj && outputObj[0].Id) {
 				distributionID = outputObj[0].Id
 			}
 		}
+		return distributionID
 	} catch (ex) {
-		error "getDistributionId Failed: "+ ex.getMessage()
+		return distributionID
 	}
+}
 
-	return distributionID
+def listDistribution(environment){
+	def outputStr = null
+	def service = "${service_config['domain']}-${service_config['service']}"
+	try {
+		outputStr = sh(
+			script: "aws cloudfront list-distributions \
+				--output json \
+				--query \"DistributionList.Items[?Origins.Items[?Id=='${configLoader.INSTANCE_PREFIX}-${environment}-static-website-origin-$service']].{Distribution:DomainName, Id:Id}\"",
+			returnStdout: true
+		)
+		return outputStr
+	} catch (ex) {
+		return outputStr
+	}
 }
 
 /**
@@ -773,7 +830,7 @@ def getDistributionConfig(distributionID) {
 		)
 		return distributionConfig
 	} catch (ex) {
-		handleFailureEvent(ex)
+		handleFailureEvent(ex.getMessage())
 	}
 
 }
@@ -800,7 +857,7 @@ def generateDistributionConfigForDisable(distributionConfig) {
 		} catch (ex) { }
 		return eTag
 	} catch (ex) {
-		handleFailureEvent(ex)
+		handleFailureEvent(ex.getMessage())
 	}
 }
 
@@ -831,7 +888,7 @@ def disableCloudFrontDistribution(distributionID, _Etag, configFile, stage) {
 		echo "disable eTag...$eTag"
 		return eTag
 	} catch (ex) {
-		handleFailureEvent(ex)
+		handleFailureEvent(ex.getMessage())
 	}
 }
 
@@ -919,7 +976,7 @@ def setCredentials() {
 			return tokenJson_token
 		}
 		catch (e) {
-			handleFailureEvent(ex)
+			echo "Failed to fetch authentication details."
 		}
 	}
 }
@@ -930,7 +987,6 @@ def setCredentials() {
 * @return
 */
 def send_status_email (build_status) {
-	def email_id = ''
 
 	def email_content = ''
 	def body_subject = ''
@@ -956,12 +1012,12 @@ def send_status_email (build_status) {
 	}
 	def fromStr = 'Jazz Admin <' + configLoader.JAZZ.ADMIN + '>'
 	body = JsonOutput.toJson([
- 						 from : fromStr,
- 						 to : email_id,
- 						 subject : body_subject,
- 						 text : body_text,
- 						 cc : cc_email,
- 						 html : body_html
+		from : fromStr,
+		to : service_config['created_by'],
+        subject : body_subject,
+		text : body_text,
+		cc : cc_email,
+		html : body_html
 	])
  		 try {
 		def sendMail = sh(script: "curl -X POST \
diff --git a/jazz-build-module/service-configuration-data-loader.groovy b/jazz-build-module/service-configuration-data-loader.groovy
index eac6f7e297..c20fcab954 100644
--- a/jazz-build-module/service-configuration-data-loader.groovy
+++ b/jazz-build-module/service-configuration-data-loader.groovy
@@ -54,7 +54,22 @@ def loadServiceConfigurationData() {
 			sh "sed -i -- 's/{conf-jenkins-host}/${jenkins_url}/g' ./index.js"
 		}
 
-		if ( (service_name.trim() == "jazz_scm-webhook") ) {
+		if ( (service_name.trim() == "jazz_deployments") ) {
+			sh "sed -i -- 's/{conf_stack_prefix}/${config_loader.INSTANCE_PREFIX}/g' ./config/dev-config.json"
+			sh "sed -i -- 's/{conf_stack_prefix}/${config_loader.INSTANCE_PREFIX}/g' ./config/stg-config.json"
+			sh "sed -i -- 's/{conf_stack_prefix}/${config_loader.INSTANCE_PREFIX}/g' ./config/prod-config.json"
+		
+			sh "sed -i -- 's/{jazz_admin}/${config_loader.JAZZ.ADMIN}/g' ./config/dev-config.json"
+			sh "sed -i -- 's/{jazz_admin}/${config_loader.JAZZ.ADMIN}/g' ./config/stg-config.json"
+			sh "sed -i -- 's/{jazz_admin}/${config_loader.JAZZ.ADMIN}/g' ./config/prod-config.json"
+
+			sh "sed -i -- 's/{jazz_admin_creds}/${config_loader.JAZZ.PASSWD}/g' ./config/dev-config.json"
+			sh "sed -i -- 's/{jazz_admin_creds}/${config_loader.JAZZ.PASSWD}/g' ./config/stg-config.json"
+			sh "sed -i -- 's/{jazz_admin_creds}/${config_loader.JAZZ.PASSWD}/g' ./config/prod-config.json"
+		}
+
+		if ((service_name.trim() == "jazz_scm-webhook")) {
+
 			sh "sed -i -- 's/{conf-apikey}/${utilModule.getAPIIdForCore(config_loader.AWS.API["DEV"])}/g' ./config/dev-config.json"
 			sh "sed -i -- 's/{conf-apikey}/${utilModule.getAPIIdForCore(config_loader.AWS.API["STG"])}/g' ./config/stg-config.json"
 			sh "sed -i -- 's/{conf-apikey}/${utilModule.getAPIIdForCore(config_loader.AWS.API["PROD"])}/g' ./config/prod-config.json"
@@ -65,7 +80,7 @@ def loadServiceConfigurationData() {
 
 		}
 
-		if ( (service_name.trim() == "jazz_environments") ) {
+		if ((service_name.trim() == "jazz_environments")) {
 			sh "sed -i -- 's/{conf-apikey}/${utilModule.getAPIIdForCore(config_loader.AWS.API["DEV"])}/g' ./config/dev-config.json"
 			sh "sed -i -- 's/{conf-apikey}/${utilModule.getAPIIdForCore(config_loader.AWS.API["STG"])}/g' ./config/stg-config.json"
 			sh "sed -i -- 's/{conf-apikey}/${utilModule.getAPIIdForCore(config_loader.AWS.API["PROD"])}/g' ./config/prod-config.json"
@@ -101,6 +116,24 @@ def loadServiceConfigurationData() {
 			sh "sed -i -- 's/{jazz_admin_creds}/${config_loader.JAZZ.PASSWD}/g' ./config/prod-config.json"
 		}
 
+		if ((service_name.trim() == "jazz_deployments-event-handler")) {
+			sh "sed -i -- 's/{conf-apikey}/${utilModule.getAPIIdForCore(config_loader.AWS.API["DEV"])}/g' ./config/dev-config.json"
+			sh "sed -i -- 's/{conf-apikey}/${utilModule.getAPIIdForCore(config_loader.AWS.API["STG"])}/g' ./config/stg-config.json"
+			sh "sed -i -- 's/{conf-apikey}/${utilModule.getAPIIdForCore(config_loader.AWS.API["PROD"])}/g' ./config/prod-config.json"
+
+			sh "sed -i -- 's/{conf-region}/${region}/g' ./config/dev-config.json"
+			sh "sed -i -- 's/{conf-region}/${region}/g' ./config/stg-config.json"
+			sh "sed -i -- 's/{conf-region}/${region}/g' ./config/prod-config.json"
+
+			sh "sed -i -- 's/{jazz_admin}/${config_loader.JAZZ.ADMIN}/g' ./config/dev-config.json"
+			sh "sed -i -- 's/{jazz_admin}/${config_loader.JAZZ.ADMIN}/g' ./config/stg-config.json"
+			sh "sed -i -- 's/{jazz_admin}/${config_loader.JAZZ.ADMIN}/g' ./config/prod-config.json"
+			
+			sh "sed -i -- 's/{jazz_admin_creds}/${config_loader.JAZZ.PASSWD}/g' ./config/dev-config.json"
+			sh "sed -i -- 's/{jazz_admin_creds}/${config_loader.JAZZ.PASSWD}/g' ./config/stg-config.json"
+			sh "sed -i -- 's/{jazz_admin_creds}/${config_loader.JAZZ.PASSWD}/g' ./config/prod-config.json"
+		}
+
 		if ((service_name.trim() == "jazz_events")) {
 			sh "sed -i -- 's/{conf_stack_prefix}/${config_loader.INSTANCE_PREFIX}/g' ./config/dev-config.json"
 			sh "sed -i -- 's/{conf_stack_prefix}/${config_loader.INSTANCE_PREFIX}/g' ./config/stg-config.json"
@@ -180,7 +213,7 @@ def loadServiceConfigurationData() {
 			sh "sed -i -- 's/{jazz_admin_creds}/${config_loader.JAZZ.PASSWD}/g' ./config/prod-config.json"
 		}
 
-		if ((service_name.trim() == "jazz_delete-serverless-service") || (service_name.trim() == "jazz_create-serverless-service")) {
+		if ((service_name.trim() == "jazz_delete-serverless-service") || (service_name.trim() == "jazz_create-serverless-service") || (service_name.trim() == "jazz_deployments")) {
 			sh "sed -i -- 's/{conf-jenkins-host}/${jenkins_url}/g' ./config/dev-config.json"
 			sh "sed -i -- 's/{conf-jenkins-host}/${jenkins_url}/g' ./config/stg-config.json"
 			sh "sed -i -- 's/{conf-jenkins-host}/${jenkins_url}/g' ./config/prod-config.json"
@@ -305,7 +338,8 @@ def setUtilModule(util){
 	utilModule = util
 }
 def setKinesisStream(config){
-	if ((config['service'].trim() == "services-handler") || (config['service'].trim() == "events-handler") || (config['service'] == "environment-event-handler")) {
+	if ((config['service'].trim() == "services-handler") || (config['service'].trim() == "events-handler") || 
+	(config['service'] == "environment-event-handler") || (config['service'] == "deployments-event-handler")) {
 		def function_name = "${config_loader.INSTANCE_PREFIX}-${config['domain']}-${config['service']}-${current_environment}"
 		def event_source_list = sh(
 			script: "aws lambda list-event-source-mappings --query \"EventSourceMappings[?contains(FunctionArn, '$function_name')]\" --region \"$region\"",
diff --git a/jazz-ui/.gitignore b/jazz-ui/.gitignore
index 2dda819842..ded97c4823 100644
--- a/jazz-ui/.gitignore
+++ b/jazz-ui/.gitignore
@@ -30,4 +30,14 @@
 */target/
 .nyc_output/
 npm-debug.log
-*/package-lock.json
\ No newline at end of file
+*/package-lock.json
+testem.log
+/typings
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+
+#System Files
+.DS_Store
+Thumbs.db
diff --git a/jazz-ui/Jenkinsfile_Platform b/jazz-ui/Jenkinsfile_Platform
index f145af41d9..3943ebc549 100644
--- a/jazz-ui/Jenkinsfile_Platform
+++ b/jazz-ui/Jenkinsfile_Platform
@@ -74,16 +74,25 @@ node ()  {
     dir('jazz-ui') {
       checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: config_loader.REPOSITORY.CREDENTIAL_ID, url: scmModule.getCoreRepoCloneUrl("jazz-ui")]]])
 	    def jazz_prod_api_id = utilModule.getAPIIdForCore(config_loader.AWS.API["PROD"])
-     
+       
+      if(config_loader.UI_CONFIG.service_tabs.overview)   sh "sed -i 's/{overview}/overview/g' ./src/environments/environment.oss.ts";
+      if(config_loader.UI_CONFIG.service_tabs.access_control)   sh "sed -i 's/{access control}/access control/g' ./src/environments/environment.oss.ts";
+      if(config_loader.UI_CONFIG.service_tabs.metrics)   sh "sed -i 's/{metrics}/metrics/g' ./src/environments/environment.oss.ts";
+      if(config_loader.UI_CONFIG.service_tabs.cost)   sh "sed -i 's/{cost}/cost/g' ./src/environments/environment.oss.ts";
+      if(config_loader.UI_CONFIG.service_tabs.logs)       sh "sed -i 's/{logs}/logs/g' ./src/environments/environment.oss.ts";
+      if(config_loader.UI_CONFIG.environment_tabs.overview) sh "sed -i 's/{env_overview}/overview/g' ./src/environments/environment.oss.ts";
+      if(config_loader.UI_CONFIG.environment_tabs.deployments)  sh "sed -i 's/{deployments}/deployments/g' ./src/environments/environment.oss.ts";
+      if(config_loader.UI_CONFIG.environment_tabs.code_quality)  sh "sed -i 's/{code quality}/code quality/g' ./src/environments/environment.oss.ts";
+      if(config_loader.UI_CONFIG.environment_tabs.assets)  sh "sed -i 's/{assets}/assets/g' ./src/environments/environment.oss.ts";
+      if(config_loader.UI_CONFIG.environment_tabs.logs)  sh "sed -i 's/{env_logs}/logs/g' ./src/environments/environment.oss.ts";
 
       sh "sed -i 's/{api_doc_name}/${config_loader.AWS.S3.API_DOC}/g' ./src/environments/environment.oss.ts"
       sh "sed -i 's/{API_GATEWAY_KEY_PROD}/${jazz_prod_api_id}/g' ./src/environments/environment.oss.ts"
       sh "sed -i 's/{inst_region}/${config_loader.AWS.REGION}/g' ./src/environments/environment.oss.ts"
       sh "sed -i 's/{multi_env}/${config_loader.UI_CONFIG.feature.multi_env}/g' ./src/environments/environment.oss.ts"
-      sh "sed -i 's/{service_tabs}/${config_loader.UI_CONFIG.service_tabs}/g' ./src/environments/environment.oss.ts"
-      sh "sed -i 's/{environment_tabs}/${config_loader.UI_CONFIG.environment_tabs}/g' ./src/environments/environment.oss.ts"
-
+      
       def envFile = readFile('./src/environments/environment.oss.ts');
+      echo "displaying env file :"
       echo "$envFile";
     }
   }
diff --git a/jazz-ui/src/app/pages/environment-deployment/env-deployments-section.component.ts b/jazz-ui/src/app/pages/environment-deployment/env-deployments-section.component.ts
index 8fb3e20cad..56ce12b18c 100644
--- a/jazz-ui/src/app/pages/environment-deployment/env-deployments-section.component.ts
+++ b/jazz-ui/src/app/pages/environment-deployment/env-deployments-section.component.ts
@@ -7,7 +7,7 @@ import { Filter } from '../../secondary-components/jazz-table/jazz-filter';
 import { Sort } from '../../secondary-components/jazz-table/jazz-table-sort';
 import { ToasterService } from 'angular2-toaster';
 declare var $:any;
-import { environment } from './../../../environments/environment.internal';
+import { environment } from './../../../environments/environment';
 import { environment as env_internal } from './../../../environments/environment.internal';
 
 
@@ -457,8 +457,7 @@ export class EnvDeploymentsSectionComponent implements OnInit {
           window.open(url, '_blank');
       }
 
-  ngOnInit() {
-    
+  ngOnInit() {    
   }
 
   paginatePage(currentlyActivePage){
@@ -571,7 +570,7 @@ export class EnvDeploymentsSectionComponent implements OnInit {
 		this.paginatePage(this.currentlyActive);
  }
 
-  ngOnChanges(x:any) {
+  ngOnChanges(x:any) {   
     this.envObj = this.cache.get('currentEnv');
     this.status_val = parseInt(status[this.envObj.status]); 
 
@@ -619,13 +618,11 @@ toast_pop(error,oops,errorMessage)
 
 rebuild(){
   this.rowclick = false;
-  this.http.post('/jazz/deployments/'+this.rebuild_id+'/re-build').subscribe(
+  var rebuild_url = '/jazz/deployments/';
+  this.http.post(rebuild_url+this.rebuild_id+'/re-build').subscribe(
     (response) => {
-
       let successMessage = this.toastmessage.successMessage(response, "retryDeploy");
-
-      this.toast_pop('success',"",successMessage+this.service.name);
-      
+      this.toast_pop('success',"",successMessage+this.service.name);      
     },
     (error) => {
       let errorMessage = this.toastmessage.errorMessage(error, "updateObj");
diff --git a/jazz-ui/src/app/pages/environment-detail/environment-detail.component.html b/jazz-ui/src/app/pages/environment-detail/environment-detail.component.html
index c2f34e524e..c0f91dadfd 100644
--- a/jazz-ui/src/app/pages/environment-detail/environment-detail.component.html
+++ b/jazz-ui/src/app/pages/environment-detail/environment-detail.component.html
@@ -2,7 +2,6 @@
     <div class="view-hdr-wrp">
         <jazz-header class="hide-for-mobile"></jazz-header>
     </div>
-    <side-tile-fixed [inputData]="recentActivities" [actState]='mobSecState'></side-tile-fixed>
     
     <div class="view-container" [class.translate-for-mob]="mobSecState == 2">
         <div class="services-content-wrp">
diff --git a/jazz-ui/src/app/pages/service-overview/service-overview.component.ts b/jazz-ui/src/app/pages/service-overview/service-overview.component.ts
index 642180fd0b..e38abd2eff 100644
--- a/jazz-ui/src/app/pages/service-overview/service-overview.component.ts
+++ b/jazz-ui/src/app/pages/service-overview/service-overview.component.ts
@@ -621,6 +621,7 @@ export class ServiceOverviewComponent implements OnInit {
         friendly_name: this.friendlist
       }
     }
+
     if (this.Environments.length == 0) {
       this.noSubEnv = true;
     }
@@ -632,6 +633,8 @@ export class ServiceOverviewComponent implements OnInit {
     }
 
     this.cache.set('envList', this.list);
+
+
   }
 
   sortEnvArr() {
diff --git a/jazz-ui/src/app/pages/services/services.component.html b/jazz-ui/src/app/pages/services/services.component.html
index a394985208..0b728739f1 100644
--- a/jazz-ui/src/app/pages/services/services.component.html
+++ b/jazz-ui/src/app/pages/services/services.component.html
@@ -2,8 +2,6 @@
     <div class="view-hdr-wrp">
         <jazz-header class="hide-for-mobile"></jazz-header>
     </div>
-    <side-tile-fixed [inputData]="recentActivities" [actState]='mobSecState'></side-tile-fixed>
-    
     <div class="view-container" [class.translate-for-mob]="mobSecState == 2">
         <div class="services-content-wrp">
                 <!-- <span  class="reduxC" *ngIf='service.status == "deletion completed"'></span>
diff --git a/jazz-ui/src/app/pages/services/services.component.scss b/jazz-ui/src/app/pages/services/services.component.scss
index 0bd3237877..8f2c425f50 100644
--- a/jazz-ui/src/app/pages/services/services.component.scss
+++ b/jazz-ui/src/app/pages/services/services.component.scss
@@ -1,7 +1,6 @@
 @import './../../../main-styles';
 .services-content-wrp {
-  width: 80%; //fallback
-  width: calc(100% - 300px);
+  width:100%;
   display: inline-block;
   padding: 0 37px 0px 37px;
   float: left; // min-height: 100vh;
diff --git a/jazz-ui/src/app/secondary-components/service-overview-multienv/service-overview-multienv.component.ts b/jazz-ui/src/app/secondary-components/service-overview-multienv/service-overview-multienv.component.ts
index 4683f85bfb..b43aec523e 100644
--- a/jazz-ui/src/app/secondary-components/service-overview-multienv/service-overview-multienv.component.ts
+++ b/jazz-ui/src/app/secondary-components/service-overview-multienv/service-overview-multienv.component.ts
@@ -10,462 +10,455 @@ import { Subscription } from 'rxjs/Subscription';
 import { environment } from './../../../environments/environment';
 import { environment as env_internal } from './../../../environments/environment.internal';
 
-
-declare var $:any;
+declare var $: any;
 @Component({
   selector: 'service-overview-multienv',
   templateUrl: './service-overview-multienv.component.html',
   styleUrls: ['./service-overview-multienv.component.scss']
 })
 export class ServiceOverviewMultienvComponent implements OnInit {
+  prodEnv: any = {};
+  stgEnv: any = {};
+  // Environments;
+  @Output() onload: EventEmitter < any > = new EventEmitter < any > ();
+  @Output() onEnvGet: EventEmitter < any > = new EventEmitter < any > ();
 
-  
+  flag: boolean = false;
+  @Input() service: any = {};
+  @Input() isLoadingService: boolean = false;
+  private subscription: any;
 
+  list_env = []
+  list_inactive_env = [];
+  copyLink: string = 'Copy Link';
+  disp_edit: boolean = true;
+  hide_email_error: boolean = true;
+  hide_slack_error: boolean = true;
+  service_error: boolean = true;
+  disp_show: boolean = false;
+  err404: boolean = false;
 
-  prodEnv:any={};
-  stgEnv:any={};
-  // Environments;
+  response_json: any;
+  show_loader: boolean = false;
+  plc_hldr: boolean = true;
+  status_empty: boolean;
+  description_empty: boolean;
+  approvers_empty: boolean;
+  domain_empty: boolean;
+  serviceType_empty: boolean;
+  email_empty: boolean;
+  slackChannel_empty: boolean;
+  repository_empty: boolean;
+  runtime_empty: boolean = false;
+  tags_empty: boolean;
+  ErrEnv: boolean = false;
 
-    
-    @Output() onload:EventEmitter<any> = new EventEmitter<any>();
-    @Output() onEnvGet:EventEmitter<any> = new EventEmitter<any>();
-
-    flag:boolean=false;
-    @Input() service: any = {};
-    @Input() isLoadingService: boolean = false;
-    private subscription:any;
-
-    list_env = []
-    list_inactive_env = [];
-    copyLink:string='Copy Link';
-    disp_edit:boolean= true;
-    hide_email_error:boolean = true;
-    hide_slack_error:boolean = true;
-    service_error:boolean = true;
-    disp_show:boolean = false;
-    err404:boolean = false;
-    
-    response_json:any;
-    show_loader:boolean = false;
-    plc_hldr:boolean = true;
-    status_empty:boolean;
-    description_empty:boolean;
-    approvers_empty:boolean;
-    domain_empty:boolean;
-    serviceType_empty:boolean;
-    email_empty:boolean;
-    slackChannel_empty:boolean;
-    repository_empty:boolean;
-    runtime_empty:boolean = false;
-    tags_empty:boolean;
-    ErrEnv:boolean=false;
-
-
-    accList=env_internal.urls.accounts;
-	regList=env_internal.urls.regions;
-	  accSelected:string = this.accList[0];
-    regSelected:string=this.regList[0];
-    
-    accounts=this.accList;
-    regions=this.regList;
-    errMessage=''
-    tags_temp:string='';
-    desc_temp:string='';
-    bitbucketRepo:string = "";
-    repositorylink:string = "";
-    islink:boolean = false;
-    showCancel:boolean=false;
-    private toastmessage:any = '';
-    // mod_status:string;
-    private http:any;
-    statusCompleted:boolean = false;
-    serviceStatusCompleted:boolean = false;
-    serviceStatusPermission:boolean = false;
-    serviceStatusRepo:boolean = false;
-    serviceStatusValidate:boolean = false;
-    serviceStatusCompletedD:boolean = false;
-    serviceStatusPermissionD:boolean = false;
-    serviceStatusRepoD:boolean = false;
-    serviceStatusValidateD:boolean = false;
-    serviceStatusStarted:boolean = true;
-    serviceStatusStartedD:boolean = false;
-    statusFailed:boolean = false;
-    statusInfo:string='Service Creation started';
-    private intervalSubscription: Subscription;
-    swaggerUrl:string='';
-    baseUrl:string='';
-    service_request_id:any;
-    creation_status:string;
-    statusprogress:number=20;
-    noStg:boolean=false;
-    noProd:boolean=false;
-    DelstatusInfo:string='Deletion Started';
-
-    errBody: any;
-	parsedErrBody: any;
-	errorTime:any;
-	errorURL:any;
-	errorAPI:any;
-	errorRequest:any={};
-	errorResponse:any={};
-    errorUser:any;
-    envList=['prod','stg'];
-    friendlist=['prod','stg'];
-	errorChecked:boolean=true;
-	errorInclude:any="";
-    json:any={};
-    errorcase:boolean=false;
-    Nerrorcase:boolean=true;
-    reqJson:any={};
-    createloader:boolean=true;
-    showbar:boolean=false;
-    friendly_name:any;
-    list:any={};
-
-
-    constructor(
-        
-        private router: Router,
-        private request: RequestService,
-        private messageservice:MessageService,
-        private cache: DataCacheService,
-        private toasterService: ToasterService,
-        // private serviceDetail:ServiceDetailComponent,
-        private authenticationservice: AuthenticationService
-    ) {
-        this.http = request;
-        this.toastmessage = messageservice;
-    }
 
-    email_temp:string;
-    isenvLoading:boolean=false;
-    token:string;
-    noSubEnv:boolean=false;
-    noEnv:boolean=false;
-    slackChannel_temp:string;
-    slackChannel_link:string = '';
-    edit_save:string = 'EDIT';
-    activeEnv:string = 'dev';
-    Environments=[];
-    environ_arr=[];
-    
-    // prodEnv:any;
-    // stgEnv:any;
-    status :string= this.service.status;
-    environments = [
-        {   stageDisp:'PROD',
-            stage : 'prd',
-            serviceHealth : 'NA',
-            lastSuccess : {},
-            lastError : {
-                value:'NA',
-                // unit: 'Days'
-            },
-            deploymentsCount : {
-                'value':'NA',
-                'duration':'Last 24 hours'
-            },
-            cost : {
-                'value': 'NA',
-                'duration': 'Per Day',
-                // 'status': 'good'
-            },
-            codeQuality : {
-                'value': 'NA',
-                // 'status': 'bad'
-            }
-        },
-        {   stageDisp:'STAGE',
-            stage : 'stg',
-            serviceHealth : 'NA',
-            lastSuccess : {
-                value:'NA',
-                // unit: 'Days'
-            },
-            lastError : {},
-            deploymentsCount : {
-                'value':'NA',
-                'duration':'Last 24 hours'
-            },
-            cost : {
-                'value': 'NA',
-                'duration': 'Per Day',
-                // 'status': 'good'
-            },
-            codeQuality : {
-                'value': 'NA',
-                // 'status': 'good'
-            }
-        }
-        
-    ];
-
-    branches = [
-        {
-            title:'DEV',
-            stage:'dev'
-        },
-        {
-            title:'BRANCH1',
-            stage:'dev'
-        },
-        {
-            title:'BRANCH2',
-            stage:'dev'
-        },
-        {
-            title:'BRANCH3',
-            stage:'dev'
-        },
-        {
-            title:'BRANCH4',
-            stage:'dev'
-        },
-
-        // {
-        //     title:'BRANCH4',
-        //     stage:'dev'
-        // },
-        // {
-        //     title:'BRANCH4',
-        //     stage:'dev'
-        // },
-        // {
-        //     title:'BRANCH4',
-        //     stage:'dev'
-        // }
-    ];
-   
-    
+  accList = env_internal.urls.accounts;
+  regList = env_internal.urls.regions;
+  accSelected: string = this.accList[0];
+  regSelected: string = this.regList[0];
 
-    
+  accounts = this.accList;
+  regions = this.regList;
+  errMessage = ''
+  tags_temp: string = '';
+  desc_temp: string = '';
+  bitbucketRepo: string = "";
+  repositorylink: string = "";
+  islink: boolean = false;
+  showCancel: boolean = false;
+  private toastmessage: any = '';
+  // mod_status:string;
+  private http: any;
+  statusCompleted: boolean = false;
+  serviceStatusCompleted: boolean = false;
+  serviceStatusPermission: boolean = false;
+  serviceStatusRepo: boolean = false;
+  serviceStatusValidate: boolean = false;
+  serviceStatusCompletedD: boolean = false;
+  serviceStatusPermissionD: boolean = false;
+  serviceStatusRepoD: boolean = false;
+  serviceStatusValidateD: boolean = false;
+  serviceStatusStarted: boolean = true;
+  serviceStatusStartedD: boolean = false;
+  statusFailed: boolean = false;
+  statusInfo: string = 'Service Creation started';
+  private intervalSubscription: Subscription;
+  swaggerUrl: string = '';
+  baseUrl: string = '';
+  service_request_id: any;
+  creation_status: string;
+  statusprogress: number = 20;
+  noStg: boolean = false;
+  noProd: boolean = false;
+  DelstatusInfo: string = 'Deletion Started';
 
-    stageClicked(stg){
-        
-            let url = '/services/' + this.service['id'] + '/' + stg
-            this.router.navigateByUrl(url);
-        
-    }
-   
-   
-    toast_pop(error,oops,errorMessage)
+  errBody: any;
+  parsedErrBody: any;
+  errorTime: any;
+  errorURL: any;
+  errorAPI: any;
+  errorRequest: any = {};
+  errorResponse: any = {};
+  errorUser: any;
+  envList = ['prod', 'stg'];
+  friendlist = ['prod', 'stg'];
+  errorChecked: boolean = true;
+  errorInclude: any = "";
+  json: any = {};
+  errorcase: boolean = false;
+  Nerrorcase: boolean = true;
+  reqJson: any = {};
+  createloader: boolean = true;
+  showbar: boolean = false;
+  friendly_name: any;
+  list: any = {};
+
+
+  constructor(
+
+    private router: Router,
+    private request: RequestService,
+    private messageservice: MessageService,
+    private cache: DataCacheService,
+    private toasterService: ToasterService,
+    // private serviceDetail:ServiceDetailComponent,
+    private authenticationservice: AuthenticationService
+  ) {
+    this.http = request;
+    this.toastmessage = messageservice;
+  }
+
+  email_temp: string;
+  isenvLoading: boolean = false;
+  token: string;
+  noSubEnv: boolean = false;
+  noEnv: boolean = false;
+  slackChannel_temp: string;
+  slackChannel_link: string = '';
+  edit_save: string = 'EDIT';
+  activeEnv: string = 'dev';
+  Environments = [];
+  environ_arr = [];
+
+  // prodEnv:any;
+  // stgEnv:any;
+  status: string = this.service.status;
+  environments = [{
+      stageDisp: 'PROD',
+      stage: 'prd',
+      serviceHealth: 'NA',
+      lastSuccess: {},
+      lastError: {
+        value: 'NA',
+        // unit: 'Days'
+      },
+      deploymentsCount: {
+        'value': 'NA',
+        'duration': 'Last 24 hours'
+      },
+      cost: {
+        'value': 'NA',
+        'duration': 'Per Day',
+        // 'status': 'good'
+      },
+      codeQuality: {
+        'value': 'NA',
+        // 'status': 'bad'
+      }
+    },
     {
-      var tst = document.getElementById('toast-container');
-         tst.classList.add('toaster-anim');
-        this.toasterService.pop(error,oops,errorMessage);
-        setTimeout(() => {
-            tst.classList.remove('toaster-anim');
-          }, 3000);
+      stageDisp: 'STAGE',
+      stage: 'stg',
+      serviceHealth: 'NA',
+      lastSuccess: {
+        value: 'NA',
+        // unit: 'Days'
+      },
+      lastError: {},
+      deploymentsCount: {
+        'value': 'NA',
+        'duration': 'Last 24 hours'
+      },
+      cost: {
+        'value': 'NA',
+        'duration': 'Per Day',
+        // 'status': 'good'
+      },
+      codeQuality: {
+        'value': 'NA',
+        // 'status': 'good'
+      }
     }
 
-    modifyEnvArr(){
-        var j=0;
-        var k=2;
-        this.sortEnvArr();
-
-        if(this.environ_arr!=undefined){
-            for(var i=0;i<this.environ_arr.length;i++){
-                this.environ_arr[i].status=this.environ_arr[i].status.replace("_"," ");
-                // this.environ_arr[i].status=this.environ_arr[i].status.split(" ").join("\ n")
-                if(this.environ_arr[i].logical_id == 'prd' || this.environ_arr[i].logical_id == 'prod'){
-                    this.prodEnv=this.environ_arr[i];
-                    continue;
-                }
-                if(this.environ_arr[i].logical_id == 'stg'){
-                    this.stgEnv=this.environ_arr[i];
-                    continue;
-                } else {
-                    if(this.environ_arr[i].status !== 'archived') {
-                        this.Environments[j]=this.environ_arr[i];   
-                        this.envList[k]=this.environ_arr[i].logical_id; 
-                        if(this.environ_arr[i].friendly_name != undefined){
-                            this.friendlist[k++]=this.environ_arr[i].friendly_name;   
-                        }else{
-                            this.friendlist[k++]=this.environ_arr[i].logical_id;
-                        }
-                        j++;
-                    }
-                }
-            }
-            this.list = {
-                env : this.envList,
-                friendly_name : this.friendlist
-            }
-        }
+  ];
 
-        if(this.Environments.length==0){
-            this.noSubEnv=true;
-        }
-        if(this.prodEnv.logical_id==undefined){
-            this.noProd=true;
+  branches = [{
+      title: 'DEV',
+      stage: 'dev'
+    },
+    {
+      title: 'BRANCH1',
+      stage: 'dev'
+    },
+    {
+      title: 'BRANCH2',
+      stage: 'dev'
+    },
+    {
+      title: 'BRANCH3',
+      stage: 'dev'
+    },
+    {
+      title: 'BRANCH4',
+      stage: 'dev'
+    },
+
+    // {
+    //     title:'BRANCH4',
+    //     stage:'dev'
+    // },
+    // {
+    //     title:'BRANCH4',
+    //     stage:'dev'
+    // },
+    // {
+    //     title:'BRANCH4',
+    //     stage:'dev'
+    // }
+  ];
+
+
+
+
+
+  stageClicked(stg) {
+
+    let url = '/services/' + this.service['id'] + '/' + stg
+    this.router.navigateByUrl(url);
+
+  }
+
+
+  toast_pop(error, oops, errorMessage) {
+    var tst = document.getElementById('toast-container');
+    tst.classList.add('toaster-anim');
+    this.toasterService.pop(error, oops, errorMessage);
+    setTimeout(() => {
+      tst.classList.remove('toaster-anim');
+    }, 3000);
+  }
+
+  modifyEnvArr() {
+    var j = 0;
+    var k = 2;
+    this.sortEnvArr();
+
+    if (this.environ_arr != undefined) {
+      for (var i = 0; i < this.environ_arr.length; i++) {
+        this.environ_arr[i].status = this.environ_arr[i].status.replace("_", " ");
+        // this.environ_arr[i].status=this.environ_arr[i].status.split(" ").join("\ n")
+        if (this.environ_arr[i].logical_id == 'prd' || this.environ_arr[i].logical_id == 'prod') {
+          this.prodEnv = this.environ_arr[i];
+          continue;
         }
-        if(this.stgEnv.logical_id==undefined){
-            this.noStg=true;
+        if (this.environ_arr[i].logical_id == 'stg') {
+          this.stgEnv = this.environ_arr[i];
+          continue;
+        } else {
+          if (this.environ_arr[i].status !== 'archived') {
+            this.Environments[j] = this.environ_arr[i];
+            this.envList[k] = this.environ_arr[i].logical_id;
+            if (this.environ_arr[i].friendly_name != undefined) {
+              this.friendlist[k++] = this.environ_arr[i].friendly_name;
+            } else {
+              this.friendlist[k++] = this.environ_arr[i].logical_id;
+            }
+            j++;
+          }
         }
-      
-        // this.envList        
-        this.cache.set('envList',this.list);
-       
+      }
+      this.list = {
+        env: this.envList,
+        friendly_name: this.friendlist
+      }
+    }
 
+    if (this.Environments.length == 0) {
+      this.noSubEnv = true;
+    }
+    if (this.prodEnv.logical_id == undefined) {
+      this.noProd = true;
+    }
+    if (this.stgEnv.logical_id == undefined) {
+      this.noStg = true;
     }
     
-    sortEnvArr(){
-        var j=0;
-        var k=0;
-        
-        for(var i=0;i<this.environ_arr.length;i++){
-            if(this.environ_arr[i].status != 'inactive'){
-                this.list_env[j] = this.environ_arr[i];
-                
-                // this.list_env[i]
-                j++;
+    // this.envList        
+    this.cache.set('envList', this.list);
 
-            }
-            if(this.environ_arr[i].status == 'inactive'){
 
-                this.list_inactive_env[k] = this.environ_arr[i];
-                k++;
+  }
+
+  sortEnvArr() {
+    var j = 0;
+    var k = 0;
+
+    for (var i = 0; i < this.environ_arr.length; i++) {
+      if (this.environ_arr[i].status != 'inactive') {
+        this.list_env[j] = this.environ_arr[i];
+
+        // this.list_env[i]
+        j++;
+
+      }
+      if (this.environ_arr[i].status == 'inactive') {
+
+        this.list_inactive_env[k] = this.environ_arr[i];
+        k++;
 
             }
-                
+
         }
-        this.environ_arr = this.list_env.slice(0,this.list_env.length);
+        this.environ_arr = this.list_env.slice(0, this.list_env.length);
+
+    this.environ_arr.push.apply(this.environ_arr, this.list_inactive_env);
 
-        this.environ_arr.push.apply(this.environ_arr,this.list_inactive_env);
 
-      
 
-        
+
+  }
+  getenvData() {
+    this.isenvLoading = true;
+    this.ErrEnv = false;
+    if (this.service == undefined) {
+      return
     }
-    getenvData(){
-        this.isenvLoading=true;
-        this.ErrEnv=false;
-        if(this.service==undefined){return}
-        this.http.get('/jazz/environments?domain='+this.service.domain+'&service='+this.service.name).subscribe(
-            response => {
-                
-                this.isenvLoading=false;
-                  this.environ_arr=response.data.environment;
-                  if(this.environ_arr!=undefined)    
-                    if(this.environ_arr.length==0 || response.data==''){
-                            this.noEnv=true;   
-                    }             
-                  this.ErrEnv=false;
-              
-                  this.modifyEnvArr();
-                  
-              },
-              err => {
-                this.isenvLoading=false;
-                
-                  console.log('error',err);
-                  this.ErrEnv=true;
-                  if(err.status == 404) this.err404=true;
-                  this.errMessage="Something went wrong while fetching your data";
-                  this.errMessage=this.toastmessage.errorMessage(err,"environment");
-                  var payload = {
-                      "domain" : +this.service.domain,
-                      "service" : this.service.name
-                  }
-                  this.getTime();
-                  this.errorURL = window.location.href;
-                  this.errorAPI = env_internal.baseurl+"/jazz/environments";
-                  this.errorRequest = payload;
-                  this.errorUser = this.authenticationservice.getUserId();
-                  this.errorResponse = JSON.parse(err._body);
-    
-                // let errorMessage=this.toastmessage.errorMessage(err,"serviceCost");
-                // this.popToast('error', 'Oops!', errorMessage);
-            })
-        };
-        getTime() {
-            var now = new Date();
-            this.errorTime = ((now.getMonth() + 1) + '/' + (now.getDate()) + '/' + now.getFullYear() + " " + now.getHours() + ':'
-            + ((now.getMinutes() < 10) ? ("0" + now.getMinutes()) : (now.getMinutes())) + ':' + ((now.getSeconds() < 10) ? ("0" + now.getSeconds()) : (now.getSeconds())));
-            // console.log(this.errorTime);
+    this.http.get('/jazz/environments?domain=' + this.service.domain + '&service=' + this.service.name).subscribe(
+      response => {
+
+        this.isenvLoading = false;
+        this.environ_arr = response.data.environment;
+        if (this.environ_arr != undefined)
+          if (this.environ_arr.length == 0 || response.data == '') {
+            this.noEnv = true;
           }
-    
-        feedbackRes:boolean=false;
-        openModal:boolean=false;
-        feedbackMsg:string='';
-        feedbackResSuccess:boolean=false;
-        feedbackResErr:boolean=false;
-        isFeedback:boolean=false;
-        toast:any;
-        model:any={
-            userFeedback : ''
-        };
-        buttonText:string='SUBMIT';
-        isLoading:boolean=false;
-        sjson:any={};
-		djson:any={};
-        is_multi_env:boolean = false;
-        ngOnInit() {
-            if(environment.multi_env) this.is_multi_env=true;
-            if(environment.envName == 'oss') this.internal_build = false;
-            var obj;       
-
-            this.prodEnv={};
-            this.stgEnv={};
-            if((this.service.domain!=undefined)){
-                this.getenvData();              
-            }
-    }
+        this.ErrEnv = false;
 
-    testingStatus(){
-        setInterval(() => {
-        this.onload.emit(this.service.status);
-        },500);
-    }
-    transform_env_oss(data){
-    //   alert('ososos')
-        var arrEnv = data.data.environment
-        if(environment.multi_env){
-            for(var i=0;i<arrEnv.length;i++){
-                arrEnv[i].status=arrEnv[i].status.replace('_',' ');
-                if(arrEnv[i].logical_id == 'prod')
-                    this.prodEnv=arrEnv[i];
-                else
-                    this.Environments.push(arrEnv[i]);
-            }
-        }
-        else{
-            for(var i=0;i<arrEnv.length;i++){
-                arrEnv[i].status=arrEnv[i].status.replace('_',' ');
-                if(arrEnv[i].logical_id == 'prod')
-                    this.prodEnv=arrEnv[i];
-                else
-                    this.stgEnv=arrEnv[i];
-            }
-        }
-        arrEnv[0].status.replace("_"," ");
-    }
-    
-    internal_build:boolean = true;
-    ngOnChanges(x:any){
-        if(environment.multi_env) this.is_multi_env=true;
-        if(environment.envName == 'oss') this.internal_build = false;
-        var obj;
-      
-        this.prodEnv={};
-        this.stgEnv={};
-        if((this.service.domain!=undefined)){
-            this.getenvData();
-            
+        this.modifyEnvArr();
+
+      },
+      err => {
+        this.isenvLoading = false;
+
+        console.log('error', err);
+        this.ErrEnv = true;
+        if (err.status == 404) this.err404 = true;
+        this.errMessage = "Something went wrong while fetching your data";
+        this.errMessage = this.toastmessage.errorMessage(err, "environment");
+        var payload = {
+          "domain": +this.service.domain,
+          "service": this.service.name
         }
-         
+        this.getTime();
+        this.errorURL = window.location.href;
+        this.errorAPI = env_internal.baseurl + "/jazz/environments";
+        this.errorRequest = payload;
+        this.errorUser = this.authenticationservice.getUserId();
+        this.errorResponse = JSON.parse(err._body);
+
+        // let errorMessage=this.toastmessage.errorMessage(err,"serviceCost");
+        // this.popToast('error', 'Oops!', errorMessage);
+      })
+  };
+  getTime() {
+    var now = new Date();
+    this.errorTime = ((now.getMonth() + 1) + '/' + (now.getDate()) + '/' + now.getFullYear() + " " + now.getHours() + ':' +
+      ((now.getMinutes() < 10) ? ("0" + now.getMinutes()) : (now.getMinutes())) + ':' + ((now.getSeconds() < 10) ? ("0" + now.getSeconds()) : (now.getSeconds())));
+    // console.log(this.errorTime);
+  }
+
+  feedbackRes: boolean = false;
+  openModal: boolean = false;
+  feedbackMsg: string = '';
+  feedbackResSuccess: boolean = false;
+  feedbackResErr: boolean = false;
+  isFeedback: boolean = false;
+  toast: any;
+  model: any = {
+    userFeedback: ''
+  };
+  buttonText: string = 'SUBMIT';
+  isLoading: boolean = false;
+  sjson: any = {};
+  djson: any = {};
+  is_multi_env: boolean = false;
+  ngOnInit() {
+    if (environment.multi_env) this.is_multi_env = true;
+    if (environment.envName == 'oss') this.internal_build = false;
+    var obj;
+
+    this.prodEnv = {};
+    this.stgEnv = {};
+    if ((this.service.domain != undefined)) {
+      this.getenvData();
     }
-    ngOnDestroy() {
-        
+  }
+
+  testingStatus() {
+    setInterval(() => {
+      this.onload.emit(this.service.status);
+    }, 500);
+  }
+  transform_env_oss(data) {
+    //   alert('ososos')
+    var arrEnv = data.data.environment
+    if (environment.multi_env) {
+      for (var i = 0; i < arrEnv.length; i++) {
+        arrEnv[i].status = arrEnv[i].status.replace('_', ' ');
+        if (arrEnv[i].logical_id == 'prod')
+          this.prodEnv = arrEnv[i];
+        else
+          this.Environments.push(arrEnv[i]);
+      }
+    } else {
+      for (var i = 0; i < arrEnv.length; i++) {
+        arrEnv[i].status = arrEnv[i].status.replace('_', ' ');
+        if (arrEnv[i].logical_id == 'prod')
+          this.prodEnv = arrEnv[i];
+        else
+          this.stgEnv = arrEnv[i];
+      }
     }
+    arrEnv[0].status.replace("_", " ");
+  }
+
+  internal_build: boolean = true;
+  ngOnChanges(x: any) {
+    if (environment.multi_env) this.is_multi_env = true;
+    if (environment.envName == 'oss') this.internal_build = false;
+    var obj;
+
+    this.prodEnv = {};
+    this.stgEnv = {};
+    if ((this.service.domain != undefined)) {
+      this.getenvData();
 
-    public goToAbout(hash){
-        this.router.navigateByUrl('landing');
-        this.cache.set('scroll_flag',true);
-        this.cache.set('scroll_id',hash);
     }
-  
-    scrollList:any;
-   
-    
-}
\ No newline at end of file
+
+  }
+  ngOnDestroy() {
+
+  }
+
+  public goToAbout(hash) {
+    this.router.navigateByUrl('landing');
+    this.cache.set('scroll_flag', true);
+    this.cache.set('scroll_id', hash);
+  }
+
+  scrollList: any;
+
+
+}
diff --git a/jazz-ui/src/environments/environment.oss.ts b/jazz-ui/src/environments/environment.oss.ts
index 3e65f9f453..3dde4b83fb 100644
--- a/jazz-ui/src/environments/environment.oss.ts
+++ b/jazz-ui/src/environments/environment.oss.ts
@@ -5,8 +5,8 @@ export const environment = {
   api_doc_name : "https://{api_doc_name}.s3.amazonaws.com",
   envName:"oss",
   multi_env:{multi_env},
-  serviceTabs:["overview","logs"],
-  environmentTabs:["overview"],
+  serviceTabs:["{overview}","{access control}","{metrics}","{logs}","{cost}"],
+  environmentTabs:["{env_overview}","{deployments}","{code quality}","{assets}","{env_logs}"],
   urls:{
     docs_link:"https://github.com/tmobile/jazz/wiki",
 }
diff --git a/jazz_create-serverless-service/index.js b/jazz_create-serverless-service/index.js
index 68e6823ebb..74a139370e 100644
--- a/jazz_create-serverless-service/index.js
+++ b/jazz_create-serverless-service/index.js
@@ -31,17 +31,15 @@ const crud = require("./components/crud")(); //Import the utils module.
     @author:
     @version: 1.0
 **/
-
-module.exports.handler = (event, context, cb) => {
+var user_id;
+var serviceId;
+var serviceDataObject;
+var handler = (event, context, cb) => {
 
     var errorHandler = errorHandlerModule();
     var config = configObj(event);
     logger.init(event, context);
-
-    var serviceId;
-    var serviceDataObject;
     var service_creation_data = event.body;
-
     try {
         var isValidName = function (name) {
             return /^[A-Za-z0-9\-]+$/.test(name);
@@ -59,7 +57,7 @@ module.exports.handler = (event, context, cb) => {
             return cb(JSON.stringify(errorHandler.throwInputValidationError("Namespace is not appropriate")));
         }
 
-        var user_id = event.principalId;
+        user_id = event.principalId;
         if (!user_id) {
             logger.error('Authorizer did not send the user information, please check if authorizer is enabled and is functioning as expected!');
             return cb(JSON.stringify(errorHandler.throwUnAuthorizedError("User is not authorized to access this service")));
@@ -101,201 +99,208 @@ module.exports.handler = (event, context, cb) => {
         logger.error(e);
         cb(JSON.stringify(errorHandler.throwInternalServerError(e)));
     }
+}
 
-    function startServiceOnboarding(service_creation_data, config, service_id) {
-        return new Promise((resolve, reject) => {
-            try {
-                var base_auth_token = "Basic " + new Buffer(util.format("%s:%s", config.SVC_USER, config.SVC_PASWD)).toString("base64");
-                var userlist = "";
-                var approvers = service_creation_data.approvers;
-                
-                userlist = approvers.reduce((stringSoFar, approver) => {
-                    return stringSoFar + util.format("name=%s&", approver);
-                }, "");
+var startServiceOnboarding = (service_creation_data, config, service_id) => {
+    return new Promise((resolve, reject) => {
+        try {
+            var base_auth_token = "Basic " + new Buffer(util.format("%s:%s", config.SVC_USER, config.SVC_PASWD)).toString("base64");
+            var userlist = "";
+            var approvers = service_creation_data.approvers;
 
-                var input = {
-                    token: config.BUILD_TOKEN,
-                    admin_group: userlist,
-                    service_id: service_id
-                };
-                request({
-                    url: config.JOB_BUILD_URL,
-                    method: 'POST',
-                    headers: {
-                        "Authorization": base_auth_token
-                    },
-                    qs: input
-                }, function (err, response, body) {
-                    if (err) {
-                        logger.error('Error while starting service onboarding: ' + err);
-                        err.jenkins_api_failure = true;
-                        reject(err);
-                    } else {
-                        if (response.statusCode <= 299) { // handle all 2xx response codes as success
-                            resolve("Successfully created your service.");
-                        } else {
-                            logger.error("Failed while request to service onboarding job " + JSON.stringify(response));
-                            var message = {
-                                'message': "Failed to kick off service onboarding job.",
-                                'jenkins_api_failure': true
-                            };
-                            reject(message);
-                        }
-                    }
-                });
-            } catch (e) {
-                logger.error('Error during startServiceOnboarding: ' + e.message);
-                reject(e);
-            }
-        });
-    }
+            userlist = approvers.reduce((stringSoFar, approver) => {
+                return stringSoFar + util.format("name=%s&", approver);
+            }, "");
 
-    function getToken(configData) {
-        return new Promise((resolve, reject) => {
-            var svcPayload = {
-                uri: configData.SERVICE_API_URL + configData.TOKEN_URL,
-                method: 'post',
-                json: {
-                    "username": configData.SERVICE_USER,
-                    "password": configData.TOKEN_CREDS
-                },
-                rejectUnauthorized: false
+            var input = {
+                token: config.BUILD_TOKEN,
+                admin_group: userlist,
+                service_id: service_id
             };
-
-            request(svcPayload, (error, response, body) => {
-                if (response.statusCode === 200 && body && body.data) {
-                    var authToken = body.data.token;
-                    return resolve(authToken);
-                } else {
-                    return reject({
-                        "error": "Could not get authentication token for updating service catalog.",
-                        "message": response.body.message
-                    });
-                }
-            });
-        });
-    }
-
-    function createService(service_data) {
-        return new Promise((resolve, reject) => {
-            crud.create(service_data, (err, results) => {
+            request({
+                url: config.JOB_BUILD_URL,
+                method: 'POST',
+                headers: {
+                    "Authorization": base_auth_token
+                },
+                qs: input
+            }, function (err, response, body) {
                 if (err) {
-                    reject({
-                        "message": err.error
-                    });
+                    logger.error('Error while starting service onboarding: ' + err);
+                    err.jenkins_api_failure = true;
+                    reject(err);
                 } else {
-                    logger.info("created a new service in service catalog.");
-                    serviceId = results.data.service_id;
-                    resolve(results.data.service_id);
+                    if (response.statusCode <= 299) { // handle all 2xx response codes as success
+                        resolve("Successfully created your service.");
+                    } else {
+                        logger.error("Failed while request to service onboarding job " + JSON.stringify(response));
+                        var message = {
+                            'message': "Failed to kick off service onboarding job.",
+                            'jenkins_api_failure': true
+                        };
+                        reject(message);
+                    }
                 }
             });
-        });
-    }
+        } catch (e) {
+            logger.error('Error during startServiceOnboarding: ' + e.message);
+            reject(e);
+        }
+    });
+}
 
-    function getServiceData(service_creation_data, authToken, configData) {
-        return new Promise((resolve, reject) => {
-            var inputs = {
-                "TOKEN": authToken,
-                "SERVICE_API_URL": configData.SERVICE_API_URL,
-                "SERVICE_API_RESOURCE": configData.SERVICE_API_RESOURCE,
-                "SERVICE_NAME": service_creation_data.service_name.toLowerCase(),
-                "DOMAIN": service_creation_data.domain.toLowerCase(),
-                "DESCRIPTION": service_creation_data.description,
-                "TYPE": service_creation_data.service_type,
-                "RUNTIME": service_creation_data.runtime,
-                "REGION": service_creation_data.region,
-                "USERNAME": user_id,
-                "IS_PUBLIC_ENDPOINT": service_creation_data.is_public_endpoint || false,
-                "STATUS": "creation_started"
-            };
+var getToken = (configData) => {
+    return new Promise((resolve, reject) => {
+        var svcPayload = {
+            uri: configData.SERVICE_API_URL + configData.TOKEN_URL,
+            method: 'post',
+            json: {
+                "username": configData.SERVICE_USER,
+                "password": configData.TOKEN_CREDS
+            },
+            rejectUnauthorized: false
+        };
 
-            var serviceMetadataObj = {};
-            if (service_creation_data.tags) {
-                inputs.TAGS = service_creation_data.tags;
+        request(svcPayload, (error, response, body) => {
+            if (response.statusCode === 200 && body && body.data) {
+                var authToken = body.data.token;
+                return resolve(authToken);
+            } else {
+                return reject({
+                    "error": "Could not get authentication token for updating service catalog.",
+                    "message": response.body.message
+                });
             }
+        });
+    });
+}
 
-            if (service_creation_data.email) {
-                inputs.EMAIL = service_creation_data.email;
+var createService = (service_data) => {
+    return new Promise((resolve, reject) => {
+        crud.create(service_data, (err, results) => {
+            if (err) {
+                reject({
+                    "message": err.error
+                });
+            } else {
+                logger.info("created a new service in service catalog.");
+                serviceId = results.data.service_id;
+                resolve(results.data.service_id);
             }
+        });
+    });
+}
 
-            if (service_creation_data.slack_channel) {
-                inputs.SLACKCHANNEL = service_creation_data.slack_channel;
-            }
+var getServiceData = (service_creation_data, authToken, configData) => {
+    return new Promise((resolve, reject) => {
+        var inputs = {
+            "TOKEN": authToken,
+            "SERVICE_API_URL": configData.SERVICE_API_URL,
+            "SERVICE_API_RESOURCE": configData.SERVICE_API_RESOURCE,
+            "SERVICE_NAME": service_creation_data.service_name.toLowerCase(),
+            "DOMAIN": service_creation_data.domain.toLowerCase(),
+            "DESCRIPTION": service_creation_data.description,
+            "TYPE": service_creation_data.service_type,
+            "RUNTIME": service_creation_data.runtime,
+            "REGION": service_creation_data.region,
+            "USERNAME": user_id,
+            "IS_PUBLIC_ENDPOINT": service_creation_data.is_public_endpoint || false,
+            "STATUS": "creation_started"
+        };
 
-            if ((service_creation_data.service_type === "api" || service_creation_data.service_type === "function") && (service_creation_data.require_internal_access)) {
-                serviceMetadataObj.require_internal_access = service_creation_data.require_internal_access;
-            }
+        var serviceMetadataObj = {};
+        if (service_creation_data.tags) {
+            inputs.TAGS = service_creation_data.tags;
+        }
 
-            // Pass the flag to enable authentication on API
-            if (service_creation_data.service_type === "api") {
-                serviceMetadataObj.enable_api_security = service_creation_data.enable_api_security || false;
-                if (service_creation_data.authorizer_arn) {
-                    // Validate ARN format - arn:aws:lambda:region:account-id:function:function-name
-                    if (!validateARN(service_creation_data.authorizer_arn)) {
-                        return cb(JSON.stringify(errorHandler.throwInputValidationError("authorizer arn is invalid, expected format=arn:aws:lambda:region:account-id:function:function-name")));
-                    } else {
-                        serviceMetadataObj.authorizer_arn = service_creation_data.authorizer_arn;
-                    }
-                }
-            }
+        if (service_creation_data.email) {
+            inputs.EMAIL = service_creation_data.email;
+        }
 
-            // Disabling require_internal_access and enable_api_security when is_public_endpoint is true
-            if (service_creation_data.service_type === "api" && service_creation_data.is_public_endpoint) {
-                serviceMetadataObj.require_internal_access = false;
-                serviceMetadataObj.enable_api_security = false;
-            }
+        if (service_creation_data.slack_channel) {
+            inputs.SLACKCHANNEL = service_creation_data.slack_channel;
+        }
 
-            if (service_creation_data.service_type === "website") {
-                var create_cloudfront_url = "true";
-                serviceMetadataObj.create_cloudfront_url = create_cloudfront_url;
-                inputs.RUNTIME = 'n/a';
+        if ((service_creation_data.service_type === "api" || service_creation_data.service_type === "function") && (service_creation_data.require_internal_access)) {
+            serviceMetadataObj.require_internal_access = service_creation_data.require_internal_access;
+        }
+
+        // Pass the flag to enable authentication on API
+        if (service_creation_data.service_type === "api") {
+            serviceMetadataObj.enable_api_security = service_creation_data.enable_api_security || false;
+            if (service_creation_data.authorizer_arn) {
+                // Validate ARN format - arn:aws:lambda:region:account-id:function:function-name
+                if (!validateARN(service_creation_data.authorizer_arn)) {
+                    return cb(JSON.stringify(errorHandler.throwInputValidationError("authorizer arn is invalid, expected format=arn:aws:lambda:region:account-id:function:function-name")));
+                } else {
+                    serviceMetadataObj.authorizer_arn = service_creation_data.authorizer_arn;
+                }
             }
-            // Add rate expression to the propertiesObject;
-            if (service_creation_data.service_type === "function") {
-                if (service_creation_data.rateExpression !== undefined) {
-                    var cronExpValidator = CronParser.validateCronExpression(service_creation_data.rateExpression);
-                    if (cronExpValidator.result === 'valid') {
-                        var rate_expression = service_creation_data.rateExpression;
-                        var enable_eventschedule;
-                        if (service_creation_data.enableEventSchedule === false) {
-                            enable_eventschedule = service_creation_data.enableEventSchedule;
-                        } else {
-                            enable_eventschedule = true;
-                        }
+        }
 
-                        if (rate_expression && rate_expression.trim() !== "") {
-                            serviceMetadataObj["eventScheduleRate"] = "cron(" + rate_expression + ")";
-                        }
-                        if (enable_eventschedule && enable_eventschedule !== "") {
-                            serviceMetadataObj["eventScheduleEnable"] = enable_eventschedule;
-                        }
-                        if (service_creation_data.event_source_ec2 && service_creation_data.event_action_ec2) {
-                            serviceMetadataObj["event_action_ec2"] = service_creation_data.event_source_ec2;
-                            serviceMetadataObj["event_action_ec2"] = service_creation_data.event_action_ec2;
-                        }
-                        if (service_creation_data.event_source_s3 && service_creation_data.event_action_s3) {
-                            serviceMetadataObj["event_source_s3"] = service_creation_data.event_source_s3;
-                            serviceMetadataObj["event_action_s3"] = service_creation_data.event_action_s3;
-                        }
-                        if (service_creation_data.event_source_dynamodb && service_creation_data.event_action_dynamodb) {
-                            serviceMetadataObj["event_source_dynamodb"] = service_creation_data.event_source_dynamodb;
-                            serviceMetadataObj["event_action_dynamodb"] = service_creation_data.event_action_dynamodb;
-                        }
-                        if (service_creation_data.event_source_stream && service_creation_data.event_action_stream) {
-                            serviceMetadataObj["event_source_stream"] = service_creation_data.event_source_stream;
-                            serviceMetadataObj["event_action_stream"] = service_creation_data.event_action_stream;
-                        }
+        // Disabling require_internal_access and enable_api_security when is_public_endpoint is true
+        if (service_creation_data.service_type === "api" && service_creation_data.is_public_endpoint) {
+            serviceMetadataObj.require_internal_access = false;
+            serviceMetadataObj.enable_api_security = false;
+        }
 
+        if (service_creation_data.service_type === "website") {
+            var create_cloudfront_url = "true";
+            serviceMetadataObj.create_cloudfront_url = create_cloudfront_url;
+            inputs.RUNTIME = 'n/a';
+        }
+        // Add rate expression to the propertiesObject;
+        if (service_creation_data.service_type === "function") {
+            if (service_creation_data.rateExpression ) {
+                var cronExpValidator = CronParser.validateCronExpression(service_creation_data.rateExpression);
+                if (cronExpValidator.result === 'valid') {
+                    var rate_expression = service_creation_data.rateExpression;
+                    var enable_eventschedule;
+                    if (service_creation_data.enableEventSchedule === false) {
+                        enable_eventschedule = service_creation_data.enableEventSchedule;
                     } else {
-                        logger.error('cronExpValidator : ', cronExpValidator);
-                        reject(cronExpValidator);
+                        enable_eventschedule = true;
+                    }
+
+                    if (rate_expression && rate_expression.trim() !== "") {
+                        serviceMetadataObj["eventScheduleRate"] = "cron(" + rate_expression + ")";
+                    }
+                    if (enable_eventschedule && enable_eventschedule !== "") {
+                        serviceMetadataObj["eventScheduleEnable"] = enable_eventschedule;
                     }
+                    if (service_creation_data.event_source_ec2 && service_creation_data.event_action_ec2) {
+                        serviceMetadataObj["event_action_ec2"] = service_creation_data.event_source_ec2;
+                        serviceMetadataObj["event_action_ec2"] = service_creation_data.event_action_ec2;
+                    }
+                    if (service_creation_data.event_source_s3 && service_creation_data.event_action_s3) {
+                        serviceMetadataObj["event_source_s3"] = service_creation_data.event_source_s3;
+                        serviceMetadataObj["event_action_s3"] = service_creation_data.event_action_s3;
+                    }
+                    if (service_creation_data.event_source_dynamodb && service_creation_data.event_action_dynamodb) {
+                        serviceMetadataObj["event_source_dynamodb"] = service_creation_data.event_source_dynamodb;
+                        serviceMetadataObj["event_action_dynamodb"] = service_creation_data.event_action_dynamodb;
+                    }
+                    if (service_creation_data.event_source_stream && service_creation_data.event_action_stream) {
+                        serviceMetadataObj["event_source_stream"] = service_creation_data.event_source_stream;
+                        serviceMetadataObj["event_action_stream"] = service_creation_data.event_action_stream;
+                    }
+
+                } else {
+                    logger.error('cronExpValidator : ', cronExpValidator);
+                    reject(cronExpValidator);
                 }
             }
+        }
 
-            inputs.METADATA = serviceMetadataObj;
-            serviceDataObject = inputs;
-            resolve(inputs);
-        });
-    }
-};
+        inputs.METADATA = serviceMetadataObj;
+        serviceDataObject = inputs;
+        resolve(inputs);
+    });
+}
+module.exports = {
+    handler: handler,
+    startServiceOnboarding: startServiceOnboarding,
+    getToken: getToken,
+    createService: createService,
+    getServiceData: getServiceData
+}
\ No newline at end of file
diff --git a/jazz_create-serverless-service/test/test.js b/jazz_create-serverless-service/test/test.js
index 61f0caa3bb..13efb8ade5 100644
--- a/jazz_create-serverless-service/test/test.js
+++ b/jazz_create-serverless-service/test/test.js
@@ -22,8 +22,9 @@ const awsContext = require('aws-lambda-mock-context');
 const sinon = require('sinon');
 const logger = require("../components/logger.js");
 const CronParser = require("../components/cron-parser.js");
+const configObj = require("../components/config.js");
 
-var event, context, callback, spy, stub, checkCase;
+let event, context, callback, spy, stub, checkCase, authStub,service_creation_data;
 
 //setup a spy to wrap around async logic/logic that need extraneous sources
 spy = sinon.spy();
@@ -31,128 +32,140 @@ spy = sinon.spy();
 //setup a helper function to check for expected outputs given different input parameters
 checkCase = (eventProp, eventProp2, propValue, errMessage, errType) => {
   //if there is a second prop defined, than the value to be changed is in a nested object
-  if(eventProp2){
+  if (eventProp2) {
     event[eventProp][eventProp2] = propValue;
-  }
-  else if(eventProp){
+  } else if (eventProp) {
     event[eventProp] = propValue;
   }
   //check if handler returns error notification with expected error type and message
-  var bool = index.handler(event,context,callback).includes(errMessage) &&
-              index.handler(event,context,callback).includes(errType);
+  let bool = index.handler(event, context, callback).includes(errMessage) &&
+    index.handler(event, context, callback).includes(errType);
   return bool;
 };
 
-describe('create-serverless-service', function() {
+describe('create-serverless-service', function () {
 
-  describe("cron-parser.js", function() {
-    var validCronExp;
+  describe("cron-parser.js", function () {
+    let validCronExp;
 
-    beforeEach(function(){
+    beforeEach(function () {
       validCronExp = "1 * * * ? *";
     });
 
-    it("should return null if given an empty or missing expression", function(){
-      var bool = true;
-      var invalidValues = [null,undefined,""];
+    it("should return null if given an empty or missing expression", function () {
+      let bool = true;
+      let invalidValues = [null, undefined, ""];
       //if cronParser states any of the above values are defined, have this test fail
-      for (i in invalidValues){
-        if (CronParser.isDefined(invalidValues[i]) != null){
+      for (i in invalidValues) {
+        if (CronParser.isDefined(invalidValues[i]) != null) {
           bool = false;
         }
       };
       assert.isTrue(bool);
     });
 
-    it("should return 'valid' if given a valid expression", function(){
-      var bool = false;
-      if(CronParser.validateCronExpression(validCronExp).result == 'valid'){
+    it("should return 'valid' if given a valid expression", function () {
+      let bool = false;
+      if (CronParser.validateCronExpression(validCronExp).result == 'valid') {
         bool = true;
       }
       assert.isTrue(bool);
     });
   });
 
-  describe("index.handler", function(){
+  describe("index.handler", function () {
 
     //set up for default valid values to pass into handler()
-    beforeEach(function(){
+    let reqStub;
+    beforeEach(function () {
       event = {
-        "stage" : "test",
-        "headers" : {
-          "Authorization" : "fr1end$hip_1s_mAg1c"
+        "stage": "test",
+        "headers": {
+          "Authorization": "fr1end$hip_1s_mAg1c"
         },
-        "principalId" : "@pp1eJack",
-        "body" : {
-          "service_name"	: "test-service",
-          "service_type"	: "function",
-          "domain"		: "test-domain",
-          "runtime"		: "nodejs",
-          "approvers"		: ['tw1light_$pArkle'],
+        "principalId": "@pp1eJack",
+        "body": {
+          "service_name": "test-service",
+          "service_type": "function",
+          "domain": "test-domain",
+          "runtime": "nodejs",
+          "approvers": ['tw1light_$pArkle'],
           "rateExpression": "1 * * * ? *",
-          "slack_channel" : "mlp_fim",
-          "require_internal_access" : false,
-          "create_cloudfront_url" : false//, //?
-          //"enableEventSchedule" : false
+          "slack_channel": "mlp_fim",
+          "require_internal_access": false,
+          "create_cloudfront_url": false
         }
       };
+      
       context = awsContext();
       callback = (err, responseObj) => {
-        if (err){
+        if (err) {
           return err;
-        }
-        else{
+        } else {
+
           return JSON.stringify(responseObj);
         }
       };
     });
+    afterEach(() => {
+      if (reqStub) {
+        reqStub.restore()
+      }
+      if (stub) {
+        stub.restore();
+      }
+    })
+
 
     /*
-    * Given an event object with no event.body, handler() should indicate service inputs are missing
-    * @param {object} event, contains a null or undefined body property
-    * @params {object, function} default aws context and callback function as assigned above respectively
-    * @returns index.handler() should return an InternalServerError notification
-    */
-    it("should inform user of error if given an event with no body property", function(){
-      var errMessage = "Service inputs are not defined";
-      var errType = "BadRequest";
-      var bothCases = checkCase("body", null, null, errMessage, errType) &&
-                      checkCase("body", null, undefined, errMessage, errType);
+     * Given an event object with no event.body, handler() should indicate service inputs are missing
+     * @param {object} event, contains a null or undefined body property
+     * @params {object, function} default aws context and callback function as assigned above respectively
+     * @returns index.handler() should return an InternalServerError notification
+     */
+
+    it("should inform user of error if given an event with no body property", function () {
+      let errMessage = "Service inputs are not defined";
+      let errType = "BadRequest";
+      let bothCases = checkCase("body", null, null, errMessage, errType) &&
+        checkCase("body", null, undefined, errMessage, errType);
       assert.isTrue(bothCases);
     });
 
     /*
-    * Given an event object with missing body.service_type, handler() should indicate missing service_type
-    * @param {object} event, contains an event.body.service_type that is either undefined or null
-    * @params {object, function} default aws context and callback function as assigned above respectively
-    * @returns index.handler() should return an InternalServerError notification
-    */
-    it("should inform user of error if given an event with no body.service_type", function(){
-      var errMessage = "'service_type' is not defined";
-      var errType = "BadRequest";
-      var bothCases = checkCase("body", "service_type", null, errMessage, errType) &&
-                      checkCase("body", "service_type", null, errMessage, errType);
+     * Given an event object with missing body.service_type, handler() should indicate missing service_type
+     * @param {object} event, contains an event.body.service_type that is either undefined or null
+     * @params {object, function} default aws context and callback function as assigned above respectively
+     * @returns index.handler() should return an InternalServerError notification
+     */
+
+    it("should inform user of error if given an event with no body.service_type", function () {
+      let errMessage = "'service_type' is not defined";
+      let errType = "BadRequest";
+      let bothCases = checkCase("body", "service_type", null, errMessage, errType) &&
+        checkCase("body", "service_type", null, errMessage, errType);
       assert.isTrue(bothCases);
     });
 
     /*
-    * Given an event with an invalid body.service_name, handler() should indicate service name has specified issues
-    * @param {object} event, contains either a missing or invalid body.service_name property
-    * @params {object, function} default aws context and callback function as assigned above respectively
-    * @returns index.handler() should return a descriptive InternalServerError notification
-    */
-    it("should inform user of error if given an event with an invalid body.service_name", function(){
+     * Given an event with an invalid body.service_name, handler() should indicate service name has specified issues
+     * @param {object} event, contains either a missing or invalid body.service_name property
+     * @params {object, function} default aws context and callback function as assigned above respectively
+     * @returns index.handler() should return a descriptive InternalServerError notification
+     */
+
+    it("should inform user of error if given an event with an invalid body.service_name", function () {
       //no characters
-      var invalidName1 = "";
+      let invalidName1 = "";
       //contains a non-alphanumeric character
-      var invalidName2 = "Rar!ty";
-      var nameValues = [null, undefined, invalidName1, invalidName2];
-      var errMessage = "'service_name' is not defined or has invalid characters";
-      var errType = "BadRequest";
-      var allCases = true;
+      let invalidName2 = "Rar!ty";
+      let nameValues = [null, undefined, invalidName1, invalidName2];
+      let errMessage = "'service_name' is not defined or has invalid characters";
+      let errType = "BadRequest";
+      let allCases = true;
       //if checkCase() returns false for any of the nameValues assigned above, have allCases be false
-      for (i in nameValues){
-        if(!checkCase("body","service_name",nameValues[i],errMessage,errType)){
+      for (i in nameValues) {
+        if (!checkCase("body", "service_name", nameValues[i], errMessage, errType)) {
           allCases = false;
         }
       }
@@ -160,96 +173,540 @@ describe('create-serverless-service', function() {
     });
 
     /*
-    * Given an event indicating a lambda or api service but no runtime, handler() informs of missing Runtime
-    * @param {object} event, contains a service type that isn't "website", and no body.runtime
-    * @params {object, function} default aws context and callback function as assigned above respectively
-    * @returns index.handler() should return an InternalServerError notification
-    */
-    it("should inform of error if given no event.body.runtime for a service other than website", ()=>{
-      var runtime = "";
-      var errType = "BadRequest";
-      var errMessage = "'runtime' is not defined";
-      var allCases = checkCase("body","runtime",runtime,errMessage,errType) &&
-                      checkCase("body", "runtime", null, errMessage, errType) &&
-                      checkCase("body", "runtime", undefined, errMessage, errType);
+     * Given an event indicating a lambda or api service but no runtime, handler() informs of missing Runtime
+     * @param {object} event, contains a service type that isn't "website", and no body.runtime
+     * @params {object, function} default aws context and callback function as assigned above respectively
+     * @returns index.handler() should return an InternalServerError notification
+     */
+
+    it("should inform of error if given no event.body.runtime for a service other than website", () => {
+      let runtime = "";
+      let errType = "BadRequest";
+      let errMessage = "'runtime' is not defined";
+      let allCases = checkCase("body", "runtime", runtime, errMessage, errType) &&
+        checkCase("body", "runtime", null, errMessage, errType) &&
+        checkCase("body", "runtime", undefined, errMessage, errType);
       assert.isTrue(allCases);
     });
 
     /*
-    * Given an event with an invalid body.domain, handler informs of inappropriate domain
-    * @param {object} event, contains a domain that has one or more invalid characters
-    * @params {object, function} default aws context and callback function as assigned above respectively
-    * @returns index.handler() should return an InternalServerError notification
-    */
-    it("should inform user of error if invalid domain value", function(){
+     * Given an event with an invalid body.domain, handler informs of inappropriate domain
+     * @param {object} event, contains a domain that has one or more invalid characters
+     * @params {object, function} default aws context and callback function as assigned above respectively
+     * @returns index.handler() should return an InternalServerError notification
+     */
+
+    it("should inform user of error if invalid domain value", function () {
       //invalid if containing a non-alphanumeric character
-      var invalidName2 = "f!utterShy";
-      var errMessage = "Namespace is not appropriate";
-      var errType = "BadRequest";
-      var invalidCase = checkCase("body", "domain", invalidName2, errMessage, errType);
+      let invalidName2 = "f!utterShy";
+      let errMessage = "Namespace is not appropriate";
+      let errType = "BadRequest";
+      let invalidCase = checkCase("body", "domain", invalidName2, errMessage, errType);
       assert.isTrue(invalidCase);
     });
 
     /*
-    * Given an event with no principalId provided, handler() indicates user isn't authorized
-    * @param {object} event, contains a principalId value that is either undefined or null
-    * @params {object, function} default aws context and callback function as assigned above respectively
-    * @returns index.handler() should return an UnAuthorized error notification
-    */
-    it("should state the user isn't authorized if no principalId is given", function(){
-      var errMessage = "User is not authorized to access this service";
-      var errType = "Forbidden";
-      var bothCases = checkCase("principalId", null, null, errMessage, errType) &&
-                      checkCase("principalId", null, undefined, errMessage, errType);
+     * Given an event with no principalId provided, handler() indicates user isn't authorized
+     * @param {object} event, contains a principalId value that is either undefined or null
+     * @params {object, function} default aws context and callback function as assigned above respectively
+     * @returns index.handler() should return an UnAuthorized error notification
+     */
+
+    it("should state the user isn't authorized if no principalId is given", function () {
+      let errMessage = "User is not authorized to access this service";
+      let errType = "Forbidden";
+      let bothCases = checkCase("principalId", null, null, errMessage, errType) &&
+        checkCase("principalId", null, undefined, errMessage, errType);
       assert.isTrue(bothCases);
     });
-
     /*
-    * Given an event with an invalid rateExpression, handler() indicates the expression is invalid
-    * @param {object} event, contains a body.rateExpression that is empty, null, or invalid
-    * @params {object, function} default aws context and callback function as assigned above respectively
-    * @returns index.handler() should return a descriptive InternalServer error notification
-    */
-    it("should inform the user the rateExpression is invalid if given a faulty rateExpression", ()=>{
-      var cronValues = [null, "", "P!nk!e_P!e"];
-      var errMessage1 = "Empty Cron expression.";
-      var errMessage2 = "Invalid Cron expression. ";
-      var errType = "InternalServerError";
-      var allCases = checkCase("body", "rateExpression", cronValues[0], errMessage1, errType) &&
-                      checkCase("body", "rateExpression", cronValues[1], errMessage1, errType) &&
-                      checkCase("body", "rateExpression", cronValues[2], errMessage2, errType);
-      assert.isTrue(allCases);
+     * Given successful parameters and setup, handler() should send a POST http request
+     * @params {object, object, function} default event, aws context, callback
+     * @returns index.handler() should attempt an http POST if given valid paramters
+     */
+
+    it("should give success message if service onboarding in Jenkins setup attempt is succesfull", () => {
+      let responseObject_getToken = {
+        statusCode: 200,
+        body: {
+          data: {
+            "token": "ghd93-3240-2343"
+          }
+        }
+      };
+      let responseObject_createService = {
+        statusCode: 200,
+        body: {
+          data: {
+            "service_id": "ghd93-3240-2343"
+          }
+        }
+      };
+      let responseObject_serviceOnboarding = {
+        statusCode: 200,
+        body: {
+          message: "Service Creation Success"
+        }
+      };
+      event.stage = "dev";
+      let config = configObj(event);
+      // wrapping requests 
+      reqStub = sinon.stub(request, "Request", (obj) => {
+        // Matching response Object to the corresponding Request call
+        if (obj.uri === (config.SERVICE_API_URL + config.TOKEN_URL)) {
+          return obj.callback(null, responseObject_getToken, responseObject_getToken.body);
+        } else if (obj.uri === "https://{conf-apikey}.execute-api.{conf-region}.amazonaws.com/dev/jazz/services") {
+
+          return obj.callback(null, responseObject_createService, responseObject_createService.body);
+
+        } else if (obj.url === '{conf-jenkins-host}/job/create-service/buildWithParameters') {
+
+          return obj.callback(null, responseObject_serviceOnboarding, responseObject_serviceOnboarding.body);
+        }
+      });
+
+      //trigger the spy wrapping the logger by calling handler() with valid params
+      let callFunction = index.handler(event, context, (err, res) => {
+        reqStub.restore()
+          expect(res.data).to.be.equal("Successfully created your service."); 
+      })
     });
 
-    /*
-    * Given successful parameters and setup, handler() should send a POST http request
-    * @params {object, object, function} default event, aws context, callback
-    * @returns index.handler() should attempt an http POST if given valid paramters
-    */
-    it("should send an http POST given valid input parameters", function(){
-      //wrapping the Request() method that gets internally called by node request.js for any http method
+    it("should Return the Error message if jenkinks job failed ", () => {
+      let bool = false;
+      let responseObject_getToken = {
+        statusCode: 200,
+        body: {
+          data: {
+            "token": "ghd93-3240-2343"
+          }
+        }
+      };
+      let responseObject_createService = {
+        statusCode: 200,
+        body: {
+          data: {
+            "service_id": "ghd93-3240-2343"
+          }
+        }
+      };
+      let responseObject_serviceOnboarding = {
+        statusCode: 401,
+        body: {
+          message: "Service onboarding jenkings build Failed"
+        }
+      };
+      let responseObject_update = {
+        statusCode: 200,
+        body: {
+          data: "Service catalog updated"
+        }
+      };
+      event.stage = "dev";
+      let config = configObj(event);
+// wrapping requests 
+      reqStub = sinon.stub(request, "Request", (obj) => {
+ // Matching response Object to the corresponding Request call
+        if (obj.uri === (config.SERVICE_API_URL + config.TOKEN_URL)) {
+          return obj.callback(null, responseObject_getToken, responseObject_getToken.body);
+        } else if (obj.uri === "https://{conf-apikey}.execute-api.{conf-region}.amazonaws.com/dev/jazz/services") {
+          return obj.callback(null, responseObject_createService, responseObject_createService.body);
+        } else if (obj.url === '{conf-jenkins-host}/job/create-service/buildWithParameters') {
+          let errObject = {
+            message: responseObject_serviceOnboarding.body.message,
+            jenkins_api_failure: true
+          }
+          return obj.callback(errObject, responseObject_serviceOnboarding, responseObject_serviceOnboarding.body);
+        } else if (obj.uri = 'https://{conf-apikey}.execute-api.{conf-region}.amazonaws.com/dev/jazz/services/ghd93-3240-2343') {
+          obj.callback(null, responseObject_update, responseObject_update.body);
+        }
+      });
+      let callFunction = index.handler(event, context, (err, res) => {
+        err = JSON.parse(err);
+        if (err.message == "Service onboarding jenkings build Failed") {
+          bool = true;
+        }
+        assert.isTrue(bool);
+      })
+    })
+  })
+  describe("getToken", () => {
+    let config, event;
+    beforeEach(() => {
+      event = {
+        "stage": "test",
+        "headers": {
+          "Authorization": "fr1end$hip_1s_mAg1c"
+        },
+        "principalId": "@pp1eJack",
+        "body": {
+          "service_name": "test-service",
+          "service_type": "function",
+          "domain": "test-domain",
+          "runtime": "nodejs",
+          "approvers": ['tw1light_$pArkle'],
+          "rateExpression": "1 * * * ? *",
+          "slack_channel": "mlp_fim",
+          "require_internal_access": false,
+          "create_cloudfront_url": false
+        }
+      };
+      config = configObj(event);
+    })
+
+    it("Should Return authToken when called with valid paramenters", () => {
+      let bool = false;
+      let responseObject = {
+        statusCode: 200,
+        body: {
+          data: {
+            "token": "ghd93-3240-2343"
+          }
+        }
+      };
+      let reqStub = sinon.stub(request, "Request", (obj) => {
+        return obj.callback(null, responseObject, responseObject.body);
+      });
+      index.getToken(config).then((res) => {
+        if (res && res === "ghd93-3240-2343") {
+          bool = true;
+        }
+        assert.isTrue(bool);
+      })
+      sinon.assert.calledOnce(reqStub);
+      reqStub.restore();
+    })
+
+    it("Should Return error message  when called with invalid paramenters", () => {
+      let bool = false;
+      let errMessage = "Could not get authentication token for updating service catalog.";
+      let responseObject = {
+        statusCode: 401,
+        body: {
+          message: "invalid pramenters",
+          data: null
+        }
+      };
+      let reqStub = sinon.stub(request, "Request", (obj) => {
+        //Returning Failure Response
+        return obj.callback(null, responseObject, responseObject.body);
+      });
+
+      index.getToken(config).then(() => {
+        assert.fail()
+      }).catch((err) => {
+        if (err.error && err.error === errMessage) {
+          bool = true
+        }
+        assert.isTrue(bool);
+      })
+      sinon.assert.calledOnce(reqStub);
+      reqStub.restore();
+    })
+
+  })
+  describe("getServiceData", () => {
+    beforeEach(function () {
+      event = {
+        "stage": "test",
+        "headers": {
+          "Authorization": "fr1end$hip_1s_mAg1c"
+        },
+        "principalId": "@pp1eJack",
+        "body": {
+          "service_name": "test-service",
+          "service_type": "function",
+          "domain": "test-domain",
+          "runtime": "nodejs",
+          "approvers": ['tw1light_$pArkle'],
+          "rateExpression": "1 * * * ? *",
+          "slack_channel": "mlp_fim",
+          "require_internal_access": false,
+          "create_cloudfront_url": false 
+        }
+      };
+      service_creation_data = event.body;
+      context = awsContext();
+      callback = (err, responseObj) => {
+        if (err) {
+          return err;
+        } else {
+          return JSON.stringify(responseObj);
+        }
+      };
+    });
+
+    it("should should return error when passed an invalid rateExpression", () => {
+      let cronValues = [null, "", "P!nk!e_P!e"];
+      let authToken = "temp-auth-token";
+      let config = configObj(event);
+      let bool = false;
+      for (let cron in cronValues) {
+        service_creation_data.rateExpression = cron
+        index.getServiceData(service_creation_data, authToken, config).catch((errorMsg) => {
+
+          if (errorMsg.result === "invalid") {
+            bool = true;
+          }
+          assert.isTrue(bool);
+        })
+      }
+
+    });
+
+    it("should return input object with METADATA values for valid input parameters for service type function (event_source e2c)", () => {
+      let authToken = "temp-auth-token";
+      let bool = false;
+      service_creation_data["enableEventSchedule"] = true;
+      service_creation_data.event_source_ec2 = "temp-url";
+      service_creation_data.event_action_ec2 = "temp-url";
+      service_creation_data.event_source_ec2 = "sample-test-data"
+      let config = configObj(event);
+      index.getServiceData(service_creation_data, authToken, config).then((input) => {
+        if (input.METADATA.eventScheduleEnable && input.METADATA.eventScheduleRate != null && input.METADATA.eventScheduleRate != "") {
+          if (input.METADATA.event_action_ec2 && input.METADATA.event_action_ec2 != null) {
+            bool = true;
+          }
+        }
+        assert.isTrue(bool);
+      })
+    });
+
+    it("should return input object with METADATA values for valid input parameters for service type function (event_source s3)", () => {
+      let authToken = "temp-auth-token";
+      let bool = false;
+      service_creation_data["enableEventSchedule"] = true;
+      service_creation_data.event_action_s3 = "temp-url";
+      service_creation_data.event_source_s3 = "sample-test-data"
+      let config = configObj(event);
+      index.getServiceData(service_creation_data, authToken, config).then((input) => {
+        if (input.METADATA.eventScheduleEnable && input.METADATA.eventScheduleRate != null && input.METADATA.eventScheduleRate != "") {
+          if (input.METADATA.event_action_s3 && input.METADATA.event_action_s3 != null) {
+            bool = true;
+          }
+        }
+        assert.isTrue(bool);
+      })
+    });
+
+    it("should return input object with METADATA values for valid input parameters for service type function (event source dynamoDB)", () => {
+      let authToken = "temp-auth-token";
+      let bool = false;
+      service_creation_data["enableEventSchedule"] = true;
+      service_creation_data.event_source_dynamodb = "temp-url";
+      service_creation_data.event_action_dynamodb = "temp-url";
+      service_creation_data.event_source_dynamodb = "sample-test-data"
+      let config = configObj(event);
+      index.getServiceData(service_creation_data, authToken, config).then((input) => {
+        if (input.METADATA.eventScheduleEnable && input.METADATA.eventScheduleRate != null && input.METADATA.eventScheduleRate != "") {
+          if (input.METADATA.event_action_dynamodb && input.METADATA.event_action_dynamodb != null) {
+            bool = true;
+          }
+        }
+        assert.isTrue(bool);
+      })
+    });
+
+    it("should return input object with METADATA values for valid input parameters for service type function (event source stream", () => {
+      let authToken = "temp-auth-token";
+      let bool = false;
+      service_creation_data["enableEventSchedule"] = true;
+      service_creation_data.event_source_stream = "temp-url";
+      service_creation_data.event_action_stream = "temp-url";
+      service_creation_data.event_source_stream = "sample-test-data"
+      let config = configObj(event);
+      index.getServiceData(service_creation_data, authToken, config).then((input) => {
+        if (input.METADATA.eventScheduleEnable && input.METADATA.eventScheduleRate != null && input.METADATA.eventScheduleRate != "") {
+          if (input.METADATA.event_action_stream && input.METADATA.event_action_stream != null) {
+            bool = true;
+          }
+        }
+        assert.isTrue(bool);
+      })
+    })
+
+  })
+  describe("createService", () => {
+    let input;
+    beforeEach(() => {
+      input = {
+        TOKEN: 'temp-auth-token',
+        SERVICE_API_URL: undefined,
+        SERVICE_API_RESOURCE: undefined,
+        SERVICE_NAME: 'test-service',
+        DOMAIN: 'test-domain',
+        DESCRIPTION: undefined,
+        TYPE: 'function',
+        RUNTIME: 'nodejs',
+        REGION: "east,UST",
+        USERNAME: '@pp1eJack',
+        STATUS: 'creation_started',
+        SLACKCHANNEL: 'mlp_fim',
+        METADATA: {
+          require_internal_access: false,
+          eventScheduleRate: 'cron(1 * * * ? *)',
+          eventScheduleEnable: true
+        }
+      }
+    })
+
+    it("should send an http POST given valid input parameters ", () => {
       stub = sinon.stub(request, "Request", spy);
       //trigger the spy wrapping the request by calling handler() with valid params
-      var callFunction = index.handler(event, context, callback);
+      let callFunction = index.createService(input);
       stub.restore();
       assert.isTrue(spy.called);
-    });
+    })
 
-    /*
-    * Given a failed http Post attempt, handler() indicates there was an error with the Jenkins job
-    * @params {object, object, function} default event, aws context, callback
-    * @returns index.handler() should return a descriptive error message concerning a failed Jenkins Job
-    */
-    it("should indicate an error occured with Jenkins setup if the POST attempt fails", () => {
-      //wrapping the logger messages to console to check for error message
-      stub = sinon.stub(logger, "error", spy);
-      //trigger the spy wrapping the logger by calling handler() with valid params
-      var callFunction = index.handler(event, context, callback);
-      stub.restore();
-      //spy has already been called for previous case, so the arguments passed to the logger.error()
-      //are contained in an array at spy.args[1]
-      var bool = spy.args[1][0].includes("Error while starting Jenkins job: ");
-      assert.isTrue(bool);
+    it("should Return service id of Created Service in case of successfull service creation", () => {
+      let bool = false;
+      let responseObject = {
+        statusCode: 200,
+        body: {
+          data: {
+            "service_id": "ghd93-3240-2343"
+          }
+        }
+      };
+      let reqStub = sinon.stub(request, "Request", (obj) => {
+        return obj.callback(null, responseObject, responseObject.body);
+      });
+      let createserviceReturn = index.createService(input);
+      createserviceReturn.then((res) => {
+        if (res && res === "ghd93-3240-2343") {
+          bool = true;
+        }
+        assert.isTrue(bool);
+      })
+      sinon.assert.calledOnce(reqStub);
+      reqStub.restore();
+    })
+
+    it("Should Return error when service creation failed", () => {
+      let bool = false;
+      let responseObject = {
+        statusCode: 401,
+        body: {
+          message: "401 UNAUTHORIZED"
+        }
+      };
+      let reqStub = sinon.stub(request, "Request", (obj) => {
+        return obj.callback(null, responseObject, responseObject.body);
+      });
+      let createserviceReturn = index.createService(input);
+      let errMessage = "Error creating service " + input.DOMAIN + "." + input.SERVICE_NAME + " in service catalog"
+      createserviceReturn.catch((err) => {
+
+        if (err.message && err.message === errMessage) {
+          bool = true;
+        }
+        assert.isTrue(bool);
+      })
+      sinon.assert.calledOnce(reqStub);
+      reqStub.restore();
     });
+
+  })
+  describe("startServiceOnboarding", () => {
+    let config, service_id, event;
+    beforeEach(() => {
+      event = {
+        "stage": "test",
+        "headers": {
+          "Authorization": "fr1end$hip_1s_mAg1c"
+        },
+        "principalId": "@pp1eJack",
+        "body": {
+          "service_name": "test-service",
+          "service_type": "function",
+          "domain": "test-domain",
+          "runtime": "nodejs",
+          "approvers": ['tw1light_$pArkle'],
+          "rateExpression": "1 * * * ? *",
+          "slack_channel": "mlp_fim",
+          "require_internal_access": false,
+          "create_cloudfront_url": false
+         
+        }
+      };
+      service_creation_data =  event.body;
+      config = configObj(event);
+      service_id = "ghd93-3240-2343";
+    })
+
+    it("should return error message if request to start jenkins job failed ", () => {
+      let bool = false;
+      let responseObject = {
+        statusCode: 401,
+        body: {
+          message: "401 UNAUTHORIZED Jenkins Job Not triggered"
+        }
+      };
+      let reqStub = sinon.stub(request, "Request", (obj) => {
+        let errObject = {
+          message: responseObject.body.message,
+          jenkins_api_failure: true
+        }
+        return obj.callback(errObject, responseObject, responseObject.body);
+      });
+      index.startServiceOnboarding(service_creation_data, config, service_id).then(() => {
+        assert.fail();
+      }).catch((err) => {
+        if (err.jenkins_api_failure && err.message != null) {
+          bool = true;
+        }
+        assert.isTrue(bool);
+      })
+      sinon.assert.calledOnce(reqStub);
+      reqStub.restore();
+    })
+
+    it("should return error message when jenkins job has failed", () => {
+      let bool = false;
+      let errMessage = "Failed to kick off service onboarding job."
+      let responseObject = {
+        statusCode: 401,
+        body: {
+          message: "401 UNAUTHORIZED Jenkins Job Failed"
+        }
+      };
+      let reqStub = sinon.stub(request, "Request", (obj) => {
+        return obj.callback(null, responseObject, responseObject.body);
+      });
+      index.startServiceOnboarding(service_creation_data, config, service_id).then(() => {
+        assert.fail();
+      }).catch((err) => {
+        if (err.jenkins_api_failure && err.message && err.message === errMessage) {
+          bool = true;
+        }
+        assert.isTrue(bool);
+      })
+      sinon.assert.calledOnce(reqStub);
+      reqStub.restore();
+    })
+
+    it("should return success message when jenkins job has executed succesfully", () => {
+      let bool = false;
+      let Message = "Successfully created your service.";
+      let responseObject = {
+        statusCode: 200,
+        body: {
+          message: "Service Creation Success"
+        }
+      };
+      let reqStub = sinon.stub(request, "Request", (obj) => {
+        return obj.callback(null, responseObject, responseObject.body);
+      });
+      index.startServiceOnboarding(service_creation_data, config, service_id).then((res) => {
+
+        if (res && res === Message) {
+          bool = true;
+        }
+        assert.isTrue(bool);
+      })
+      sinon.assert.calledOnce(reqStub);
+      reqStub.restore()
+    })
+
   })
-});
+})
\ No newline at end of file
diff --git a/jazz_deployments-event-handler/Jenkinsfile_Platform b/jazz_deployments-event-handler/Jenkinsfile_Platform
new file mode 100644
index 0000000000..117fc951c0
--- /dev/null
+++ b/jazz_deployments-event-handler/Jenkinsfile_Platform
@@ -0,0 +1,47 @@
+#!groovy
+import groovy.json.JsonOutput
+import groovy.transform.Field
+
+// To be replaced as @Field def repo_credential_id = "value" for repo_credential_id, repo_base and repo_core
+@Field def repo_credential_id
+@Field def repo_base
+@Field def repo_core
+@Field def scm_type
+
+@Field def config_loader
+
+/*
+* Load environment variables from build module
+*/
+def loadConfigModule(build_module_url){
+  dir('config-loader') {
+    checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: repo_credential_id, url: build_module_url]]])
+    def result_json_string = readFile("jazz-installer-vars.json")
+    config_module = load "config-loader.groovy"
+    config_loader = config_module.initialize(result_json_string)
+  }
+}
+
+node {
+  loadConfigModule(getBuildModuleUrl())
+
+  withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: config_loader.JENKINS.CREDENTIAL_ID, passwordVariable: 'PWD',
+    usernameVariable: 'UNAME']]){
+
+    echo "Build triggered via branch::${env.BRANCH_NAME}"
+    
+    def build_job = config_loader.LAMBDA.LAMBDA_BUILD_URI
+    def job_url = JenkinsLocationConfiguration.get().getUrl() + build_job
+
+    sh "curl -X GET -k -v -u \"$UNAME:$PWD\"  \"" + job_url + "&service_name=deployments-event-handler&domain=jazz&scm_branch=${env.BRANCH_NAME}\""
+  }
+}
+
+def getBuildModuleUrl() {
+  if (scm_type && scm_type != "bitbucket") {
+    // right now only bitbucket has this additional tag scm in its git clone path
+    return "http://${repo_base}/${repo_core}/jazz-build-module.git"
+  } else {
+    return "http://${repo_base}/scm/${repo_core}/jazz-build-module.git"
+  }
+}
\ No newline at end of file
diff --git a/jazz_deployments-event-handler/README.md b/jazz_deployments-event-handler/README.md
new file mode 100644
index 0000000000..fd377fdd45
--- /dev/null
+++ b/jazz_deployments-event-handler/README.md
@@ -0,0 +1 @@
+Lambda service for handling deployment related events
\ No newline at end of file
diff --git a/jazz_deployments-event-handler/build.lambda b/jazz_deployments-event-handler/build.lambda
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/jazz_deployments-event-handler/components/config.js b/jazz_deployments-event-handler/components/config.js
new file mode 100644
index 0000000000..a70d4c2eea
--- /dev/null
+++ b/jazz_deployments-event-handler/components/config.js
@@ -0,0 +1,26 @@
+/**
+  @module: config.js
+  @description: Defines variables/functions to retrieve deployment related data
+	@author:
+	@version: 1.0
+**/
+
+var getStageConfig = (context) => {
+  var functionName = context.functionName;
+  var configObj = {};
+  // Loads the config files based on the env.
+  // Please edit the JSON files.
+  if (functionName.endsWith('dev')) {
+    configObj = require('../config/dev-config.json');
+  } else if (functionName.endsWith('stg')) {
+    configObj = require('../config/stg-config.json');
+  } else if (functionName.endsWith('prod')) {
+    configObj = require('../config/prod-config.json');
+  }
+  return configObj;
+};
+
+module.exports = (context) => {
+  var config = getStageConfig(context);
+  return config;
+};
\ No newline at end of file
diff --git a/jazz_deployments-event-handler/components/error-handler.js b/jazz_deployments-event-handler/components/error-handler.js
new file mode 100644
index 0000000000..01439535f8
--- /dev/null
+++ b/jazz_deployments-event-handler/components/error-handler.js
@@ -0,0 +1,42 @@
+/**
+  @module: error-handler.js
+  @description: Defines functions raising API Errors in required format for API Gateway integration
+  @author:
+  @version: 1.0
+**/
+
+module.exports = () => {
+    var errorObj = {
+        throwInputValidationError: function (errorMessage) { //Raise a  bad requests exception
+            return {
+                errorType: "BadRequest",
+                message: errorMessage.toString()
+            };
+        },
+        throwUnauthorizedError: function (errorMessage) { //Raise not found exceptions
+            return {
+                errorType: "Unauthorized",
+                message: errorMessage.toString()
+            };
+        },
+        throwForbiddenError: function (errorMessage) { //Raise not found exceptions
+            return {
+                errorType: "Forbidden",
+                message: errorMessage.toString()
+            };
+        },
+        throwNotFoundError: function (errorMessage) { //Raise not found exceptions
+            return {
+                errorType: "NotFound",
+                message: errorMessage.toString()
+            };
+        },
+        throwInternalServerError: function (errorMessage) { //Raise internal server exceptions
+            return {
+                errorType: "InternalServerError",
+                message: errorMessage.toString()
+            };
+        }
+    };
+    return errorObj;
+};
\ No newline at end of file
diff --git a/jazz_deployments-event-handler/components/logger.js b/jazz_deployments-event-handler/components/logger.js
new file mode 100644
index 0000000000..84b18bb9cb
--- /dev/null
+++ b/jazz_deployments-event-handler/components/logger.js
@@ -0,0 +1,133 @@
+/**
+    @module: logger.js
+    @description: a simple logging module for nodejs
+    @author:
+    @version: 1.0
+**/
+
+
+/*
+USAGE
+
+    logger = require('./components/logger.js')
+
+    logger.init(event, context); // by default logging level is info
+
+    logger.warn('The following waring message will be logged');
+    logger.verbose('The following waring message will not be logged')
+
+
+    // Sample logging messages.
+    logger.error('Runtime errors or unexpected conditions.');
+    logger.warn('Runtime situations that are undesirable or unexpected, but not necessarily "wrong".');
+    logger.info('Interesting runtime events (Eg. connection established, data fetched etc).');
+    logger.verbose('Generally speaking, most lines logged by your application should be written as verbose.');
+    logger.debug('Detailed information on the flow through the system.);
+
+    // Alternate usage
+    logger.log('error', 'message');
+    logger.log('info', 'message');
+
+*/
+module.exports = function () {
+    var logLevels = {
+        error: 4,
+        warn: 3,
+        info: 2,
+        verbose: 1,
+        debug: 0
+    };
+
+    var config = {
+        curLogLevel: 'info',
+        requestDetails: ''
+    };
+
+    // set logLevel, RequestDetails
+    var init = function (event, context) {
+        setLevel();
+    };
+
+    // To add request specific details, which will be prepended in all the logs for ease of debugging in CloudWatch logs
+    var setRequestDetails = function (someContextSpecificId) {
+        return;
+    };
+
+    // set current logLevel; Only logs which are above the curLogLevel will be logged;
+    var setLevel = function (level) {
+        // LOG_LEVEL is 'info' by default
+
+        if (level !== undefined && logLevels[level] !== undefined) {
+            // If LOG_LEVEL if explicitly specified , set it as the curLogLevel
+            config.curLogLevel = level;
+            return level;
+        } else {
+            // Get LOG_LEVEL from the environment variables (if defined)
+            try {
+                level = process.env.LOG_LEVEL;
+            } catch (e) {
+                error('error trying to access LOG_LEVEL');
+            }
+            if (level !== undefined && logLevels[level] !== undefined) {
+                config.curLogLevel = level;
+                return level;
+            }
+        }
+        return null;
+    };
+
+    var log = function (level, message) {
+        /*
+            @TODO: format message as per requirement.
+            Will it be just a string / json. Should we except error object also?
+        */
+        var timestamp = new Date().toISOString();
+        if (logLevels[level] >= logLevels[config.curLogLevel]) {
+            if (level === 'error') {
+                console.error(timestamp, 'ERROR \t', config.requestDetails, message);
+                /*
+                    If required, add custom actions here; Such as send a mail, etc...
+                */
+            } else if (level === 'warn') {
+                console.warn(timestamp, 'WARN  \t', config.requestDetails, message);
+            } else if (level === 'info') {
+                console.info(timestamp, 'INFO  \t', config.requestDetails, message);
+            } else if (level === 'verbose') {
+                console.info(timestamp, 'VERBOSE  \t', config.requestDetails, message);
+            } else if (level === 'debug') {
+                console.info(timestamp, 'DEBUG  \t', config.requestDetails, message);
+            } else {
+                console.log(timestamp, level, '\t', config.requestDetails, message);
+            }
+        }
+        return null;
+    };
+
+    var error = function (message) {
+        log('error', message);
+    };
+    var warn = function (message) {
+        log('warn', message);
+    };
+    var info = function (message) {
+        log('info', message);
+    };
+    var verbose = function (message) {
+        log('verbose', message);
+    };
+    var debug = function (message) {
+        log('debug', message);
+    };
+
+    return {
+        init: init,
+        setLevel: setLevel,
+        log: log,
+        error: error,
+        warn: warn,
+        info: info,
+        verbose: verbose,
+        debug: debug,
+        logLevel: config.curLogLevel
+    };
+} ();
\ No newline at end of file
diff --git a/jazz_deployments-event-handler/config/dev-config.json b/jazz_deployments-event-handler/config/dev-config.json
new file mode 100644
index 0000000000..db80654baa
--- /dev/null
+++ b/jazz_deployments-event-handler/config/dev-config.json
@@ -0,0 +1,22 @@
+{
+    "BASE_API_URL": "https://{conf-apikey}.execute-api.{conf-region}.amazonaws.com",
+    "TOKEN_URL": "/dev/jazz/login",
+    "SERVICE_USER": "{jazz_admin}",
+    "TOKEN_CREDS": "{jazz_admin_creds}",
+    "DEPLOYMENT_API_RESOURCE": "/dev/jazz/deployments",
+    "TOKEN_API_RESOURCE": "/dev/jazz/login",
+    "EVENTS": {
+        "event_type": [
+            "SERVICE_DEPLOYMENT",
+            "SERVICE_DELETION"
+        ],
+        "event_name": [
+            "CREATE_DEPLOYMENT",
+            "UPDATE_DEPLOYMENT",
+            "DELETE_DEPLOYMENT"
+        ],
+        "create_event_name": "CREATE_DEPLOYMENT",
+        "update_event_name": "UPDATE_DEPLOYMENT",
+        "delete_event_name": "DELETE_DEPLOYMENT"
+    }
+}
\ No newline at end of file
diff --git a/jazz_deployments-event-handler/config/prod-config.json b/jazz_deployments-event-handler/config/prod-config.json
new file mode 100644
index 0000000000..682446e67a
--- /dev/null
+++ b/jazz_deployments-event-handler/config/prod-config.json
@@ -0,0 +1,22 @@
+{
+    "BASE_API_URL": "https://{conf-apikey}.execute-api.{conf-region}.amazonaws.com",
+    "TOKEN_URL": "/prod/jazz/login",
+    "SERVICE_USER": "{jazz_admin}",
+    "TOKEN_CREDS": "{jazz_admin_creds}",
+    "DEPLOYMENT_API_RESOURCE": "/prod/jazz/deployments",
+    "TOKEN_API_RESOURCE": "/prod/jazz/login",
+    "EVENTS": {
+        "event_type": [
+            "SERVICE_DEPLOYMENT",
+            "SERVICE_DELETION"
+        ],
+        "event_name": [
+            "CREATE_DEPLOYMENT",
+            "UPDATE_DEPLOYMENT",
+            "DELETE_DEPLOYMENT"
+        ],
+        "create_event_name": "CREATE_DEPLOYMENT",
+        "update_event_name": "UPDATE_DEPLOYMENT",
+        "delete_event_name": "DELETE_DEPLOYMENT"
+    }
+}
\ No newline at end of file
diff --git a/jazz_deployments-event-handler/config/stg-config.json b/jazz_deployments-event-handler/config/stg-config.json
new file mode 100644
index 0000000000..9c1b56372a
--- /dev/null
+++ b/jazz_deployments-event-handler/config/stg-config.json
@@ -0,0 +1,22 @@
+{
+    "BASE_API_URL": "https://{conf-apikey}.execute-api.{conf-region}.amazonaws.com",
+    "TOKEN_URL": "/stg/jazz/login",
+    "SERVICE_USER": "{jazz_admin}",
+    "TOKEN_CREDS": "{jazz_admin_creds}",
+    "DEPLOYMENT_API_RESOURCE": "/stg/jazz/deployments",
+    "TOKEN_API_RESOURCE": "/stg/jazz/login",
+    "EVENTS": {
+        "event_type": [
+            "SERVICE_DEPLOYMENT",
+            "SERVICE_DELETION"
+        ],
+        "event_name": [
+            "CREATE_DEPLOYMENT",
+            "UPDATE_DEPLOYMENT",
+            "DELETE_DEPLOYMENT"
+        ],
+        "create_event_name": "CREATE_DEPLOYMENT",
+        "update_event_name": "UPDATE_DEPLOYMENT",
+        "delete_event_name": "DELETE_DEPLOYMENT"
+    }
+}
\ No newline at end of file
diff --git a/jazz_deployments-event-handler/deployment-env.yml b/jazz_deployments-event-handler/deployment-env.yml
new file mode 100644
index 0000000000..766172abc5
--- /dev/null
+++ b/jazz_deployments-event-handler/deployment-env.yml
@@ -0,0 +1 @@
+service_id : {service_id}
\ No newline at end of file
diff --git a/jazz_deployments-event-handler/event.json b/jazz_deployments-event-handler/event.json
new file mode 100644
index 0000000000..d5df76e7e0
--- /dev/null
+++ b/jazz_deployments-event-handler/event.json
@@ -0,0 +1,3 @@
+{
+  "key": "value"
+}
\ No newline at end of file
diff --git a/jazz_deployments-event-handler/index.js b/jazz_deployments-event-handler/index.js
new file mode 100644
index 0000000000..ab56f07d27
--- /dev/null
+++ b/jazz_deployments-event-handler/index.js
@@ -0,0 +1,384 @@
+/**
+	Deployments event handler function.
+	@Author: 
+	@version: 1.0
+**/
+
+const _ = require("lodash");
+const request = require("request");
+const rp = require('request-promise-native');
+const Uuid = require("uuid/v4");
+
+const config = require("./components/config.js"); 
+const logger = require("./components/logger.js"); 
+const errorHandlerModule = require("./components/error-handler.js");
+const fcodes = require('./utils/failure-codes.js');
+
+var errorHandler = errorHandlerModule(logger);
+
+var failureCodes = fcodes();
+var processedEvents = [];
+var failedEvents = [];
+
+var handler = (event, context, cb) => {
+	var configData = config(context);
+	var authToken;
+
+	rp(getTokenRequest(configData))
+		.then(result => {
+			return getAuthResponse(result);
+		})
+		.then(authToken => {
+			return processEventRecords(event, configData, authToken);
+		})
+		.then(result => {
+			var records = getEventProcessStatus();
+			logger.info("Successfully processed events: " + JSON.stringify(records));
+			return cb(null, records);
+		})
+		.catch(err => {
+			var records = getEventProcessStatus();
+			logger.error("Error processing events: " + JSON.stringify(err));
+			return cb(null, records);
+		});
+};
+
+var getTokenRequest = (configData) => {
+	return {
+		uri: configData.BASE_API_URL + configData.TOKEN_URL,
+		method: 'post',
+		json: {
+			"username": configData.SERVICE_USER,
+			"password": configData.TOKEN_CREDS
+		},
+		rejectUnauthorized: false,
+		transform: (body, response, resolveWithFullResponse) => {
+			return response;
+		}
+	};
+};
+
+var getAuthResponse = (result) => {
+	return new Promise((resolve, reject) => {
+		if (result.statusCode === 200 && result.body && result.body.data && result.body.data.token) {
+			return resolve(result.body.data.token);
+		} else {
+			logger.error("getAuthResponse failed");
+			return reject(errorHandler.throwInternalServerError("Invalid token response from API"));
+		}
+	});
+};
+
+var processEventRecords = (event, configData, authToken) => {
+	return new Promise((resolve, reject) => {
+		var processEventRecordPromises = [];
+		for (var i = 0; i < event.Records.length; i++) {
+			processEventRecordPromises.push(processEventRecord(event.Records[i], configData, authToken));
+		}
+		Promise.all(processEventRecordPromises)
+			.then((result) => {
+				return resolve(result);
+			})
+			.catch((error) => {
+				logger.error("processEventRecords failed: " + JSON.stringify(error));
+				return reject(error);
+			});
+	});
+};
+
+var processEventRecord = (record, configData, authToken) => {
+	return new Promise((resolve, reject) => {
+		var sequenceNumber = record.kinesis.sequenceNumber;
+		var encodedPayload = record.kinesis.data;
+		var payload;
+		return checkForInterestedEvents(encodedPayload, sequenceNumber, configData)
+			.then(result => {
+				payload = result.payload;
+				if (result.interested_event) {
+					return processEvent(payload, configData, authToken);
+				} else {
+					return new Promise((resolve, reject) => {
+						resolve({ "message": "Not an interesting event" });
+					});
+				}
+			})
+			.then(result => {
+				handleProcessedEvents(sequenceNumber, payload);
+				return resolve(result);
+			})
+			.catch(err => {
+				logger.error("processEventRecord failed for: " + JSON.stringify(record));
+				handleFailedEvents(sequenceNumber, err.failure_message, payload, err.failure_code);
+				return reject(err);
+			});
+	});
+};
+
+var checkForInterestedEvents = (encodedPayload, sequenceNumber, configData) => {
+	return new Promise((resolve, reject) => {
+		var kinesisPayload = JSON.parse(new Buffer(encodedPayload, 'base64').toString('ascii'));
+		if (kinesisPayload.Item.EVENT_TYPE && kinesisPayload.Item.EVENT_TYPE.S) {
+			if (_.includes(configData.EVENTS.event_type, kinesisPayload.Item.EVENT_TYPE.S) &&
+				_.includes(configData.EVENTS.event_name, kinesisPayload.Item.EVENT_NAME.S)) {
+				logger.info("found " + kinesisPayload.Item.EVENT_TYPE.S + " event with sequence number: " + sequenceNumber);
+				return resolve({
+					"interested_event": true,
+					"payload": kinesisPayload.Item
+				});
+			} else {
+				logger.error("Not an interested event or event type");
+				return resolve({
+					"interested_event": false,
+					"payload": kinesisPayload.Item
+				});
+			}
+		}
+	});
+};
+
+var processEvent = (eventPayload, configData, authToken) => {
+	return new Promise((resolve, reject) => {
+		if (eventPayload.SERVICE_CONTEXT && eventPayload.SERVICE_CONTEXT.S) {
+			if (eventPayload.EVENT_NAME.S === configData.EVENTS.create_event_name) {
+				processCreateEvent(eventPayload, configData, authToken)
+					.then(result => { return resolve(result); })
+					.catch(err => {
+						logger.error("processCreateEvent failed: " + JSON.stringify(err));
+						return reject(err);
+					});
+			} else if (eventPayload.EVENT_NAME.S === configData.EVENTS.update_event_name) {
+				processUpdateEvent(eventPayload, configData, authToken)
+					.then(result => { return resolve(result); })
+					.catch(err => {
+						logger.error("processUpdateEvent failed: " + JSON.stringify(err));
+						return reject(err);
+					});
+			} else if (eventPayload.EVENT_NAME.S === configData.EVENTS.delete_event_name) {
+				//TODO
+			}
+		} else {
+			logger.info("Service Context is not defined");
+			var err = handleError(failureCodes.PR_ERROR_4.code, "Service context is not defined");
+			return reject(err);
+		}
+	});
+};
+
+var handleError = (errorType, message) => {
+	var error = {};
+	error.failure_code = errorType;
+	error.failure_message = message;
+	return error;
+};
+
+var getDeploymentPayload = (svcContext) => {
+	var deploymentPayload = {};
+
+	if (svcContext.domain) {
+		deploymentPayload.domain = svcContext.domain;
+	}
+	if (svcContext.environment_logical_id) {
+		deploymentPayload.environment_logical_id = svcContext.environment_logical_id;
+	}
+	if (svcContext.provider_build_id) {
+		deploymentPayload.provider_build_id = svcContext.provider_build_id;
+	}
+	if (svcContext.provider_build_url) {
+		deploymentPayload.provider_build_url = svcContext.provider_build_url;
+	}
+	if (svcContext.scm_commit_hash) {
+		deploymentPayload.scm_commit_hash = svcContext.scm_commit_hash;
+	}
+	if (svcContext.scm_url) {
+		deploymentPayload.scm_url = svcContext.scm_url;
+	}
+	if (svcContext.scm_branch) {
+		deploymentPayload.scm_branch = svcContext.scm_branch;
+	}
+	if (svcContext.request_id) {
+		deploymentPayload.request_id = svcContext.request_id;
+	}
+	if (svcContext.status) {
+		deploymentPayload.status = svcContext.status;
+	}
+
+	return deploymentPayload;
+};
+
+var getSvcPayload = (method, payload, apiEndpoint, authToken) => {
+	var svcPayload = {
+		headers: {
+			'content-type': "application/json",
+			'authorization': authToken
+		},
+		rejectUnauthorized: false
+	}
+
+	svcPayload.uri = apiEndpoint;
+	svcPayload.method = method;
+	if (payload) {
+		svcPayload.json = payload;
+	}
+	logger.info("Deployment API payload :" + JSON.stringify(svcPayload));
+	return svcPayload;
+};
+
+var procesRequest = (svcPayload) => {
+	return new Promise((resolve, reject) => {
+		request(svcPayload, function (error, response, body) {
+			if (response.statusCode === 200 && body) {
+				return resolve(body);
+			} else {
+				logger.error("Error processing request: " + JSON.stringify(response));
+				var error = handleError(failureCodes.PR_ERROR_3.code, response.body.message);
+				return reject(error);
+			}
+		});
+	});
+};
+
+var processCreateEvent = (eventPayload, configData, authToken) => {
+	return new Promise((resolve, reject) => {
+		var svcContext = JSON.parse(eventPayload.SERVICE_CONTEXT.S);
+		logger.info("svcContext: " + JSON.stringify(svcContext));
+
+		var deploymentPayload = getDeploymentPayload(svcContext);
+		deploymentPayload.service_id = eventPayload.SERVICE_ID.S
+		deploymentPayload.service = eventPayload.SERVICE_NAME.S
+		var apiEndpoint = configData.BASE_API_URL + configData.DEPLOYMENT_API_RESOURCE;
+		var svcPayload = getSvcPayload("POST", deploymentPayload, apiEndpoint, authToken);
+
+		procesRequest(svcPayload)
+			.then(result => { return resolve(result); })
+			.catch(err => {
+				logger.error("processCreateEvent failed: " + JSON.stringify(err));
+				return reject(err);
+			});
+	});
+};
+
+var processUpdateEvent = (eventPayload, configData, authToken) => {
+	return new Promise((resolve, reject) => {
+		var svcContext = JSON.parse(eventPayload.SERVICE_CONTEXT.S);
+		logger.info("svcContext: " + JSON.stringify(svcContext));
+
+		var deploymentPayload = getDeploymentPayload(svcContext);
+		deploymentPayload.service_id = eventPayload.SERVICE_ID.S
+		deploymentPayload.service = eventPayload.SERVICE_NAME.S
+
+		getDeployments(deploymentPayload, configData, authToken)
+			.then(result => { return updateDeployments(result, deploymentPayload, configData, authToken); })
+			.then(result => { return resolve(result); })
+			.catch(err => {
+				logger.error("processUpdateEvent failed: " + JSON.stringify(err));
+				return reject(err);
+			});
+	});
+};
+
+var getDeployments = (deploymentPayload, configData, authToken) => {
+	return new Promise((resolve, reject) => {
+		var env_id = deploymentPayload.environment_logical_id;
+		if (env_id) {
+			var service_name = deploymentPayload.service;
+			var domain = deploymentPayload.domain;
+			var apiEndpoint = configData.BASE_API_URL + configData.DEPLOYMENT_API_RESOURCE + "?service=" + service_name + "&domain=" + domain + "&environment=" + env_id;;
+			var svcPayload = getSvcPayload("GET", null, apiEndpoint, authToken);
+			procesRequest(svcPayload)
+				.then(result => { return resolve(result); })
+				.catch(err => {
+					logger.error("getDeployments failed: " + JSON.stringify(err));
+					return reject(err);
+				});
+		} else {
+			logger.error("Environment logical id is not defined");
+			var err = handleError(failureCodes.PR_ERROR_4.code, "Environment logical id is not defined");
+			return reject(err);
+		}
+	});
+};
+
+var updateDeployments = (res, deploymentPayload, configData, authToken) => {
+	return new Promise((resolve, reject) => {
+		var deploymentResults = JSON.parse(res);
+		if (deploymentResults.data && deploymentResults.data.deployments && deploymentResults.data.deployments.length > 0) {
+			var deploymentsCollection = deploymentResults.data.deployments;
+			var deploymentData;
+
+			for (var idx in deploymentsCollection) {
+				if (deploymentsCollection[idx].provider_build_url === deploymentPayload.provider_build_url &&
+					deploymentsCollection[idx].provider_build_id === deploymentPayload.provider_build_id) {
+					deploymentData = deploymentsCollection[idx];
+				}
+			}
+			if (deploymentData && deploymentData.deployment_id) {
+				Object.keys(deploymentPayload).forEach(function (key) {
+					if (key !== 'status') {
+						deploymentPayload[key] = deploymentData[key];
+					}
+				});
+				logger.info("Update deployment request payload: " + JSON.stringify(deploymentPayload));
+				var apiEndpoint = configData.BASE_API_URL + configData.DEPLOYMENT_API_RESOURCE + "/" + deploymentData.deployment_id;
+				var svcPayload = getSvcPayload("PUT", deploymentPayload, apiEndpoint, authToken);
+				procesRequest(svcPayload)
+					.then(result => { return resolve(result); })
+					.catch(err => {
+						logger.error("updateDeployments failed: " + JSON.stringify(err));
+						return reject(err);
+					});
+			} else {
+				logger.error("Deployment details not found!");
+				var err = handleError(failureCodes.PR_ERROR_4.code, "Deployment details not found!");
+				return reject(err);
+			}
+		} else {
+			logger.error("Deployment details not found!");
+			var err = handleError(failureCodes.PR_ERROR_4.code, "Deployment details not found!");
+			return reject(err);
+		}
+	});
+};
+
+var getEventProcessStatus = () => {
+	return {
+		"processed_events": processedEvents.length,
+		"failed_events": failedEvents.length
+	};
+};
+
+var handleProcessedEvents = function (id, payload) {
+	processedEvents.push({
+		"sequence_id": id,
+		"event": payload
+	});
+};
+
+var handleFailedEvents = function (id, failure_message, payload, failure_code) {
+	failedEvents.push({
+		"sequence_id": id,
+		"event": payload,
+		"failure_code": failure_code,
+		"failure_message": failure_message
+	});
+};
+
+module.exports = {
+	getTokenRequest: getTokenRequest,
+	getAuthResponse: getAuthResponse,
+	handleError: handleError,
+	checkForInterestedEvents: checkForInterestedEvents,
+	handleProcessedEvents: handleProcessedEvents,
+	handleFailedEvents: handleFailedEvents,
+	getEventProcessStatus: getEventProcessStatus,
+	handler: handler,
+	processEventRecords: processEventRecords,
+	processEventRecord: processEventRecord,
+	processEvent: processEvent,
+	getDeploymentPayload: getDeploymentPayload,
+	getSvcPayload: getSvcPayload,
+	procesRequest: procesRequest,
+	processCreateEvent: processCreateEvent,
+	processUpdateEvent: processUpdateEvent,
+	getDeployments: getDeployments,
+	updateDeployments: updateDeployments
+};
diff --git a/jazz_deployments-event-handler/package.json b/jazz_deployments-event-handler/package.json
new file mode 100644
index 0000000000..80e613c788
--- /dev/null
+++ b/jazz_deployments-event-handler/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "jazz_deployments-event-handler",
+  "version": "0.0.1",
+  "description": "Deployments event handler function",
+  "main": "index.js",
+  "private": true,
+  "author": [],
+  "scripts": {
+    "test": "mocha"
+  },
+  "dependencies": {
+    "request": "*",
+    "request-promise-native": "^1.0.5",
+    "lodash": "*",
+    "uuid": "*"
+  },
+  "devDependencies": {
+    "chai": "^3.5.0",
+    "mocha": "^v3.0.0"
+  }
+}
\ No newline at end of file
diff --git a/jazz_deployments-event-handler/test/test.js b/jazz_deployments-event-handler/test/test.js
new file mode 100644
index 0000000000..3a846f9cb7
--- /dev/null
+++ b/jazz_deployments-event-handler/test/test.js
@@ -0,0 +1,9 @@
+const assert = require('chai').assert;
+
+describe('Sample', function () {
+  it('tests handler', function (done) {
+    // Add your test cases here.
+    assert(true);
+    done();
+  });
+});
\ No newline at end of file
diff --git a/jazz_deployments-event-handler/utils/failure-codes.js b/jazz_deployments-event-handler/utils/failure-codes.js
new file mode 100644
index 0000000000..b82f49b000
--- /dev/null
+++ b/jazz_deployments-event-handler/utils/failure-codes.js
@@ -0,0 +1,29 @@
+// =========================================================================
+// Copyright © 2017 T-Mobile USA, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =========================================================================
+
+
+var failureCodeENUM = {
+	DB_ERROR_1: { type: "DB_ERROR", code: "DB_WRITE", message: "Error storing data in database" },
+	DB_ERROR_2: { type: "DB_ERROR", code: "DB_LOOKUP", message: "Error reading database" },
+	PR_ERROR_1: { type: "PROCESSING_ERROR", code: "SCHEMA_VALIDATION", message: "Unable to process event data" },
+	PR_ERROR_2: { type: "PROCESSING_ERROR", code: "UNKNOWN", message: "Unknown error" },
+	PR_ERROR_3: { type: "PROCESSING_ERROR", code: "INTERNAL", message: "Internal Server error" },
+	PR_ERROR_4: { type: "PROCESSING_ERROR", code: "NOT_FOUND", message: "Not Found error" },
+};
+
+module.exports = () => {
+    return failureCodeENUM;
+};
\ No newline at end of file
diff --git a/jazz_deployments/Jenkinsfile_Platform b/jazz_deployments/Jenkinsfile_Platform
new file mode 100644
index 0000000000..cb5f59e47c
--- /dev/null
+++ b/jazz_deployments/Jenkinsfile_Platform
@@ -0,0 +1,52 @@
+#!groovy
+import groovy.json.JsonOutput
+import groovy.transform.Field
+
+// To be replaced as @Field def repo_credential_id = "value" except for config_loader
+@Field def repo_credential_id
+@Field def repo_base
+@Field def repo_core
+@Field def scm_type
+
+@Field def config_loader
+
+/*
+* Load environment variables from build module
+*/
+def loadConfigModule(build_module_url){
+  dir('config-loader') {
+    checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: repo_credential_id, url: build_module_url]]])
+    def result_json_string = readFile("jazz-installer-vars.json")
+    config_module = load "config-loader.groovy"
+    config_loader = config_module.initialize(result_json_string)
+  }
+}
+
+/*
+* Start the Pipeline stages
+*/
+node {
+  stage('Loading Config-Loader') {
+    loadConfigModule(getBuildModuleUrl())
+  }
+
+  stage('Triggering the Jenkins build') {
+    withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: config_loader.JENKINS.CREDENTIAL_ID, passwordVariable: 'PWD', usernameVariable: 'UNAME']]){
+    echo "Build triggered via branch::${env.BRANCH_NAME}"
+
+    def build_job = config_loader.API.API_BUILD_URI
+    def job_url = JenkinsLocationConfiguration.get().getUrl() + build_job
+
+    sh "curl -X GET -k -v -u \"$UNAME:$PWD\"  \"" + job_url + "&service_name=deployments&domain=jazz&scm_branch=${env.BRANCH_NAME}\""
+    }
+  }
+}
+
+def getBuildModuleUrl() {
+    if (scm_type && scm_type != "bitbucket") {
+      // right now only bitbucket has this additional tag scm in its git clone path
+      return "http://${repo_base}/${repo_core}/jazz-build-module.git" 
+    }else {
+      return "http://${repo_base}/scm/${repo_core}/jazz-build-module.git"
+    } 
+} 
\ No newline at end of file
diff --git a/jazz_deployments/build.api b/jazz_deployments/build.api
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/jazz_deployments/components/config.js b/jazz_deployments/components/config.js
new file mode 100644
index 0000000000..9b00d5e3ba
--- /dev/null
+++ b/jazz_deployments/components/config.js
@@ -0,0 +1,46 @@
+// =========================================================================
+// Copyright © 2017 T-Mobile USA, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =========================================================================
+
+/**
+	Nodejs Template Project
+  @module: config.js
+  @description: Defines variables/functions to retrieve environment related data
+	@author:
+	@version: 1.0
+**/
+
+var getStageConfig = (event) => {
+
+  var stage, configObj;
+
+  if (event && event.awslogs && event.awslogs.data) {
+    // cw events default to dev
+    stage = 'dev';
+  } else {
+    stage = event.stage
+  }
+
+  if (stage) {
+    configObj = require(`../config/${stage}-config.json`);
+  }
+
+  return configObj;
+};
+
+module.exports = (event) => {
+  var config = getStageConfig(event);
+  return config;
+};
\ No newline at end of file
diff --git a/jazz_deployments/components/crud/create.js b/jazz_deployments/components/crud/create.js
new file mode 100644
index 0000000000..141f74609e
--- /dev/null
+++ b/jazz_deployments/components/crud/create.js
@@ -0,0 +1,73 @@
+// =========================================================================
+// Copyright © 2017 T-Mobile USA, Inc.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =========================================================================
+
+/**
+    Create a Deployment entry in dynamodb table
+    @module: create.js
+    @description: CRUD functions for Deployment 
+    @author:
+    @version: 1.0
+**/
+
+const moment = require("moment");
+const Uuid = require("uuid/v4");
+
+const utils = require("../utils.js")();
+
+module.exports = (deploymentData, tableName, onComplete) => {
+
+    // initialize dynamodb
+    var docClient = utils.initDocClient(),
+        timestamp = moment().utc().format("YYYY-MM-DDTHH:mm:ss:SSS"),
+        deploymentId = Uuid();
+
+    var params = {
+        Item: {
+            DEPLOYMENT_ID: deploymentId,
+            CREATED_TIME: timestamp
+        },
+        ReturnConsumedCapacity: "TOTAL",
+        TableName: tableName
+    };
+
+    // Add all properties in input object to the params object
+    Object.keys(deploymentData).map((key) => {
+        var param_key = utils.getDeploymentDatabaseKeyName(key);
+        var param_value = deploymentData[key];
+        if (!param_value) {
+            params.Item[param_key] = null;
+        } else {
+            params.Item[param_key] = param_value;
+        }
+    });
+
+    // Add new item to database
+    docClient.put(params, (err, data) => {
+        if (err) {
+            // database error
+            onComplete({
+                result: "databaseError",
+                message: "Error adding Item to dynamodb " + err.message
+            }, null);
+        } else {
+            // Success!!
+            onComplete(null, {
+                result: "success",
+                deployment_id: deploymentId
+            });
+        }
+    });
+};
\ No newline at end of file
diff --git a/jazz_deployments/components/crud/delete.js b/jazz_deployments/components/crud/delete.js
new file mode 100644
index 0000000000..bbeed05798
--- /dev/null
+++ b/jazz_deployments/components/crud/delete.js
@@ -0,0 +1,48 @@
+// =========================================================================
+// Copyright © 2017 T-Mobile USA, Inc.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =========================================================================
+
+/**
+  Delete Deployment details by DEPLOYMENT_ID
+  @module: delete.js
+  @description: CRUD functions for deployments catalog
+	@author:
+	@version: 1.0
+**/
+
+const utils = require("../utils.js")(); //Import the utils module.
+
+module.exports = (tableName, deploymentId, onComplete) => {
+
+    // initialize docCLient
+    var docClient = utils.initDocClient();
+
+    var params = {
+        TableName: tableName,
+        Key: {
+            'DEPLOYMENT_ID': deploymentId
+        }
+    };
+
+    docClient.delete(params, (err, data) => {
+        if (err) {
+            onComplete(err);
+        } else {
+            onComplete(null, {
+                deploymentId: deploymentId
+            });
+        }
+    });
+};
\ No newline at end of file
diff --git a/jazz_deployments/components/crud/get.js b/jazz_deployments/components/crud/get.js
new file mode 100644
index 0000000000..111a8abda0
--- /dev/null
+++ b/jazz_deployments/components/crud/get.js
@@ -0,0 +1,59 @@
+// =========================================================================
+// Copyright © 2017 T-Mobile USA, Inc.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =========================================================================
+
+/**
+	Get Deployment-Catalog by Deployment_ID from dynamodb table
+    @module: get.js
+    @description: CRUD functions for Deployment catalog
+	@author: 
+	@version: 1.0
+**/
+
+const utils = require("../utils.js")(); //Import the utils module.
+
+module.exports = (tableName, deploymentId, onComplete) => {
+
+	// initialize docCLient
+	var docClient = utils.initDocClient(),
+		params = {
+			TableName: tableName,
+			KeyConditionExpression: "DEPLOYMENT_ID = :id",
+			ExpressionAttributeValues: {
+				":id": deploymentId
+			}
+		};
+
+	docClient.query(params, (err, data) => {
+
+		if (err) {
+			onComplete(err);
+		} else if (data.Items.length) {
+			for (var field in data.Items) {
+				var DEPLOYMENT_STATUS = data.Items[field].DEPLOYMENT_STATUS;
+				if (global.config.ARCHIVED_DEPLOYMENT_STATUS.includes(DEPLOYMENT_STATUS)) {
+					onComplete({
+						result: "deployment_already_deleted_error",
+						message: "Cannot get details for archived/missing deployments."
+					});
+				} else {
+					onComplete(null, utils.ConvertKeysToLowerCase(data.Items[0]));
+				}
+			}
+		} else {
+			onComplete(null, utils.ConvertKeysToLowerCase(data.Items[0]));
+		}
+	});
+};
\ No newline at end of file
diff --git a/jazz_deployments/components/crud/getList.js b/jazz_deployments/components/crud/getList.js
new file mode 100644
index 0000000000..4909e1324e
--- /dev/null
+++ b/jazz_deployments/components/crud/getList.js
@@ -0,0 +1,112 @@
+// =========================================================================
+// Copyright © 2017 T-Mobile USA, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =========================================================================
+
+/**
+    Get List of Deployments-Catalog
+    @module: getList.js
+    @description: CRUD functions for deployments catalog
+    @author:
+    @version: 1.0
+ **/
+
+const utils = require("../utils.js")(); //Import the utils module.
+const logger = require("../logger.js")(); //Import the logging module.
+
+module.exports = (tableName, query, onComplete) => {
+    // initialize dynamodb
+    var dynamodb = utils.initDynamodb(),
+        filter = "",
+        attributeValues = {},
+        insertAndString = " AND ",
+        scanparams = {
+            TableName: tableName,
+            ReturnConsumedCapacity: "TOTAL",
+            Limit: "500"
+        };
+
+    if (query) {
+        var keys_list = global.config.REQUIRED_PARAMS.slice(0, global.config.REQUIRED_PARAMS.length);
+        //appending the optional_keys list along with required_fields
+        if (query.status) {
+            keys_list.push("status");
+        } else {
+            query.status = global.config.ARCHIVED_DEPLOYMENT_STATUS;
+            keys_list.push("status");
+        }
+        // Generate filter string
+        keys_list.map((key) => {
+            var key_name = utils.getDeploymentDatabaseKeyName(key);
+            if (key_name === "DEPLOYMENT_STATUS" && query.status === global.config.ARCHIVED_DEPLOYMENT_STATUS) {
+                if (query[key]) {
+                    filter = filter + key_name + " <> :" + key_name + insertAndString;
+                    attributeValues[":" + key_name] = {
+                        S: query[key]
+                    };
+                }
+            } else {
+                if (query[key]) {
+                    filter = filter + key_name + " = :" + key_name + insertAndString;
+                    attributeValues[":" + key_name] = {
+                        S: query[key]
+                    };
+                }
+            }
+        });
+    }
+
+    filter = filter.substring(0, filter.length - insertAndString.length); // remove the " AND " at the end
+
+    if (filter) {
+        scanparams.FilterExpression = filter;
+        scanparams.ExpressionAttributeValues = attributeValues;
+    }
+
+    if (query.limit) {
+        query.limit = ((query.limit > global.config.PAGINATION_DEFAULTS.max_limit) ? global.config.PAGINATION_DEFAULTS.max_limit : query.limit);
+    } else {
+        query.limit = global.config.PAGINATION_DEFAULTS.limit;
+    }
+
+    query.offset = query.offset || global.config.PAGINATION_DEFAULTS.offset;
+
+    var scanExecute = (onComplete) => {
+        dynamodb.scan(scanparams, (err, data) => {
+            var count;
+            if (err) {
+                onComplete(err);
+            } else {
+                var items_formatted = (data.Items.map(item => utils.formatData(item, true)));
+                if (data.LastEvaluatedKey) {
+                    scanparams.ExclusiveStartKey = data.LastEvaluatedKey;
+                    scanExecute(onComplete);
+                } else {
+                    if (items_formatted.length > 0) {
+                        count = items_formatted.length;
+                        items_formatted = utils.sortUtil(items_formatted, global.config.DEPLOYMENTS_SORTING_KEY, global.config.DEPLOYMENTS_SORTING_ORDER);
+                        items_formatted = utils.paginateUtil(items_formatted, parseInt(query.limit), parseInt(query.offset));
+                    }
+                    var obj = {
+                        count: count,
+                        deployments: items_formatted
+                    };
+                    logger.info("Database Result:" + JSON.stringify(obj));
+                    onComplete(null, obj);
+                }
+            }
+        });
+    }
+    scanExecute(onComplete);
+};
\ No newline at end of file
diff --git a/jazz_deployments/components/crud/index.js b/jazz_deployments/components/crud/index.js
new file mode 100644
index 0000000000..2ab679ba93
--- /dev/null
+++ b/jazz_deployments/components/crud/index.js
@@ -0,0 +1,38 @@
+// =========================================================================
+// Copyright © 2017 T-Mobile USA, Inc.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =========================================================================
+/**
+	CRUD functions for deployments catalog
+  @module: index.js
+  @description: create, get by id, get all, filter, update, delete.
+	@author:
+	@version: 1.0
+**/
+
+var _get = require("./get.js");
+var _getList = require("./getList.js");
+var _create = require("./create.js");
+var _delete = require("./delete.js");
+var _update = require("./update.js");
+
+module.exports = () => {
+    return {
+        get: _get,
+        getList: _getList,
+        create: _create,
+        delete: _delete,
+        update: _update
+    };
+};
\ No newline at end of file
diff --git a/jazz_deployments/components/crud/update.js b/jazz_deployments/components/crud/update.js
new file mode 100644
index 0000000000..3ec4e8756f
--- /dev/null
+++ b/jazz_deployments/components/crud/update.js
@@ -0,0 +1,70 @@
+// =========================================================================
+// Copyright © 2017 T-Mobile USA, Inc.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =========================================================================
+/**
+    Update Deployment details by DEPLOYMENT_ID
+    @module: update.js
+    @description: CRUD functions for deployments catalog
+    @author: 
+    @version: 1.0
+**/
+
+const utils = require("../utils.js")(); //Import the utils module.
+
+module.exports = (deploymentData, tableName, deploymentId, onComplete) => {
+
+    // initialize docCLient
+    var docClient = utils.initDocClient(),
+        params = {
+            TableName: tableName,
+            Key: {
+                'DEPLOYMENT_ID': deploymentId
+            }
+        },
+        update_exp = "",
+        attributeValues = {};
+
+    // Add all properties in input object to the params object
+    Object.keys(deploymentData).map((key) => {
+        var param_key = utils.getDeploymentDatabaseKeyName(key);
+        var param_value = deploymentData[key];
+
+        if (param_value) {
+            update_exp = update_exp + param_key + " = :" + param_key + ", ";
+            attributeValues[":" + param_key] = param_value;
+        }
+    });
+
+    if (update_exp) {
+        params.UpdateExpression = "set " + update_exp.substring(0, update_exp.length - 2);
+        params.ExpressionAttributeValues = attributeValues;
+        params.ReturnValues = "ALL_NEW";
+        docClient.update(params, (err, data) => {
+            if (err) {
+                // database error
+                onComplete({
+                        result: "databaseError",
+                        message: "Error Updating Item  " + err.message
+                    },
+                    null
+                );
+            } else {
+                onComplete(null, data);
+            }
+        });
+    } else {
+        onComplete(null, null);
+    }
+};
\ No newline at end of file
diff --git a/jazz_deployments/components/error-handler.js b/jazz_deployments/components/error-handler.js
new file mode 100755
index 0000000000..db8e744706
--- /dev/null
+++ b/jazz_deployments/components/error-handler.js
@@ -0,0 +1,59 @@
+// =========================================================================
+// Copyright © 2017 T-Mobile USA, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =========================================================================
+
+/**
+	Nodejs Template Project
+  @module: error-handler.js
+  @description: Defines functions raising API Errors in required format for API Gateway integration
+	@author:
+	@version: 1.0
+**/
+
+module.exports = () => {
+    var errorObj = {
+        throwInputValidationError: (errorMessage) => { //Raise a  bad requests exception
+            return {
+                errorType: "BadRequest",
+                message: errorMessage.toString()
+            };
+        },
+        throwForbiddenError: (errorMessage) => { //Raise not found exceptions
+            return {
+                errorType: "Forbidden",
+                message: errorMessage.toString()
+            };
+        },
+        throwUnauthorizedError: (errorMessage) => { //Raise not found exceptions
+            return {
+                errorType: "Unauthorized",
+                message: errorMessage.toString()
+            };
+        },
+        throwNotFoundError: (errorMessage) => { //Raise not found exceptions
+            return {
+                errorType: "NotFound",
+                message: errorMessage.toString()
+            };
+        },
+        throwInternalServerError: (errorMessage) => { //Raise internal server exceptions
+            return {
+                errorType: "InternalServerError",
+                message: errorMessage.toString()
+            };
+        }
+    };
+    return errorObj;
+};
diff --git a/jazz_deployments/components/logger.js b/jazz_deployments/components/logger.js
new file mode 100644
index 0000000000..81bb08704c
--- /dev/null
+++ b/jazz_deployments/components/logger.js
@@ -0,0 +1,126 @@
+// =========================================================================
+// Copyright © 2017 T-Mobile USA, Inc.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =========================================================================
+
+/**
+    Nodejs Template Project
+    @module: logger.js
+    @description: a simple logging module for nodejs
+    @author:
+    @version: 1.0
+**/
+
+var logLevels = {
+    error: 4,
+    warn: 3,
+    info: 2,
+    verbose: 1,
+    debug: 0
+};
+
+var config = {
+    curLogLevel: 'info',
+    requestDetails: ''
+};
+
+// set logLevel, RequestDetails
+var init = (event, context) => {
+    setLevel();
+};
+
+// To add request specific details, which will be prepended in all the logs for ease of debugging in CloudWatch logs
+var setRequestDetails = (someContextSpecificId) => {
+    return;
+};
+
+// set current logLevel; Only logs which are above the curLogLevel will be logged;
+var setLevel = (level) => {
+    // LOG_LEVEL is 'info' by default
+
+    if (level && logLevels[level]) {
+        // If LOG_LEVEL if explicitly specified , set it as the curLogLevel
+        config.curLogLevel = level;
+        return level;
+    } else {
+        // Get LOG_LEVEL from the environment variables (if defined)
+        try {
+            level = process.env.LOG_LEVEL;
+        } catch (e) {
+            error('error trying to access LOG_LEVEL');
+        }
+        if (level && logLevels[level]) {
+            config.curLogLevel = level;
+            return level;
+        }
+    }
+    return null;
+};
+
+var log = (level, message) => {
+    /*
+        @TODO: format message as per requirement.
+        Will it be just a string / json. Should we except error object also?
+    */
+    var timestamp = new Date().toISOString();
+    if (logLevels[level] >= logLevels[config.curLogLevel]) {
+        if (level == 'error') {
+            console.error(timestamp, 'ERROR \t', config.requestDetails, message);
+            /*
+                If required, add custom actions here; Such as send a mail, etc...
+            */
+        } else if (level == 'warn') {
+            console.warn(timestamp, 'WARN  \t', config.requestDetails, message);
+        } else if (level == 'info') {
+            console.info(timestamp, 'INFO  \t', config.requestDetails, message);
+        } else if (level == 'verbose') {
+            console.info(timestamp, 'VERBOSE  \t', config.requestDetails, message);
+        } else if (level == 'debug') {
+            console.info(timestamp, 'DEBUG  \t', config.requestDetails, message);
+        } else {
+            console.log(timestamp, level, '\t', config.requestDetails, message);
+        }
+    }
+    return null;
+};
+
+var error = (message) => {
+    log('error', message);
+};
+var warn = (message) => {
+    log('warn', message);
+};
+var info = (message) => {
+    log('info', message);
+};
+var verbose = (message) => {
+    log('verbose', message);
+};
+var debug = (message) => {
+    log('debug', message);
+};
+
+module.exports = () => {
+    return{
+        init: init,
+        setLevel: setLevel,
+        log: log,
+        error: error,
+        warn: warn,
+        info: info,
+        verbose: verbose,
+        debug: debug,
+        logLevel: config.curLogLevel
+    }
+};
diff --git a/jazz_deployments/components/response.js b/jazz_deployments/components/response.js
new file mode 100644
index 0000000000..a30965dd52
--- /dev/null
+++ b/jazz_deployments/components/response.js
@@ -0,0 +1,31 @@
+// =========================================================================
+// Copyright © 2017 T-Mobile USA, Inc.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =========================================================================
+
+/**
+	Nodejs Template Project
+  @module: response.js
+  @description: Defines reponse object
+	@author:
+	@version: 1.0
+**/
+
+module.exports = (response, input) => {
+  var output = {
+    "data": response,
+    "input": input
+  };
+  return output;
+};
\ No newline at end of file
diff --git a/jazz_deployments/components/utils.js b/jazz_deployments/components/utils.js
new file mode 100644
index 0000000000..becf81165d
--- /dev/null
+++ b/jazz_deployments/components/utils.js
@@ -0,0 +1,226 @@
+// =========================================================================
+// Copyright © 2017 T-Mobile USA, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =========================================================================
+
+/**
+    Helper functions for Deployments
+    @module: utils.js
+    @description: Defines functions like format the output as per Deployments schema etc.
+    @author:
+    @version: 1.0
+**/
+
+var AWS = require("aws-sdk");
+
+// initialize document CLient for dynamodb
+var initDocClient = () => {
+    AWS.config.update({
+        region: global.config.ddb_region
+    });
+    var docClient = new AWS.DynamoDB.DocumentClient();
+
+    return docClient;
+};
+
+var initDynamodb = () => {
+    AWS.config.update({
+        region: global.config.ddb_region
+    });
+    var dynamodb = new AWS.DynamoDB();
+
+    return dynamodb;
+};
+
+var isEmpty = (obj) => {
+    for (var prop in obj) {
+        if (obj.hasOwnProperty(prop)) return false;
+    }
+    return true;
+};
+
+// convert object returned from the database, as per schema
+var formatData = (data, format) => {
+    if (!data) {
+        return {};
+    }
+
+    var deployment_obj = {};
+
+    var parseValue = (value) => {
+        var type = Object.keys(value)[0];
+        var parsed_value = value[type];
+        if (type === "NULL") {
+            return null;
+        } else if (type === "N") {
+            return Number(value);
+        } else if (type === "NS") {
+            return parsed_value.map(Number);
+        } else if (type === "S") {
+            return parsed_value;
+        } else if (type === "SS") {
+            return parsed_value;
+        } else if (type === "L") {
+            try {
+                var parsed_value_list = parsed_value.map((items) => parsed_value[items]);
+            } catch (e) {
+                console.log(e);
+            }
+            return parsed_value_list;
+        } else {
+            // probably should be error
+            return parsed_value;
+        }
+    };
+
+    Object.keys(data).map((key) => {
+        var key_name = getSchemaKeyName(key);
+        var value = data[key];
+        if (value) {
+            if (format) {
+                deployment_obj[key_name] = parseValue(value);
+            } else {
+                deployment_obj[key_name] = value;
+            }
+        }
+    });
+
+    return deployment_obj;
+};
+
+var getSchemaKeyName = (key) => {
+    // Convert database key name back, as per schema
+
+    if (!key) {
+        return null;
+    }
+    var mapKeyName = {
+        "SERVICE_NAME": "service",
+        "DEPLOYMENT_STATUS": "status",
+        "DOMAIN_NAME": "domain"
+    }
+    var keyName = mapKeyName[key] ? mapKeyName[key] : key.toLowerCase();
+    return keyName
+};
+
+var ConvertKeysToLowerCase = (obj) => {
+    var output = {};
+    for (i in obj) {
+        var data = i.toLowerCase();
+        if (Object.prototype.toString.apply(obj[i]) === '[object Object]') {
+            output[data] = ConvertKeysToLowerCase(obj[i]);
+        } else if (Object.prototype.toString.apply(obj[i]) === '[object Array]') {
+            output[data] = [];
+            output[data].push(ConvertKeysToLowerCase(obj[i][0]));
+        } else {
+            output[data] = obj[i];
+        }
+    }
+    return output;
+};
+
+// function to convert key name in schema to database column name
+var getDeploymentDatabaseKeyName = (key) => {
+    // Some of the keys in schema may be reserved keywords, so it may need some manipulation
+
+    if (!key) {
+        return null;
+    } else {
+        var mapKeyName = {
+            "service": "SERVICE_NAME",
+            "status": "DEPLOYMENT_STATUS",
+            "domain": "DOMAIN_NAME",
+            "environment": "ENVIRONMENT_LOGICAL_ID"
+        }
+        var returnval = mapKeyName[key] ? mapKeyName[key] : key.toUpperCase();
+        return returnval;
+    }
+};
+
+var sortUtil = (data, sort_key, sort_direction) => {
+    if (sort_key && sort_key === "provider_build_id") {
+        data = data.sort((a, b) => {
+            var x = parseInt(a[sort_key]);
+            var y = parseInt(b[sort_key]);
+            if (sort_direction === "asc") return x < y ? -1 : x > y ? 1 : 0;
+            else {
+                return x < y ? 1 : x > y ? -1 : 0;
+            }
+        });
+    } else if ((sort_key && sort_key === "created_time")) {
+        data = data.sort((a, b) => {
+            var val1 = a.timestamp.replace("T", " ");
+            var val2 = b.timestamp.replace("T", " ");
+            var x = new Date(val1).getTime();
+            var y = new Date(val2).getTime();
+            if (sort_direction === "asc") return x < y ? -1 : x > y ? 1 : 0;
+            else return x < y ? 1 : x > y ? -1 : 0;
+        });
+    } else {
+        data = data.sort((a, b) => {
+            var x = a[sort_key];
+            var y = b[sort_key];
+            if (sort_direction === "asc") return x < y ? -1 : x > y ? 1 : 0;
+            else {
+                return x < y ? 1 : x > y ? -1 : 0;
+            }
+        });
+    }
+    return data;
+};
+
+var filterUtil = (data, filter_value) => {
+    var newArr = [];
+    data.map((ele) => {
+        for (var key in ele) {
+            var value = "";
+            if (typeof ele[key] === "string") value = ele[key].toLowerCase();
+            else if (ele[key] && ele[key].length > 0) value = ele[key];
+
+            if (value.indexOf(filter_value.toLowerCase()) !== -1) {
+                newArr.push(ele);
+
+                break;
+            }
+        }
+    });
+    return newArr;
+};
+
+var paginateUtil = (data, limit, offset) => {
+    var newArr = [];
+    if (offset > data.length || offset === data.length || !limit) {
+        data = [];
+    } else if (data.length > limit + offset || data.length === limit + offset) {
+        data = data.slice(offset, offset + limit);
+    } else if (limit + offset > data.length) {
+        data = data.slice(offset, data.length);
+    }
+    return data;
+};
+
+
+module.exports = () => {
+    return {
+        initDynamodb: initDynamodb,
+        initDocClient: initDocClient,
+        isEmpty: isEmpty,
+        getDeploymentDatabaseKeyName: getDeploymentDatabaseKeyName,
+        formatData: formatData,
+        ConvertKeysToLowerCase: ConvertKeysToLowerCase,
+        sortUtil: sortUtil,
+        filterUtil: filterUtil,
+        paginateUtil: paginateUtil
+    };
+};
\ No newline at end of file
diff --git a/jazz_deployments/components/validation/common.js b/jazz_deployments/components/validation/common.js
new file mode 100644
index 0000000000..2c71216122
--- /dev/null
+++ b/jazz_deployments/components/validation/common.js
@@ -0,0 +1,152 @@
+// =========================================================================
+// Copyright © 2017 T-Mobile USA, Inc.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =========================================================================
+
+/**
+    Common Validation functions for Deployments-Catalog
+    @module: common.js
+    @description: Defines common validate functions.
+    @author:
+    @version: 1.0
+**/
+
+const _ = require("lodash");
+
+var validateIsEmptyInputData = (deployment_data, onComplete) => {
+    if (Object.keys(deployment_data).length === 0) {
+        onComplete({
+            result: "inputError",
+            message: "Input payload cannot be empty"
+        }, null);
+    } else {
+        onComplete(null, {
+            result: "success",
+            input: deployment_data
+        });
+    }
+};
+
+var validateAllRequiredFields = (deployment_data, required_fields, onComplete) => {
+    var missing_required_fields = _.difference(_.values(required_fields), _.keys(deployment_data));
+    if (missing_required_fields.length > 0) {
+        var message = "Following field(s) are required - " + missing_required_fields.join(", ");
+        onComplete({
+            result: "inputError",
+            message: message
+        }, null);
+    } else {
+        onComplete(null, {
+            result: "success",
+            input: deployment_data
+        });
+    }
+};
+
+var validateUnAllowedFieldsInInput = (deployment_data, fields_list, onComplete) => {
+    var invalid_fields = _.difference(_.keys(deployment_data), _.values(fields_list));
+    if (invalid_fields.length > 0) {
+        var message = "Following fields are invalid :  " + invalid_fields.join(", ") + ". ";
+        onComplete({
+            result: "inputError",
+            message: message
+        }, null);
+    } else {
+        onComplete(null, {
+            result: "success",
+            input: deployment_data
+        });
+    }
+};
+
+var validateAllRequiredFieldsValue = (deployment_data, required_fields, onComplete) => {
+    var invalid_required_fields = [];
+    required_fields.map((value) => {
+        if (!deployment_data[value]) {
+            invalid_required_fields.push(value);
+        }
+    });
+
+    if (invalid_required_fields.length > 0) {
+        var message = "Following field(s) value cannot be empty - " + invalid_required_fields.join(", ");
+        onComplete({
+            result: "inputError",
+            message: message
+        }, null);
+    } else {
+        onComplete(null, {
+            result: "success",
+            input: deployment_data
+        });
+    }
+};
+
+var validateRemoveEmptyValues = (deployment_data, onComplete) => {
+    for (var field in deployment_data) {
+        if (!deployment_data[field]) {
+            delete deployment_data[field];
+        }
+    }
+    onComplete(null, {
+        result: "success",
+        input: deployment_data
+    });
+};
+
+var validateNotEditableFieldsInUpdate = (deployment_data, fields_list, onComplete) => {
+    var invalid_fields = _.intersection(_.keys(deployment_data), _.values(fields_list));
+    invalid_fields.map((value) => {
+        delete deployment_data[value];
+    });
+
+    onComplete(null, {
+        result: "success",
+        input: deployment_data
+    });
+};
+
+var validateStatusFieldValue = (deployment_data, status_values, onComplete) => {
+    var statusFieldKey = "status",
+        has_invalid_status_values = false;
+    //check if input contains fields other than allowed fields
+    if (deployment_data.hasOwnProperty(statusFieldKey)) {
+        //checking "status" field contains the allowed values
+        var statusValue = deployment_data[statusFieldKey];
+        has_invalid_status_values = !_.includes(status_values, statusValue);
+    }
+    if (has_invalid_status_values) {
+        // return inputError
+        onComplete({
+            result: "inputError",
+            message: "Only following values can be allowed for status field - " + status_values.join(", ")
+        }, null);
+    } else {
+        onComplete(null, {
+            result: "success",
+            message: deployment_data
+        });
+    }
+};
+
+module.exports = () => {
+    return {
+        validateIsEmptyInputData: validateIsEmptyInputData,
+        validateAllRequiredFields: validateAllRequiredFields,
+        validateUnAllowedFieldsInInput: validateUnAllowedFieldsInInput,
+        validateAllRequiredFieldsValue: validateAllRequiredFieldsValue,
+        validateRemoveEmptyValues: validateRemoveEmptyValues,
+        validateStatusFieldValue: validateStatusFieldValue,
+        validateNotEditableFieldsInUpdate: validateNotEditableFieldsInUpdate
+    };
+};
\ No newline at end of file
diff --git a/jazz_deployments/components/validation/index.js b/jazz_deployments/components/validation/index.js
new file mode 100644
index 0000000000..2f0387b89a
--- /dev/null
+++ b/jazz_deployments/components/validation/index.js
@@ -0,0 +1,35 @@
+// =========================================================================
+// Copyright © 2017 T-Mobile USA, Inc.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =========================================================================
+
+/**
+    Validate functions for deployments catalog
+    @module: index.js
+    @description: Validation Utility functions.
+	@author: 
+	@version: 1.0
+**/
+
+var _validateCreatePayload = require("./validate_create_payload");
+var _validateUpdatePayload = require("./validate_update_payload");
+var _validateDeployment = require("./validate_list_payload");
+
+module.exports = () => {
+    return {
+        validateCreatePayload: _validateCreatePayload,
+        validateUpdatePayload: _validateUpdatePayload,
+        validateDeployment: _validateDeployment,
+    };
+};
\ No newline at end of file
diff --git a/jazz_deployments/components/validation/validate_create_payload.js b/jazz_deployments/components/validation/validate_create_payload.js
new file mode 100644
index 0000000000..d36ff49757
--- /dev/null
+++ b/jazz_deployments/components/validation/validate_create_payload.js
@@ -0,0 +1,139 @@
+// =========================================================================
+// Copyright © 2017 T-Mobile USA, Inc.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =========================================================================
+
+/**
+    Helper Validation functions for Deployments-Catalog
+    @module: validate.js
+    @description: Defines validate functions.
+    @author:
+    @version: 1.0
+**/
+
+const logger = require("../logger.js")(); //Import the logging module.
+const validateUtils = require("./common.js")();
+
+module.exports = (config, deployment_data, onComplete) => {
+    logger.info("Inside Validate Create Payload: " + JSON.stringify(deployment_data));
+
+    var required_fields_create = config.DEPLOYMENT_CREATION_REQUIRED_FIELDS;
+    var service_field_list = required_fields_create.concat(config.OPTIONAL_PARAMS);
+    var status_field_list = config.DEPLOYMENT_STATUS;
+
+    validateIsEmptyInputData(deployment_data)
+        .then(() => validateAllRequiredFields(deployment_data, required_fields_create))
+        .then(() => validateStatusFieldValue(deployment_data, status_field_list))
+        .then(() => validateUnAllowedFieldsInInput(deployment_data, service_field_list))
+        .then(() => validateAllRequiredFieldsValue(deployment_data, required_fields_create))
+        .then(() => validateRemoveEmptyValues(deployment_data))
+        .then((result) => {
+            logger.info("# Validate Create Payload Data:" + JSON.stringify(result));
+            onComplete(null, null);
+        })
+        .catch((error) => {
+            logger.error("# Validate Create Payload Error:" + JSON.stringify(error));
+            onComplete(error, null);
+        });
+}
+
+function validateIsEmptyInputData(deployment_data) {
+    logger.debug("Inside validateIsEmptyInputData: ");
+    return new Promise((resolve, reject) => {
+        //check for empty body
+        validateUtils.validateIsEmptyInputData(deployment_data, (error, data) => {
+            if (error) {
+                logger.error("Error in validateIsEmptyInputData: " + JSON.stringify(error));
+                reject(error);
+            } else {
+                resolve(data);
+            }
+        });
+    });
+};
+
+function validateAllRequiredFields(deployment_data, required_fields_create) {
+    logger.debug("Inside validateAllRequiredFields: ");
+    return new Promise((resolve, reject) => {
+        //check for required fields 
+        validateUtils.validateAllRequiredFields(deployment_data, required_fields_create, (error, data) => {
+            if (error) {
+                logger.error("Error in validateAllRequiredFields: " + JSON.stringify(error));
+                reject(error);
+            } else {
+                resolve(data);
+            }
+        });
+    });
+};
+
+function validateStatusFieldValue(deployment_data, status_field_list) {
+    //check for valid status
+    logger.debug("Inside validateStatusFieldValue: ");
+    return new Promise((resolve, reject) => {
+        validateUtils.validateStatusFieldValue(deployment_data, status_field_list, (error, data) => {
+            if (error) {
+                logger.error("Error in validateStatusFieldValue" + JSON.stringify(error));
+                reject(error);
+            } else {
+                resolve(data);
+            }
+        });
+    });
+};
+
+function validateUnAllowedFieldsInInput(deployment_data, service_field_list) {
+    //check for unchangable fields
+    logger.debug("Inside validateUnAllowedFieldsInInput: ");
+    return new Promise((resolve, reject) => {
+        validateUtils.validateUnAllowedFieldsInInput(deployment_data, service_field_list, (error, data) => {
+            if (error) {
+                logger.error("Error in validateUnAllowedFieldsInInput: " + JSON.stringify(error));
+                reject(error);
+            } else {
+                resolve(data);
+            }
+        });
+    });
+};
+
+function validateAllRequiredFieldsValue(deployment_data, required_fields_create) {
+    //check for required fields
+    logger.debug("Inside validateAllRequiredFieldsValue: ");
+    return new Promise((resolve, reject) => {
+        validateUtils.validateAllRequiredFieldsValue(deployment_data, required_fields_create, (error, data) => {
+            if (error) {
+                logger.error("Error in validateAllRequiredFieldsValue: " + JSON.stringify(error));
+                reject(error);
+            } else {
+                resolve(data);
+            }
+        });
+    });
+};
+
+function validateRemoveEmptyValues(deployment_data) {
+    // check for empty values before updating Deployments table
+    logger.debug("Inside validateRemoveEmptyValues: ");
+    return new Promise((resolve, reject) => {
+        validateUtils.validateRemoveEmptyValues(deployment_data, (error, data) => {
+            if (error) {
+                logger.error("Error in validateRemoveEmptyValues: " + JSON.stringify(error));
+                reject(error);
+            } else {
+                resolve(data);
+            }
+        });
+    });
+};
\ No newline at end of file
diff --git a/jazz_deployments/components/validation/validate_list_payload.js b/jazz_deployments/components/validation/validate_list_payload.js
new file mode 100644
index 0000000000..f950054e51
--- /dev/null
+++ b/jazz_deployments/components/validation/validate_list_payload.js
@@ -0,0 +1,143 @@
+// =========================================================================
+// Copyright © 2017 T-Mobile USA, Inc.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =========================================================================
+
+/**
+    Helper Validation functions for Deployments-Catalog
+    @module: validate.js
+    @description: Defines validate functions.
+    @author:
+    @version: 1.0
+**/
+
+const logger = require("../logger.js")(); //Import the logging module.
+const validateUtils = require("./common.js")();
+
+module.exports = (config, deployment_data, onComplete) => {
+    logger.info("Inside Validate get list payload: " + JSON.stringify(deployment_data));
+
+    var required_fields = config.REQUIRED_PARAMS;
+    var service_field_list = required_fields.concat(config.OPTIONAL_PARAMS);
+    var status_field_list = config.DEPLOYMENT_STATUS;
+
+    validateIsEmptyInputData(deployment_data)
+        .then(() => validateAllRequiredFields(deployment_data, required_fields))
+        .then(() => validateStatusFieldValue(deployment_data, status_field_list))
+        .then(() => validateUnAllowedFieldsInInput(deployment_data, service_field_list))
+        .then(() => validateAllRequiredFieldsValue(deployment_data, required_fields))
+        .then(() => validateRemoveEmptyValues(deployment_data))
+        .then((result) => {
+            logger.info("# Validate GetList Payload Data:" + JSON.stringify(result));
+            onComplete(null, null);
+        })
+        .catch((error) => {
+            logger.error("# Validate GetList Payload Error:" + JSON.stringify(error));
+            onComplete(error, null);
+        });
+}
+
+function validateIsEmptyInputData(deployment_data) {
+    logger.debug("Inside validateIsEmptyInputData: ");
+    return new Promise((resolve, reject) => {
+        //check for empty body
+        validateUtils.validateIsEmptyInputData(deployment_data, (error, data) => {
+            if (error) {
+                logger.error("Error in validateIsEmptyInputData: " + JSON.stringify(error));
+                reject(error);
+            } else {
+                resolve(data);
+            }
+        });
+    });
+};
+
+function validateAllRequiredFields(deployment_data, required_fields) {
+    logger.debug("Inside validateAllRequiredFields: " + required_fields);
+    return new Promise((resolve, reject) => {
+        //check for required fields 
+        validateUtils.validateAllRequiredFields(deployment_data, required_fields, (error, data) => {
+            if (error) {
+                logger.error("Error in validateAllRequiredFields: " + JSON.stringify(error));
+                reject(error);
+            } else {
+                resolve(data);
+            }
+        });
+    });
+};
+
+function validateStatusFieldValue(deployment_data, status_field_list) {
+    //check for valid status
+    logger.debug("Inside validateStatusFieldValue: " + deployment_data.status);
+    return new Promise((resolve, reject) => {
+        if (deployment_data.status) {
+            validateUtils.validateStatusFieldValue(deployment_data, status_field_list, (error, data) => {
+                if (error) {
+                    logger.error("Error in validateStatusFieldValue" + JSON.stringify(error));
+                    reject(error);
+                } else {
+                    resolve(data);
+                }
+            });
+        } else {
+            resolve();
+        }
+    });
+};
+
+function validateUnAllowedFieldsInInput(deployment_data, service_field_list) {
+    //check for unchangable fields
+    logger.debug("Inside validateUnAllowedFieldsInInput: ");
+    return new Promise((resolve, reject) => {
+        validateUtils.validateUnAllowedFieldsInInput(deployment_data, service_field_list, (error, data) => {
+            if (error) {
+                logger.error("Error in validateUnAllowedFieldsInInput: " + JSON.stringify(error));
+                reject(error);
+            } else {
+                resolve(data);
+            }
+        });
+    });
+};
+
+function validateAllRequiredFieldsValue(deployment_data, required_fields) {
+    //check for required fields
+    logger.debug("Inside validateAllRequiredFieldsValue: ");
+    return new Promise((resolve, reject) => {
+        validateUtils.validateAllRequiredFieldsValue(deployment_data, required_fields, (error, data) => {
+            if (error) {
+                logger.error("Error in validateAllRequiredFieldsValue: " + JSON.stringify(error));
+                reject(error);
+            } else {
+                resolve(data);
+            }
+        });
+    });
+};
+
+function validateRemoveEmptyValues(deployment_data) {
+    // check for empty values before updating Deployments table
+    logger.debug("Inside validateRemoveEmptyValues: ");
+    return new Promise((resolve, reject) => {
+        validateUtils.validateRemoveEmptyValues(deployment_data, (error, data) => {
+            if (error) {
+                logger.error("Error in validateRemoveEmptyValues: " + JSON.stringify(error));
+                reject(error);
+            } else {
+                resolve(data);
+            }
+        });
+    });
+};
\ No newline at end of file
diff --git a/jazz_deployments/components/validation/validate_update_payload.js b/jazz_deployments/components/validation/validate_update_payload.js
new file mode 100644
index 0000000000..6efdfa6df0
--- /dev/null
+++ b/jazz_deployments/components/validation/validate_update_payload.js
@@ -0,0 +1,137 @@
+// =========================================================================
+// Copyright © 2017 T-Mobile USA, Inc.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =========================================================================
+
+/**
+    Helper Validation functions for Deployments-Catalog
+    @module: validate.js
+    @description: Defines validate functions.
+    @author:
+    @version: 1.0
+**/
+
+const logger = require("../logger.js")(); //Import the logging module.
+const validateUtils = require("./common.js")();
+const crud = require("../crud")();
+
+module.exports = (config, deployment_data, deploymentTableName, deploymentId, onComplete) => {
+    logger.info("Inside Validate get list payload: " + JSON.stringify(deployment_data));
+
+    var unchangeable_fields = config.REQUIRED_PARAMS;
+    // var service_field_list = required_fields.concat(config.OPTIONAL_PARAMS);
+    var status_field_list = config.DEPLOYMENT_STATUS;
+
+    validateIsEmptyInputData(deployment_data)
+        .then(() => validateNotEditableFieldsInUpdate(deployment_data, unchangeable_fields))
+        .then(() => validateStatusFieldValue(deployment_data, status_field_list))
+        .then(() => validateRemoveEmptyValues(deployment_data))
+        .then(() => validateDeploymentExist(deploymentTableName, deploymentId, deployment_data))
+        .then((result) => {
+            logger.info("# Validate update Payload Data:" + JSON.stringify(result));
+            onComplete(null, result.input);
+        })
+        .catch((error) => {
+            logger.error("# Validate update Payload Error:" + JSON.stringify(error));
+            onComplete(error, null);
+        });
+}
+
+function validateIsEmptyInputData(deployment_data) {
+    logger.debug("Inside validateIsEmptyInputData: ");
+    return new Promise((resolve, reject) => {
+        //check for empty body
+        validateUtils.validateIsEmptyInputData(deployment_data, (error, data) => {
+            if (error) {
+                logger.error("Error in validateIsEmptyInputData: " + JSON.stringify(error));
+                reject(error);
+            } else {
+                resolve(data);
+            }
+        });
+    });
+};
+
+function validateStatusFieldValue(deployment_data, status_field_list) {
+    //check for valid status
+    logger.debug("Inside validateStatusFieldValue: " + deployment_data.status);
+    return new Promise((resolve, reject) => {
+        if (deployment_data.status) {
+            validateUtils.validateStatusFieldValue(deployment_data, status_field_list, (error, data) => {
+                if (error) {
+                    logger.error("Error in validateStatusFieldValue" + JSON.stringify(error));
+                    reject(error);
+                } else {
+                    resolve(data);
+                }
+            });
+        } else {
+            resolve();
+        }
+    });
+};
+
+function validateRemoveEmptyValues(deployment_data) {
+    // check for empty values before updating Deployments table
+    logger.debug("Inside validateRemoveEmptyValues: ");
+    return new Promise((resolve, reject) => {
+        validateUtils.validateRemoveEmptyValues(deployment_data, (error, data) => {
+            if (error) {
+                logger.error("Error in validateRemoveEmptyValues: " + JSON.stringify(error));
+                reject(error);
+            } else {
+                resolve(data);
+            }
+        });
+    });
+};
+
+function validateNotEditableFieldsInUpdate(deployment_data, unchangeable_fields) {
+    logger.debug("Inside validateNotEditableFieldsInUpdate: ");
+    return new Promise((resolve, reject) => {
+        validateUtils.validateNotEditableFieldsInUpdate(deployment_data, unchangeable_fields, (error, data) => {
+            if (error) {
+                logger.error("Error in validateNotEditableFieldsInUpdate: " + JSON.stringify(error));
+                reject(error);
+            } else {
+                resolve(data);
+            }
+        });
+    });
+}
+
+function validateDeploymentExist(deploymentTableName, deploymentId, deployment_data) {
+    logger.debug("Inside validateDeploymentExist:" + deploymentId);
+    return new Promise((resolve, reject) => {
+        crud.get(deploymentTableName, deploymentId, (error, data) => {
+            if (error) {
+                logger.error("getDeploymentDetailsById error:" + JSON.stringify(error));
+                reject(error);
+            } else {
+                if (data && (Object.keys(data).length === 0 && data.constructor === Object)) {
+                    logger.error('Cannot find deployment details with id : ' + deploymentId);
+                    reject({
+                        result: "notFound",
+                        message: 'Cannot find deployment details with id :' + deploymentId
+                    });
+                } else {
+                    resolve({
+                        message: "Deployment with provided Id exist",
+                        input: deployment_data
+                    });
+                }
+            }
+        });
+    })
+}
\ No newline at end of file
diff --git a/jazz_deployments/config/dev-config.json b/jazz_deployments/config/dev-config.json
new file mode 100644
index 0000000000..57668421ca
--- /dev/null
+++ b/jazz_deployments/config/dev-config.json
@@ -0,0 +1,41 @@
+{
+  "DEPLOYMENT_TABLE": "{conf_stack_prefix}_Deployments_Dev",
+  "DEPLOYMENT_CREATION_REQUIRED_FIELDS": [
+    "service_id",
+    "service",
+    "domain",
+    "environment_logical_id",
+    "provider_build_url",
+    "provider_build_id",
+    "scm_commit_hash",
+    "scm_url",
+    "scm_branch",
+    "status",
+    "request_id"
+  ],
+  "REQUIRED_PARAMS": ["service", "domain", "environment"],
+  "OPTIONAL_PARAMS": ["status", "offset", "limit"],
+  "ARCHIVED_DEPLOYMENT_STATUS": "archived",
+  "DEPLOYMENTS_SORTING_KEY": "provider_build_id",
+  "DEPLOYMENTS_SORTING_ORDER": "desc",
+  "PAGINATION_DEFAULTS": {
+    "offset": 0,
+    "limit": 10,
+    "max_limit": 100
+  },
+  "DEPLOYMENT_STATUS": ["successful", "started", "failed", "archived", "aborted", "in_progress"],
+  "SVC_USER": "{ci_user}",
+  "SVC_PASWD": "{ci_pwd}",
+  "ddb_region": "{conf-region}",
+  "JOB_BUILD_URL": "{conf-jenkins-host}/job/",
+  "SERVICE_API_URL": "https://{conf-apikey}.execute-api.{conf-region}.amazonaws.com",
+  "SERVICE_API_RESOURCE": "/dev/jazz/services",
+  "TOKEN_URL": "/dev/jazz/login",
+  "SERVICE_USER": "{jazz_admin}",
+  "TOKEN_CREDS": "{jazz_admin_creds}",
+  "BUILDPACKMAP" : {
+    "api": "build_pack_api",
+    "function": "build-pack-lambda",
+    "website": "build-pack-website"
+  }
+}
\ No newline at end of file
diff --git a/jazz_deployments/config/prod-config.json b/jazz_deployments/config/prod-config.json
new file mode 100644
index 0000000000..db2fc94046
--- /dev/null
+++ b/jazz_deployments/config/prod-config.json
@@ -0,0 +1,41 @@
+{
+  "DEPLOYMENT_TABLE": "{conf_stack_prefix}_Deployments_Prod",
+  "DEPLOYMENT_CREATION_REQUIRED_FIELDS": [
+    "service_id",
+    "service",
+    "domain",
+    "environment_logical_id",
+    "provider_build_url",
+    "provider_build_id",
+    "scm_commit_hash",
+    "scm_url",
+    "scm_branch",
+    "status",
+    "request_id"
+  ],
+  "REQUIRED_PARAMS": ["service", "domain", "environment"],
+  "OPTIONAL_PARAMS": ["status", "offset", "limit"],
+  "ARCHIVED_DEPLOYMENT_STATUS": "archived",
+  "DEPLOYMENTS_SORTING_KEY": "provider_build_id",
+  "DEPLOYMENTS_SORTING_ORDER": "desc",
+  "PAGINATION_DEFAULTS": {
+    "offset": 0,
+    "limit": 10,
+    "max_limit": 100
+  },
+  "DEPLOYMENT_STATUS": ["successful", "started", "failed", "archived", "aborted", "in_progress"],
+  "SVC_USER": "{ci_user}",
+  "SVC_PASWD": "{ci_pwd}",
+  "ddb_region": "{conf-region}",
+  "JOB_BUILD_URL": "{conf-jenkins-host}/job/",
+  "SERVICE_API_URL": "https://{conf-apikey}.execute-api.{conf-region}.amazonaws.com",
+  "SERVICE_API_RESOURCE": "/prod/jazz/services",
+  "TOKEN_URL": "/prod/jazz/login",
+  "SERVICE_USER": "{jazz_admin}",
+  "TOKEN_CREDS": "{jazz_admin_creds}",
+  "BUILDPACKMAP" : {
+    "api": "build_pack_api",
+    "function": "build-pack-lambda",
+    "website": "build-pack-website"
+  }
+}
\ No newline at end of file
diff --git a/jazz_deployments/config/stg-config.json b/jazz_deployments/config/stg-config.json
new file mode 100644
index 0000000000..1d740cd9a2
--- /dev/null
+++ b/jazz_deployments/config/stg-config.json
@@ -0,0 +1,41 @@
+{
+  "DEPLOYMENT_TABLE": "{conf_stack_prefix}_Deployments_Stg",
+  "DEPLOYMENT_CREATION_REQUIRED_FIELDS": [
+    "service_id",
+    "service",
+    "domain",
+    "environment_logical_id",
+    "provider_build_url",
+    "provider_build_id",
+    "scm_commit_hash",
+    "scm_url",
+    "scm_branch",
+    "status",
+    "request_id"
+  ],
+  "REQUIRED_PARAMS": ["service", "domain", "environment"],
+  "OPTIONAL_PARAMS": ["status", "offset", "limit"],
+  "ARCHIVED_DEPLOYMENT_STATUS": "archived",
+  "DEPLOYMENTS_SORTING_KEY": "provider_build_id",
+  "DEPLOYMENTS_SORTING_ORDER": "desc",
+  "PAGINATION_DEFAULTS": {
+    "offset": 0,
+    "limit": 10,
+    "max_limit": 100
+  },
+  "DEPLOYMENT_STATUS": ["successful", "started", "failed", "archived", "aborted", "in_progress"],
+  "SVC_USER": "{ci_user}",
+  "SVC_PASWD": "{ci_pwd}",
+  "ddb_region": "{conf-region}",
+  "JOB_BUILD_URL": "{conf-jenkins-host}/job/",
+  "SERVICE_API_URL": "https://{conf-apikey}.execute-api.{conf-region}.amazonaws.com",
+  "SERVICE_API_RESOURCE": "/stg/jazz/services",
+  "TOKEN_URL": "/stg/jazz/login",
+  "SERVICE_USER": "{jazz_admin}",
+  "TOKEN_CREDS": "{jazz_admin_creds}",
+  "BUILDPACKMAP" : {
+    "api": "build_pack_api",
+    "function": "build-pack-lambda",
+    "website": "build-pack-website"
+  }
+}
\ No newline at end of file
diff --git a/jazz_deployments/deployment-env.yml b/jazz_deployments/deployment-env.yml
new file mode 100644
index 0000000000..766172abc5
--- /dev/null
+++ b/jazz_deployments/deployment-env.yml
@@ -0,0 +1 @@
+service_id : {service_id}
\ No newline at end of file
diff --git a/jazz_deployments/event.json b/jazz_deployments/event.json
new file mode 100644
index 0000000000..7a9e864415
--- /dev/null
+++ b/jazz_deployments/event.json
@@ -0,0 +1,3 @@
+{
+  "key": "value"
+}
diff --git a/jazz_deployments/index.js b/jazz_deployments/index.js
new file mode 100755
index 0000000000..b452a729e5
--- /dev/null
+++ b/jazz_deployments/index.js
@@ -0,0 +1,542 @@
+// =========================================================================
+// Copyright © 2017 T-Mobile USA, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// =========================================================================
+
+/**
+  Nodejs Template Project
+  @author: 
+  @version: 1.0
+**/
+
+const errorHandlerModule = require("./components/error-handler.js"); //Import the error codes module.
+const responseObj = require("./components/response.js"); //Import the response module.
+const configObj = require("./components/config.js"); //Import the environment data.
+const logger = require("./components/logger.js")(); //Import the logging module.
+const utils = require("./components/utils.js")(); //Import the utils module.
+const validateUtils = require("./components/validation")(); //Import validation module
+const crud = require("./components/crud")(); //Import the crud module.
+const request = require('request');
+const util = require('util');
+
+module.exports.handler = (event, context, cb) => {
+
+	//Initializations
+	var errorHandler = errorHandlerModule(),
+		config = configObj(event);
+	global.config = config;
+	logger.init(event, context);
+
+	//validate inputs
+	logger.info(event);
+	genericInputValidation(event)
+		.then(() => {
+			var deploymentTableName = config.DEPLOYMENT_TABLE,
+				method = event.method,
+				query = event.query,
+				path = event.path,
+				body = event.body;
+
+			if (method === "POST" && !Object.keys(path).length) {
+				logger.info("creating new deployment details");
+				processDeploymentCreation(config, body, deploymentTableName)
+					.then((res) => {
+						logger.info("Create deployment result:" + JSON.stringify(res));
+						return cb(null, responseObj(res, body));
+					})
+					.catch((error) => {
+						logger.error("Error while creating new deployment:" + JSON.stringify(error));
+						if (error.result == "inputError") {
+							return cb(JSON.stringify(errorHandler.throwInputValidationError(error.message)));
+						} else {
+							return cb(JSON.stringify(errorHandler.throwInternalServerError("unexpected error occurred")));
+						}
+					});
+			}
+
+			if (method === "POST" && Object.keys(path).length) {
+				logger.info("GET Deployment details using deployment Id :" + path.id);
+				processDeploymentRebuild(config, path.id, deploymentTableName)
+					.then((res) => {
+						logger.info("Re-build result:" + JSON.stringify(res));
+						return cb(null, responseObj(res, path));
+					})
+					.catch((error) => {
+						logger.error("Re-build error:" + JSON.stringify(error));
+						if (error.result === "notFound" || error.result === "deployment_already_deleted_error") {
+							return cb(JSON.stringify(errorHandler.throwNotFoundError(error.message)));
+						} else {
+							return cb(JSON.stringify(errorHandler.throwInternalServerError('unhandled error occurred')));
+						}
+					});
+			}
+
+			if (method === 'GET' && query && utils.isEmpty(path)) {
+				logger.info("GET Deployment details using query params :" + JSON.stringify(query));
+				processDeploymentsList(config, query, deploymentTableName)
+					.then((res) => {
+						logger.info("Get list of deployments:" + JSON.stringify(res));
+						return cb(null, responseObj(res, query));
+					})
+					.catch((error) => {
+						logger.error("Error while fetching deployments:" + JSON.stringify(error));
+						if (error.result === "inputError") {
+							return cb(JSON.stringify(errorHandler.throwInputValidationError(error.message)));
+						} else {
+							return cb(JSON.stringify(errorHandler.throwInternalServerError("unexpected error occurred")));
+						}
+					});
+			}
+
+			if (method === 'GET' && path && utils.isEmpty(query)) {
+				logger.info("GET Deployment details using deployment Id :" + path.id);
+				getDeploymentDetailsById(deploymentTableName, path.id)
+					.then((res) => {
+						logger.info("Get Success. " + JSON.stringify(res));
+						return cb(null, responseObj(res, path));
+					})
+					.catch((error) => {
+						logger.error("Error occurred. " + JSON.stringify(error));
+						if ((error.result === "notFound") || (error.result === "deployment_already_deleted_error")) {
+							return cb(JSON.stringify(errorHandler.throwNotFoundError(error.message)));
+						} else {
+							return cb(JSON.stringify(errorHandler.throwInternalServerError("unexpected error occurred")));
+						}
+					});
+			}
+
+			if (method === "PUT" && path) {
+				processDeploymentsUpdate(config, body, deploymentTableName, path.id)
+					.then((res) => {
+						logger.info("Updated data:" + JSON.stringify(res));
+						return cb(null, responseObj({
+							message: "Successfully Updated deployment details with id: " + path.id
+						}, body));
+					})
+					.catch((error) => {
+						logger.error("Error occurred." + JSON.stringify(error));
+						if (error.result === "inputError") {
+							return cb(JSON.stringify(errorHandler.throwInputValidationError(error.message)));
+						} else if (error.result === "notFound") {
+							return cb(JSON.stringify(errorHandler.throwNotFoundError(error.message)));
+						} else {
+							return cb(JSON.stringify(errorHandler.throwInternalServerError("unexpected error occurred")));
+						}
+					});
+			}
+
+			if (method === "DELETE" && path) {
+				logger.info("Deleting deployment details for id : " + path.id);
+				processDeploymentsDeletion(deploymentTableName, path.id)
+					.then((res) => {
+						logger.info("DeleteItem succeeded");
+						var msg = "Successfully Deleted deployment details of id :" + path.id;
+						return cb(null, responseObj({
+							message: msg
+						}, path));
+					})
+					.catch((error) => {
+						logger.error("Error in DeleteItem: " + JSON.stringify(error));
+						if (error.result === "deployment_already_deleted_error" || error.result === "notFound") {
+							return cb(JSON.stringify(errorHandler.throwNotFoundError(error.message)));
+						} else {
+							return cb(JSON.stringify(errorHandler.throwInternalServerError("unexpected error occurred ")));
+						}
+					});
+			}
+		})
+		.catch((error) => {
+			if (error.result === "inputError") {
+				return cb(JSON.stringify(errorHandler.throwInputValidationError(error.message)));
+			} else if (error.result === "unauthorized") {
+				return cb(JSON.stringify(errorHandler.throwUnauthorizedError(error.message)));
+			} else {
+				return cb(JSON.stringify(errorHandler.throwInternalServerError("Unexpected error occurred.")))
+			}
+		});
+};
+
+function genericInputValidation(event) {
+	logger.info("Inside genericInputValidation");
+	return new Promise((resolve, reject) => {
+		// event.method cannot be empty, throw error
+		if (!event || !event.method) {
+			reject({
+				result: "inputError",
+				message: "method cannot be empty"
+			})
+		}
+
+		if (event.method === "GET" && Object.keys(event.query).length === 0 && Object.keys(event.path).length === 0) {
+			reject({
+				result: "inputError",
+				message: "GET API can be called only with following query params: domain, service and environment OR GET API can be called only with deployment_id as path param."
+			});
+		}
+
+		if ((event.method === "GET" || event.method === "PUT" || event.method === "DELETE") && (Object.keys(event.path).length > 0 && !event.path.id)) {
+			reject({
+				result: "inputError",
+				message: "Missing input parameter deployment id"
+			});
+		}
+
+		if (event.method === "PUT" && Object.keys(event.body).length === 0) {
+			reject({
+				result: "inputError",
+				message: "Deployment data is required for updating a deployment"
+			});
+		}
+
+		if (event.method === "POST" && Object.keys(event.body).length === 0 && Object.keys(event.path).length === 0) {
+			reject({
+				result: "inputError",
+				message: "Deployment details are required for creating a deployment"
+			});
+		}
+
+		if (event.method === "POST" && Object.keys(event.path).length > 0 && !event.path.id) {
+			reject({
+				result: "inputError",
+				message: "Re-build API can be called with deployment_id as path param"
+			});
+		}
+
+		resolve();
+	});
+};
+
+function processDeploymentCreation(config, deployment_details, deploymentTableName) {
+	return new Promise((resolve, reject) => {
+		validateDeploymentDetails(config, deployment_details)
+			.then(() => addNewDeploymentDetails(deployment_details, deploymentTableName))
+			.then((res) => {
+				resolve(res);
+			})
+			.catch((error) => {
+				reject(error)
+			});
+	});
+}
+
+function processDeploymentRebuild(config, deploymentId, deploymentTableName) {
+	return new Promise((resolve, reject) => {
+		getDeploymentDetailsById(deploymentTableName, deploymentId)
+			.then((res) => reBuildDeployment(res, config))
+			.then((res) => {
+				resolve(res);
+			})
+			.catch((error) => {
+				reject(error)
+			});
+	});
+}
+
+function processDeploymentsList(config, query, deploymentTableName) {
+	return new Promise((resolve, reject) => {
+		var queryParams = {
+			'service': query.service,
+			'domain': query.domain,
+			'environment': query.environment,
+			'status': query.status,
+			'offset': query.offset,
+			'limit': query.limit
+		};
+		validateQueryParams(config, queryParams)
+			.then(() => getDeploymentDetailsByQueryParam(deploymentTableName, queryParams))
+			.then((res) => {
+				resolve(res);
+			})
+			.catch((error) => {
+				reject(error)
+			});
+	});
+}
+
+function processDeploymentsUpdate(config, body, deploymentTableName, deploymentId) {
+	return new Promise((resolve, reject) => {
+		validateUpdateInput(config, body, deploymentTableName, deploymentId)
+			.then((data) => updateDeploymentDetails(deploymentTableName, data, deploymentId))
+			.then((res) => {
+				resolve(res);
+			})
+			.catch((error) => {
+				reject(error)
+			});
+	});
+}
+
+function processDeploymentsDeletion(deploymentTableName, deploymentId) {
+	return new Promise((resolve, reject) => {
+		getDeploymentDetailsById(deploymentTableName, deploymentId)
+			.then((res) => deleteServiceByID(res, deploymentTableName, deploymentId))
+			.then((res) => {
+				resolve(res);
+			})
+			.catch((error) => {
+				reject(error)
+			});
+	});
+}
+
+function validateDeploymentDetails(config, deployment_details) {
+	logger.debug("validateDeploymentDetails for creating new deployment");
+	return new Promise((resolve, reject) => {
+		validateUtils.validateCreatePayload(config, deployment_details, (error, data) => {
+			if (error) {
+				logger.error("validateDeploymentDetails error:" + JSON.stringify(error));
+				reject(error);
+			} else {
+				resolve(data);
+			}
+		});
+	});
+}
+
+function addNewDeploymentDetails(deployment_details, deploymentTableName) {
+	logger.debug("Inside addNewDeploymentDetails");
+	return new Promise((resolve, reject) => {
+		crud.create(deployment_details, deploymentTableName, (error, data) => {
+			if (error) {
+				logger.error("addNewDeploymentDetails error:" + JSON.stringify(error));
+				reject(error);
+			} else {
+				resolve(data);
+			}
+		});
+	});
+}
+
+function validateQueryParams(config, params) {
+	logger.debug("validateQueryParams for deployments");
+	return new Promise((resolve, reject) => {
+		validateUtils.validateDeployment(config, params, (error, data) => {
+			if (error) {
+				logger.error("validateQueryParams error:" + JSON.stringify(error));
+				reject(error);
+			} else {
+				resolve(data);
+			}
+		});
+	});
+}
+
+function getDeploymentDetailsByQueryParam(deploymentTableName, queryParams) {
+	logger.debug("Inside getDeploymentDetailsByQueryParam" + JSON.stringify(queryParams));
+	return new Promise((resolve, reject) => {
+		crud.getList(deploymentTableName, queryParams, (error, data) => {
+			if (error) {
+				logger.error("getDeploymentDetailsByQueryParam error:" + JSON.stringify(error));
+				reject(error);
+			} else {
+				resolve(data);
+			}
+		});
+	});
+}
+
+function getDeploymentDetailsById(deploymentTableName, deploymentId) {
+	logger.debug("Inside getDeploymentDetailsById" + JSON.stringify(deploymentId));
+	return new Promise((resolve, reject) => {
+		crud.get(deploymentTableName, deploymentId, (error, data) => {
+			if (error) {
+				logger.error("getDeploymentDetailsById error:" + JSON.stringify(error));
+				reject(error);
+			} else {
+				if (data && !(Object.keys(data).length && data.constructor === Object)) {
+					logger.error('Cannot find deployment details with id : ' + deploymentId);
+					reject({
+						result: "notFound",
+						message: 'Cannot find deployment details with id :' + deploymentId
+					});
+				} else {
+					resolve(data);
+				}
+			}
+		});
+	});
+}
+
+function validateUpdateInput(config, update_data, deploymentTableName, deploymentId) {
+	logger.debug("Inside validateUpdateInput");
+	return new Promise((resolve, reject) => {
+		validateUtils.validateUpdatePayload(config, update_data, deploymentTableName, deploymentId, (error, data) => {
+			if (error) {
+				logger.error("validateUpdateInput error:" + JSON.stringify(error));
+				reject(error);
+			} else {
+				resolve(data);
+			}
+		})
+	})
+}
+
+function updateDeploymentDetails(deploymentTableName, update_deployment_data, deploymentId) {
+	logger.debug("Inside updateDeploymentDetails");
+	return new Promise((resolve, reject) => {
+		crud.update(update_deployment_data, deploymentTableName, deploymentId, (error, data) => {
+			if (error) {
+				logger.error("updateDeploymentDetails error:" + JSON.stringify(error));
+				reject(error);
+			} else {
+				resolve(data);
+			}
+		});
+	})
+}
+
+function deleteServiceByID(getDeploymentDetails, deploymentTableName, deploymentId) {
+	logger.debug("Inside deleteServiceByID" + JSON.stringify(getDeploymentDetails));
+	return new Promise((resolve, reject) => {
+		if (!utils.isEmpty(getDeploymentDetails)) {
+			crud.delete(deploymentTableName, deploymentId, (error, data) => {
+				if (error) {
+					logger.error("deleteServiceByID error:" + JSON.stringify(error));
+					reject(error);
+				} else {
+					resolve(data);
+				}
+			});
+		} else {
+			reject({
+				result: "notFound",
+				message: "Deployment with provided Id is not available"
+			})
+		}
+	})
+}
+
+function reBuildDeployment(refDeployment, config) {
+	logger.debug("Inside reBuildDeployment" + JSON.stringify(refDeployment));
+	return new Promise((resolve, reject) => {
+		getToken(config)
+			.then((authToken) => getServiceDetails(config, refDeployment.service_id, authToken))
+			.then((res) => buildNowRequest(res, config, refDeployment))
+			.then((res) => {
+				resolve(res);
+			})
+			.catch((error) => {
+				reject(error);
+			})
+
+	});
+}
+
+function getToken(configData) {
+	logger.debug("Inside getToken");
+	return new Promise((resolve, reject) => {
+		var svcPayload = {
+			uri: configData.SERVICE_API_URL + configData.TOKEN_URL,
+			method: 'post',
+			json: {
+				"username": configData.SERVICE_USER,
+				"password": configData.TOKEN_CREDS
+			},
+			rejectUnauthorized: false
+		};
+		request(svcPayload, (error, response, body) => {
+			if (response && response.statusCode === 200 && body && body.data) {
+				var authToken = body.data.token;
+				resolve(authToken);
+			} else {
+				reject({
+					"error": "Could not get authentication token for updating service catalog.",
+					"message": response.body.message
+				});
+			}
+		});
+	});
+}
+
+function getServiceDetails(configData, serviceId, authToken) {
+	logger.debug("Inside getServiceDetails:" + serviceId)
+	return new Promise((resolve, reject) => {
+		var params = {
+			uri: configData.SERVICE_API_URL + configData.SERVICE_API_RESOURCE + "/" + serviceId,
+			method: 'get',
+			headers: {
+				'Authorization': authToken
+			},
+			rejectUnauthorized: false
+		};
+		request(params, (error, response, body) => {
+			if (error) {
+				reject(error);
+			} else {
+				var data = JSON.parse(response.body)
+				if (data.errorType && data.errorType === "NotFound") {
+					reject({
+						result: "notFound",
+						message: data.message
+					});
+				} else {
+					resolve(data);
+				}
+			}
+		});
+	});
+}
+
+function buildNowRequest(serviceDetails, config, refDeployment) {
+	logger.debug("Inside buildNowRequest:")
+	return new Promise((resolve, reject) => {
+		var data = serviceDetails.data,
+			service_name = data.service,
+			domain = data.domain,
+			scm_branch = encodeURI(refDeployment.scm_branch),
+			build_url = config.JOB_BUILD_URL,
+			buildQuery = "/buildWithParameters?service_name=" + service_name + "&domain=" + domain + "&scm_branch=" + scm_branch,
+			base_auth_token = "Basic " + new Buffer(util.format("%s:%s", config.SVC_USER, config.SVC_PASWD)).toString("base64"),
+			rebuild_url = "";
+		rebuild_url = build_url + config.BUILDPACKMAP[data.type.toLowerCase()] + buildQuery;
+
+		if (build_url) {
+			var options = {
+				url: rebuild_url,
+				method: 'POST',
+				rejectUnauthorized: false,
+				headers: {
+					'Accept': 'application/json',
+					'Authorization': base_auth_token
+				}
+			};
+			request(options, (error, res, body) => {
+				if (error) {
+					logger.error("Unable to rebuild deployment :" + error);
+					reject(error);
+				} else {
+					// Success response
+					if (res.statusCode === 200 || res.statusCode === 201) {
+						logger.info("successfully deployment started.");
+						resolve({
+							result: 'success',
+							message: "deployment started."
+						});
+					} else if (res.statusCode === 404) {
+						logger.info("Service not available.");
+						var msg = 'Unable to re-build ' + service_name + ' as requested service is unavailable.';
+						reject({
+							result: "notFound",
+							message: msg
+						});
+					} else {
+						reject("unknown error occurred");
+					}
+				}
+			});
+		} else {
+			reject("unable to find deployment details");
+		}
+	});
+}
\ No newline at end of file
diff --git a/jazz_deployments/package.json b/jazz_deployments/package.json
new file mode 100644
index 0000000000..1b2cdadaf2
--- /dev/null
+++ b/jazz_deployments/package.json
@@ -0,0 +1,29 @@
+{
+    "name": "jazz_deployments",
+    "version": "0.0.1",
+    "description": "CRUD APIs for Deployments",
+    "main": "index.js",
+    "private": true,
+    "author": {
+        "name": "Jazz"
+    },
+    "scripts": {
+        "test": "mocha"
+    },
+    "dependencies": {
+        "request": "*",
+        "uuid": "*",
+        "json-query": "*",
+        "moment": "*",
+        "lodash": "*"
+    },
+    "devDependencies": {
+        "aws-lambda-mock-context": "^3.1.1",
+        "aws-sdk": "*",
+        "aws-sdk-mock": "^1.7.0",
+        "chai": "^3.5.0",
+        "chai-as-promised": "^7.1.1",
+        "mocha": "^v3.0.0",
+        "sinon": "^1.17.7"
+    }
+}
\ No newline at end of file
diff --git a/jazz_deployments/swagger/swagger.json b/jazz_deployments/swagger/swagger.json
new file mode 100755
index 0000000000..6d0672907c
--- /dev/null
+++ b/jazz_deployments/swagger/swagger.json
@@ -0,0 +1,2067 @@
+{
+    "swagger": "2.0",
+    "info": {
+        "version": "2017-01-30T23:30:18Z",
+        "title": "{api_deployment_node_title}",
+        "description": "CRUD APIs for Deployments"
+    },
+    "host": "{api_host_name}",
+    "basePath": "/{domain}",
+    "schemes": [
+        "https"
+    ],
+    "paths": {
+        "/deployments": {
+            "options": {
+                "description": "CORS Support",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "CORS"
+                ],
+                "x-amazon-apigateway-integration": {
+                    "type": "mock",
+                    "requestTemplates": {
+                        "application/json": "{\"statusCode\" : 200}"
+                    },
+                    "responses": {
+                        "default": {
+                            "statusCode": "200",
+                            "responseTemplates": {
+                                "application/json": "$input.json('$')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "200": {
+                        "description": "Default response for CORS method",
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/400ErrorResponse"
+                        }
+                    },
+                    "401": {
+                        "description": "Unauthorized",
+                        "schema": {
+                            "$ref": "#/definitions/401ErrorResponse"
+                        }
+                    },
+                    "403": {
+                        "description": "Forbidden",
+                        "schema": {
+                            "$ref": "#/definitions/403ErrorResponse"
+                        }
+                    },
+                    "404": {
+                        "description": "Not Found",
+                        "schema": {
+                            "$ref": "#/definitions/404ErrorResponse"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/500ErrorResponse"
+                        }
+                    },
+                    "503": {
+                        "description": "Service Unavailable",
+                        "schema": {
+                            "$ref": "#/definitions/503ErrorResponse"
+                        }
+                    }
+                }
+            },
+            "get": {
+                "description": "List all deployments for a service/domain/env",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "parameters": [
+                    {
+                        "name": "domain",
+                        "in": "query",
+                        "type": "string",
+                        "description": "domain for service"
+                    },
+                    {
+                        "name": "service",
+                        "in": "query",
+                        "type": "string",
+                        "description": "name of service"
+                    },
+                    {
+                        "name": "environment",
+                        "in": "query",
+                        "type": "string",
+                        "description": "environment of service"
+                    },
+                    {
+                        "name": "offset",
+                        "in": "query",
+                        "type": "integer",
+                        "format": "int32",
+                        "required": false,
+                        "description": "starting record number for deployments"
+                    },
+                    {
+                        "name": "status",
+                        "in": "query",
+                        "type": "string",
+                        "required": false,
+                        "description": "Status of the deployment"
+                    },
+                    {
+                        "name": "limit",
+                        "in": "query",
+                        "type": "integer",
+                        "format": "int32",
+                        "required": false,
+                        "description": "limit for number of deployments"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Successful Execution",
+                        "schema": {
+                            "$ref": "#/definitions/DeploymentGetSuccessResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/400ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "401": {
+                        "description": "Unauthorized",
+                        "schema": {
+                            "$ref": "#/definitions/401ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "403": {
+                        "description": "Forbidden",
+                        "schema": {
+                            "$ref": "#/definitions/403ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "404": {
+                        "description": "Not Found",
+                        "schema": {
+                            "$ref": "#/definitions/404ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/500ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "503": {
+                        "description": "Service Unavailable",
+                        "schema": {
+                            "$ref": "#/definitions/503ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "{envPrefix}-{domain}-cognito-authorizer": []
+                    }
+                ],
+                "x-amazon-apigateway-integration": {
+                    "uri": "arn:aws:apigateway:{conf-region}:lambda:path/2015-03-31/functions/arn:aws:lambda:{conf-region}:{conf-accId}:function:{lambda_function_name}/invocations",
+                    "passthroughBehavior": "when_no_templates",
+                    "httpMethod": "POST",
+                    "credentials": "{conf-role}",
+                    "requestTemplates": {
+                        "application/json": "\n#define( $loop )\n  {\n  #foreach($key in $map.keySet())\n      \"$util.escapeJavaScript($key)\":\n        \"$util.escapeJavaScript($map.get($key))\"\n        #if( $foreach.hasNext ) , #end\n  #end\n  }\n#end\n\n{\n  \"body\": $input.json(\"$\"),\n  \"method\": \"$context.httpMethod\",\n  \"principalId\": \"$context.authorizer.principalId\",\n  \"stage\": \"$context.stage\",\n\n  #set( $map = $input.params().header )\n  \"headers\": $loop,\n\n  #set( $map = $input.params().querystring )\n  \"query\": $loop,\n\n  #set( $map = $input.params().path )\n  \"path\": $loop,\n\n  #set( $map = $context.identity )\n  \"identity\": $loop,\n\n  #set( $map = $stageVariables )\n  \"stageVariables\": $loop\n}",
+                        "application/x-www-form-urlencoded": "\n#define( $body )\n  {\n  #foreach( $token in $input.path('$').split('&') )\n    #set( $keyVal = $token.split('=') )\n    #set( $keyValSize = $keyVal.size() )\n    #if( $keyValSize >= 1 )\n      #set( $key = $util.urlDecode($keyVal[0]) )\n      #if( $keyValSize >= 2 )\n        #set( $val = $util.urlDecode($keyVal[1]) )\n      #else\n        #set( $val = '' )\n      #end\n      \"$key\": \"$val\"#if($foreach.hasNext),#end\n    #end\n  #end\n  }\n#end\n\n#define( $loop )\n  {\n  #foreach($key in $map.keySet())\n      \"$util.escapeJavaScript($key)\":\n        \"$util.escapeJavaScript($map.get($key))\"\n        #if( $foreach.hasNext ) , #end\n  #end\n  }\n#end\n\n{\n  \"body\": $body,\n  \"method\": \"$context.httpMethod\",\n  \"principalId\": \"$context.authorizer.principalId\",\n  \"stage\": \"$context.stage\",\n\n  #set( $map = $input.params().header )\n  \"headers\": $loop,\n\n  #set( $map = $input.params().querystring )\n  \"query\": $loop,\n\n  #set( $map = $input.params().path )\n  \"path\": $loop,\n\n  #set( $map = $context.identity )\n  \"identity\": $loop,\n\n  #set( $map = $stageVariables )\n  \"stageVariables\": $loop\n}"
+                    },
+                    "contentHandling": "CONVERT_TO_TEXT",
+                    "type": "aws",
+                    "responses": {
+                        ".*\"InternalServerError\".*": {
+                            "statusCode": "500",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"BadRequest\".*": {
+                            "statusCode": "400",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        "default": {
+                            "statusCode": "200",
+                            "responseTemplates": {
+                                "application/json": "{\"data\" : $input.json('$.data'),\"input\" : $input.json('$.input')}"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"Unauthorized\".*": {
+                            "statusCode": "401",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"Forbidden\".*": {
+                            "statusCode": "403",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"NotFound\".*": {
+                            "statusCode": "404",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        }
+                    }
+                }
+            },
+            "post": {
+                "description": "Create a deployment record",
+                "parameters": [
+                    {
+                        "name": "param",
+                        "in": "body",
+                        "description": "post body parameter.",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/postInputObj"
+                        }
+                    }
+                ],
+                "consumes": [
+                    "application/json",
+                    "application/x-www-form-urlencoded"
+                ],
+                "produces": [
+                    "application/json",
+                    "application/x-www-form-urlencoded"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Successful Execution",
+                        "schema": {
+                            "$ref": "#/definitions/DeploymentPostSuccessResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/400ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "401": {
+                        "description": "Unauthorized",
+                        "schema": {
+                            "$ref": "#/definitions/401ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "403": {
+                        "description": "Forbidden",
+                        "schema": {
+                            "$ref": "#/definitions/403ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "404": {
+                        "description": "Not Found",
+                        "schema": {
+                            "$ref": "#/definitions/404ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/500ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "503": {
+                        "description": "Service Unavailable",
+                        "schema": {
+                            "$ref": "#/definitions/503ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "{envPrefix}-{domain}-cognito-authorizer": []
+                    }
+                ],
+                "x-amazon-apigateway-integration": {
+                    "type": "aws",
+                    "uri": "arn:aws:apigateway:{conf-region}:lambda:path/2015-03-31/functions/arn:aws:lambda:{conf-region}:{conf-accId}:function:{lambda_function_name}/invocations",
+                    "httpMethod": "POST",
+                    "credentials": "{conf-role}",
+                    "requestTemplates": {
+                        "application/json": "\n#define( $loop )\n  {\n  #foreach($key in $map.keySet())\n      \"$util.escapeJavaScript($key)\":\n        \"$util.escapeJavaScript($map.get($key))\"\n        #if( $foreach.hasNext ) , #end\n  #end\n  }\n#end\n\n{\n  \"body\": $input.json(\"$\"),\n  \"method\": \"$context.httpMethod\",\n  \"principalId\": \"$context.authorizer.principalId\",\n  \"stage\": \"$context.stage\",\n\n  #set( $map = $input.params().header )\n  \"headers\": $loop,\n\n  #set( $map = $input.params().querystring )\n  \"query\": $loop,\n\n  #set( $map = $input.params().path )\n  \"path\": $loop,\n\n  #set( $map = $context.identity )\n  \"identity\": $loop,\n\n  #set( $map = $stageVariables )\n  \"stageVariables\": $loop\n}",
+                        "application/x-www-form-urlencoded": "\n#define( $body )\n  {\n  #foreach( $token in $input.path('$').split('&') )\n    #set( $keyVal = $token.split('=') )\n    #set( $keyValSize = $keyVal.size() )\n    #if( $keyValSize >= 1 )\n      #set( $key = $util.urlDecode($keyVal[0]) )\n      #if( $keyValSize >= 2 )\n        #set( $val = $util.urlDecode($keyVal[1]) )\n      #else\n        #set( $val = '' )\n      #end\n      \"$key\": \"$val\"#if($foreach.hasNext),#end\n    #end\n  #end\n  }\n#end\n\n#define( $loop )\n  {\n  #foreach($key in $map.keySet())\n      \"$util.escapeJavaScript($key)\":\n        \"$util.escapeJavaScript($map.get($key))\"\n        #if( $foreach.hasNext ) , #end\n  #end\n  }\n#end\n\n{\n  \"body\": $body,\n  \"method\": \"$context.httpMethod\",\n  \"principalId\": \"$context.authorizer.principalId\",\n  \"stage\": \"$context.stage\",\n\n  #set( $map = $input.params().header )\n  \"headers\": $loop,\n\n  #set( $map = $input.params().querystring )\n  \"query\": $loop,\n\n  #set( $map = $input.params().path )\n  \"path\": $loop,\n\n  #set( $map = $context.identity )\n  \"identity\": $loop,\n\n  #set( $map = $stageVariables )\n  \"stageVariables\": $loop\n}"
+                    },
+                    "responses": {
+                        ".*\"InternalServerError\".*": {
+                            "statusCode": "500",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"BadRequest\".*": {
+                            "statusCode": "400",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        "default": {
+                            "statusCode": "200",
+                            "responseTemplates": {
+                                "application/json": "{\"data\" : $input.json('$.data'),\"input\" : $input.json('$.input')}"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"Unauthorized\".*": {
+                            "statusCode": "401",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"Forbidden\".*": {
+                            "statusCode": "403",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"NotFound\".*": {
+                            "statusCode": "404",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/deployments/{id}": {
+            "options": {
+                "description": "CORS Support",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "parameters": [
+                    {
+                        "name": "id",
+                        "in": "path",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "tags": [
+                    "CORS"
+                ],
+                "x-amazon-apigateway-integration": {
+                    "type": "mock",
+                    "requestTemplates": {
+                        "application/json": "{\"statusCode\" : 200}"
+                    },
+                    "responses": {
+                        "default": {
+                            "statusCode": "200",
+                            "responseTemplates": {
+                                "application/json": "$input.json('$')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "200": {
+                        "description": "Default response for CORS method",
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/400ErrorResponse"
+                        }
+                    },
+                    "401": {
+                        "description": "Unauthorized",
+                        "schema": {
+                            "$ref": "#/definitions/401ErrorResponse"
+                        }
+                    },
+                    "403": {
+                        "description": "Forbidden",
+                        "schema": {
+                            "$ref": "#/definitions/403ErrorResponse"
+                        }
+                    },
+                    "404": {
+                        "description": "Not Found",
+                        "schema": {
+                            "$ref": "#/definitions/404ErrorResponse"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/500ErrorResponse"
+                        }
+                    },
+                    "503": {
+                        "description": "Service Unavailable",
+                        "schema": {
+                            "$ref": "#/definitions/503ErrorResponse"
+                        }
+                    }
+                }
+            },
+            "get": {
+                "description": "List deployment details with an deployment id",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "parameters": [
+                    {
+                        "name": "id",
+                        "in": "path",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Successful Execution",
+                        "schema": {
+                            "$ref": "#/definitions/DeploymentIdGetSuccessResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/400ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "401": {
+                        "description": "Unauthorized",
+                        "schema": {
+                            "$ref": "#/definitions/401ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "403": {
+                        "description": "Forbidden",
+                        "schema": {
+                            "$ref": "#/definitions/403ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "404": {
+                        "description": "Not Found",
+                        "schema": {
+                            "$ref": "#/definitions/404ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/500ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "503": {
+                        "description": "Service Unavailable",
+                        "schema": {
+                            "$ref": "#/definitions/503ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "{envPrefix}-{domain}-cognito-authorizer": []
+                    }
+                ],
+                "x-amazon-apigateway-integration": {
+                    "uri": "arn:aws:apigateway:{conf-region}:lambda:path/2015-03-31/functions/arn:aws:lambda:{conf-region}:{conf-accId}:function:{lambda_function_name}/invocations",
+                    "passthroughBehavior": "when_no_templates",
+                    "httpMethod": "POST",
+                    "credentials": "{conf-role}",
+                    "requestTemplates": {
+                        "application/json": "\n#define( $loop )\n  {\n  #foreach($key in $map.keySet())\n      \"$util.escapeJavaScript($key)\":\n        \"$util.escapeJavaScript($map.get($key))\"\n        #if( $foreach.hasNext ) , #end\n  #end\n  }\n#end\n\n{\n  \"body\": $input.json(\"$\"),\n  \"method\": \"$context.httpMethod\",\n  \"principalId\": \"$context.authorizer.principalId\",\n  \"stage\": \"$context.stage\",\n\n  #set( $map = $input.params().header )\n  \"headers\": $loop,\n\n  #set( $map = $input.params().querystring )\n  \"query\": $loop,\n\n  #set( $map = $input.params().path )\n  \"path\": $loop,\n\n  #set( $map = $context.identity )\n  \"identity\": $loop,\n\n  #set( $map = $stageVariables )\n  \"stageVariables\": $loop\n}",
+                        "application/x-www-form-urlencoded": "\n#define( $body )\n  {\n  #foreach( $token in $input.path('$').split('&') )\n    #set( $keyVal = $token.split('=') )\n    #set( $keyValSize = $keyVal.size() )\n    #if( $keyValSize >= 1 )\n      #set( $key = $util.urlDecode($keyVal[0]) )\n      #if( $keyValSize >= 2 )\n        #set( $val = $util.urlDecode($keyVal[1]) )\n      #else\n        #set( $val = '' )\n      #end\n      \"$key\": \"$val\"#if($foreach.hasNext),#end\n    #end\n  #end\n  }\n#end\n\n#define( $loop )\n  {\n  #foreach($key in $map.keySet())\n      \"$util.escapeJavaScript($key)\":\n        \"$util.escapeJavaScript($map.get($key))\"\n        #if( $foreach.hasNext ) , #end\n  #end\n  }\n#end\n\n{\n  \"body\": $body,\n  \"method\": \"$context.httpMethod\",\n  \"principalId\": \"$context.authorizer.principalId\",\n  \"stage\": \"$context.stage\",\n\n  #set( $map = $input.params().header )\n  \"headers\": $loop,\n\n  #set( $map = $input.params().querystring )\n  \"query\": $loop,\n\n  #set( $map = $input.params().path )\n  \"path\": $loop,\n\n  #set( $map = $context.identity )\n  \"identity\": $loop,\n\n  #set( $map = $stageVariables )\n  \"stageVariables\": $loop\n}"
+                    },
+                    "contentHandling": "CONVERT_TO_TEXT",
+                    "type": "aws",
+                    "responses": {
+                        ".*\"InternalServerError\".*": {
+                            "statusCode": "500",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"BadRequest\".*": {
+                            "statusCode": "400",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        "default": {
+                            "statusCode": "200",
+                            "responseTemplates": {
+                                "application/json": "{\"data\" : $input.json('$.data'),\"input\" : $input.json('$.input')}"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"Unauthorized\".*": {
+                            "statusCode": "401",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"Forbidden\".*": {
+                            "statusCode": "403",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"NotFound\".*": {
+                            "statusCode": "404",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        }
+                    }
+                }
+            },
+            "put": {
+                "description": "Update an existing deployment",
+                "parameters": [
+                    {
+                        "name": "param",
+                        "in": "body",
+                        "description": "post body parameter.",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/putInputObj"
+                        }
+                    },
+                    {
+                        "name": "id",
+                        "in": "path",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "consumes": [
+                    "application/json",
+                    "application/x-www-form-urlencoded"
+                ],
+                "produces": [
+                    "application/json",
+                    "application/x-www-form-urlencoded"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Successful Execution",
+                        "schema": {
+                            "$ref": "#/definitions/DeploymentIdPutSuccessResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/400ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "401": {
+                        "description": "Unauthorized",
+                        "schema": {
+                            "$ref": "#/definitions/401ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "403": {
+                        "description": "Forbidden",
+                        "schema": {
+                            "$ref": "#/definitions/403ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "404": {
+                        "description": "Not Found",
+                        "schema": {
+                            "$ref": "#/definitions/404ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/500ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "503": {
+                        "description": "Service Unavailable",
+                        "schema": {
+                            "$ref": "#/definitions/503ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "{envPrefix}-{domain}-cognito-authorizer": []
+                    }
+                ],
+                "x-amazon-apigateway-integration": {
+                    "type": "aws",
+                    "uri": "arn:aws:apigateway:{conf-region}:lambda:path/2015-03-31/functions/arn:aws:lambda:{conf-region}:{conf-accId}:function:{lambda_function_name}/invocations",
+                    "httpMethod": "POST",
+                    "credentials": "{conf-role}",
+                    "requestTemplates": {
+                        "application/json": "\n#define( $loop )\n  {\n  #foreach($key in $map.keySet())\n      \"$util.escapeJavaScript($key)\":\n        \"$util.escapeJavaScript($map.get($key))\"\n        #if( $foreach.hasNext ) , #end\n  #end\n  }\n#end\n\n{\n  \"body\": $input.json(\"$\"),\n  \"method\": \"$context.httpMethod\",\n  \"principalId\": \"$context.authorizer.principalId\",\n  \"stage\": \"$context.stage\",\n\n  #set( $map = $input.params().header )\n  \"headers\": $loop,\n\n  #set( $map = $input.params().querystring )\n  \"query\": $loop,\n\n  #set( $map = $input.params().path )\n  \"path\": $loop,\n\n  #set( $map = $context.identity )\n  \"identity\": $loop,\n\n  #set( $map = $stageVariables )\n  \"stageVariables\": $loop\n}",
+                        "application/x-www-form-urlencoded": "\n#define( $body )\n  {\n  #foreach( $token in $input.path('$').split('&') )\n    #set( $keyVal = $token.split('=') )\n    #set( $keyValSize = $keyVal.size() )\n    #if( $keyValSize >= 1 )\n      #set( $key = $util.urlDecode($keyVal[0]) )\n      #if( $keyValSize >= 2 )\n        #set( $val = $util.urlDecode($keyVal[1]) )\n      #else\n        #set( $val = '' )\n      #end\n      \"$key\": \"$val\"#if($foreach.hasNext),#end\n    #end\n  #end\n  }\n#end\n\n#define( $loop )\n  {\n  #foreach($key in $map.keySet())\n      \"$util.escapeJavaScript($key)\":\n        \"$util.escapeJavaScript($map.get($key))\"\n        #if( $foreach.hasNext ) , #end\n  #end\n  }\n#end\n\n{\n  \"body\": $body,\n  \"method\": \"$context.httpMethod\",\n  \"principalId\": \"$context.authorizer.principalId\",\n  \"stage\": \"$context.stage\",\n\n  #set( $map = $input.params().header )\n  \"headers\": $loop,\n\n  #set( $map = $input.params().querystring )\n  \"query\": $loop,\n\n  #set( $map = $input.params().path )\n  \"path\": $loop,\n\n  #set( $map = $context.identity )\n  \"identity\": $loop,\n\n  #set( $map = $stageVariables )\n  \"stageVariables\": $loop\n}"
+                    },
+                    "responses": {
+                        ".*\"InternalServerError\".*": {
+                            "statusCode": "500",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"BadRequest\".*": {
+                            "statusCode": "400",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        "default": {
+                            "statusCode": "200",
+                            "responseTemplates": {
+                                "application/json": "{\"data\" : $input.json('$.data'),\"input\" : $input.json('$.input')}"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"Unauthorized\".*": {
+                            "statusCode": "401",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"Forbidden\".*": {
+                            "statusCode": "403",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"NotFound\".*": {
+                            "statusCode": "404",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        }
+                    }
+                }
+            },
+            "delete": {
+                "description": "Delete deployment details with an deployment id",
+                "parameters": [
+                    {
+                        "name": "id",
+                        "in": "path",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "consumes": [
+                    "application/json",
+                    "application/x-www-form-urlencoded"
+                ],
+                "produces": [
+                    "application/json",
+                    "application/x-www-form-urlencoded"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Successful Execution",
+                        "schema": {
+                            "$ref": "#/definitions/DeploymentDeleteSuccessResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/400ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "401": {
+                        "description": "Unauthorized",
+                        "schema": {
+                            "$ref": "#/definitions/401ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "403": {
+                        "description": "Forbidden",
+                        "schema": {
+                            "$ref": "#/definitions/403ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "404": {
+                        "description": "Not Found",
+                        "schema": {
+                            "$ref": "#/definitions/404ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/500ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "{envPrefix}-{domain}-cognito-authorizer": []
+                    }
+                ],
+                "x-amazon-apigateway-integration": {
+                    "type": "aws",
+                    "uri": "arn:aws:apigateway:{conf-region}:lambda:path/2015-03-31/functions/arn:aws:lambda:{conf-region}:{conf-accId}:function:{lambda_function_name}/invocations",
+                    "httpMethod": "POST",
+                    "credentials": "{conf-role}",
+                    "requestTemplates": {
+                        "application/json": "\n#define( $loop )\n  {\n  #foreach($key in $map.keySet())\n      \"$util.escapeJavaScript($key)\":\n        \"$util.escapeJavaScript($map.get($key))\"\n        #if( $foreach.hasNext ) , #end\n  #end\n  }\n#end\n\n{\n  \"body\": $input.json(\"$\"),\n  \"method\": \"$context.httpMethod\",\n  \"principalId\": \"$context.authorizer.principalId\",\n  \"stage\": \"$context.stage\",\n\n  #set( $map = $input.params().header )\n  \"headers\": $loop,\n\n  #set( $map = $input.params().querystring )\n  \"query\": $loop,\n\n  #set( $map = $input.params().path )\n  \"path\": $loop,\n\n  #set( $map = $context.identity )\n  \"identity\": $loop,\n\n  #set( $map = $stageVariables )\n  \"stageVariables\": $loop\n}",
+                        "application/x-www-form-urlencoded": "\n#define( $body )\n  {\n  #foreach( $token in $input.path('$').split('&') )\n    #set( $keyVal = $token.split('=') )\n    #set( $keyValSize = $keyVal.size() )\n    #if( $keyValSize >= 1 )\n      #set( $key = $util.urlDecode($keyVal[0]) )\n      #if( $keyValSize >= 2 )\n        #set( $val = $util.urlDecode($keyVal[1]) )\n      #else\n        #set( $val = '' )\n      #end\n      \"$key\": \"$val\"#if($foreach.hasNext),#end\n    #end\n  #end\n  }\n#end\n\n#define( $loop )\n  {\n  #foreach($key in $map.keySet())\n      \"$util.escapeJavaScript($key)\":\n        \"$util.escapeJavaScript($map.get($key))\"\n        #if( $foreach.hasNext ) , #end\n  #end\n  }\n#end\n\n{\n  \"body\": $body,\n  \"method\": \"$context.httpMethod\",\n  \"principalId\": \"$context.authorizer.principalId\",\n  \"stage\": \"$context.stage\",\n\n  #set( $map = $input.params().header )\n  \"headers\": $loop,\n\n  #set( $map = $input.params().querystring )\n  \"query\": $loop,\n\n  #set( $map = $input.params().path )\n  \"path\": $loop,\n\n  #set( $map = $context.identity )\n  \"identity\": $loop,\n\n  #set( $map = $stageVariables )\n  \"stageVariables\": $loop\n}"
+                    },
+                    "responses": {
+                        ".*\"InternalServerError\".*": {
+                            "statusCode": "500",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"BadRequest\".*": {
+                            "statusCode": "400",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        "default": {
+                            "statusCode": "200",
+                            "responseTemplates": {
+                                "application/json": "{\"data\" : $input.json('$.data'),\"input\" : $input.json('$.input')}"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"Unauthorized\".*": {
+                            "statusCode": "401",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"Forbidden\".*": {
+                            "statusCode": "403",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"NotFound\".*": {
+                            "statusCode": "404",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/deployments/{id}/re-build": {
+            "options": {
+                "description": "CORS Support",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "parameters": [
+                    {
+                        "name": "id",
+                        "in": "path",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "tags": [
+                    "CORS"
+                ],
+                "x-amazon-apigateway-integration": {
+                    "type": "mock",
+                    "requestTemplates": {
+                        "application/json": "{\"statusCode\" : 200}"
+                    },
+                    "responses": {
+                        "default": {
+                            "statusCode": "200",
+                            "responseTemplates": {
+                                "application/json": "$input.json('$')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "200": {
+                        "description": "Default response for CORS method",
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/400ErrorResponse"
+                        }
+                    },
+                    "401": {
+                        "description": "Unauthorized",
+                        "schema": {
+                            "$ref": "#/definitions/401ErrorResponse"
+                        }
+                    },
+                    "403": {
+                        "description": "Forbidden",
+                        "schema": {
+                            "$ref": "#/definitions/403ErrorResponse"
+                        }
+                    },
+                    "404": {
+                        "description": "Not Found",
+                        "schema": {
+                            "$ref": "#/definitions/404ErrorResponse"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/500ErrorResponse"
+                        }
+                    },
+                    "503": {
+                        "description": "Service Unavailable",
+                        "schema": {
+                            "$ref": "#/definitions/503ErrorResponse"
+                        }
+                    }
+                }
+            },
+            "post": {
+                "description": "Create a deployment record",
+                "parameters": [
+                    {
+                        "name": "id",
+                        "in": "path",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "consumes": [
+                    "application/json",
+                    "application/x-www-form-urlencoded"
+                ],
+                "produces": [
+                    "application/json",
+                    "application/x-www-form-urlencoded"
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Successful Execution",
+                        "schema": {
+                            "$ref": "#/definitions/RetryPostSuccessResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/400ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "401": {
+                        "description": "Unauthorized",
+                        "schema": {
+                            "$ref": "#/definitions/401ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "403": {
+                        "description": "Forbidden",
+                        "schema": {
+                            "$ref": "#/definitions/403ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "404": {
+                        "description": "Not Found",
+                        "schema": {
+                            "$ref": "#/definitions/404ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/500ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "503": {
+                        "description": "Service Unavailable",
+                        "schema": {
+                            "$ref": "#/definitions/503ErrorResponse"
+                        },
+                        "headers": {
+                            "Access-Control-Allow-Headers": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Methods": {
+                                "type": "string"
+                            },
+                            "Access-Control-Allow-Origin": {
+                                "type": "string"
+                            }
+                        }
+                    }
+                },
+                "security": [
+                    {
+                        "{envPrefix}-{domain}-cognito-authorizer": []
+                    }
+                ],
+                "x-amazon-apigateway-integration": {
+                    "type": "aws",
+                    "uri": "arn:aws:apigateway:{conf-region}:lambda:path/2015-03-31/functions/arn:aws:lambda:{conf-region}:{conf-accId}:function:{lambda_function_name}/invocations",
+                    "httpMethod": "POST",
+                    "credentials": "{conf-role}",
+                    "requestTemplates": {
+                        "application/json": "\n#define( $loop )\n  {\n  #foreach($key in $map.keySet())\n      \"$util.escapeJavaScript($key)\":\n        \"$util.escapeJavaScript($map.get($key))\"\n        #if( $foreach.hasNext ) , #end\n  #end\n  }\n#end\n\n{\n  \"body\": $input.json(\"$\"),\n  \"method\": \"$context.httpMethod\",\n  \"principalId\": \"$context.authorizer.principalId\",\n  \"stage\": \"$context.stage\",\n\n  #set( $map = $input.params().header )\n  \"headers\": $loop,\n\n  #set( $map = $input.params().querystring )\n  \"query\": $loop,\n\n  #set( $map = $input.params().path )\n  \"path\": $loop,\n\n  #set( $map = $context.identity )\n  \"identity\": $loop,\n\n  #set( $map = $stageVariables )\n  \"stageVariables\": $loop\n}",
+                        "application/x-www-form-urlencoded": "\n#define( $body )\n  {\n  #foreach( $token in $input.path('$').split('&') )\n    #set( $keyVal = $token.split('=') )\n    #set( $keyValSize = $keyVal.size() )\n    #if( $keyValSize >= 1 )\n      #set( $key = $util.urlDecode($keyVal[0]) )\n      #if( $keyValSize >= 2 )\n        #set( $val = $util.urlDecode($keyVal[1]) )\n      #else\n        #set( $val = '' )\n      #end\n      \"$key\": \"$val\"#if($foreach.hasNext),#end\n    #end\n  #end\n  }\n#end\n\n#define( $loop )\n  {\n  #foreach($key in $map.keySet())\n      \"$util.escapeJavaScript($key)\":\n        \"$util.escapeJavaScript($map.get($key))\"\n        #if( $foreach.hasNext ) , #end\n  #end\n  }\n#end\n\n{\n  \"body\": $body,\n  \"method\": \"$context.httpMethod\",\n  \"principalId\": \"$context.authorizer.principalId\",\n  \"stage\": \"$context.stage\",\n\n  #set( $map = $input.params().header )\n  \"headers\": $loop,\n\n  #set( $map = $input.params().querystring )\n  \"query\": $loop,\n\n  #set( $map = $input.params().path )\n  \"path\": $loop,\n\n  #set( $map = $context.identity )\n  \"identity\": $loop,\n\n  #set( $map = $stageVariables )\n  \"stageVariables\": $loop\n}"
+                    },
+                    "responses": {
+                        ".*\"InternalServerError\".*": {
+                            "statusCode": "500",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"BadRequest\".*": {
+                            "statusCode": "400",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        "default": {
+                            "statusCode": "200",
+                            "responseTemplates": {
+                                "application/json": "{\"data\" : $input.json('$.data'),\"input\" : $input.json('$.input')}"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"Unauthorized\".*": {
+                            "statusCode": "401",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"Forbidden\".*": {
+                            "statusCode": "403",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        },
+                        ".*\"NotFound\".*": {
+                            "statusCode": "404",
+                            "responseTemplates": {
+                                "application/json": "$input.path('$.errorMessage')"
+                            },
+                            "responseParameters": {
+                                "method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key'",
+                                "method.response.header.Access-Control-Allow-Methods": "'*'",
+                                "method.response.header.Access-Control-Allow-Origin": "'*'"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "definitions": {
+        "DeploymentGetSuccessResponse": {
+            "type": "object",
+            "properties": {
+                "data": {
+                    "$ref": "#/definitions/getOutputObj"
+                },
+                "input": {
+                    "$ref": "#/definitions/getInputObj"
+                }
+            },
+            "title": "Success Response"
+        },
+        "RetryPostSuccessResponse": {
+            "type": "object",
+            "properties": {
+                "data": {
+                    "$ref": "#/definitions/retryOutputObj"
+                },
+                "input": {
+                    "$ref": "#/definitions/deploymentIdInputObj"
+                }
+            },
+            "title": "Success Response"
+        },
+        "DeploymentPostSuccessResponse": {
+            "type": "object",
+            "properties": {
+                "data": {
+                    "$ref": "#/definitions/postOutputObj"
+                },
+                "input": {
+                    "$ref": "#/definitions/postInputObj"
+                }
+            },
+            "title": "Success Response"
+        },
+        "DeploymentIdGetSuccessResponse": {
+            "type": "object",
+            "properties": {
+                "data": {
+                    "$ref": "#/definitions/deploymentIdOutputObj"
+                },
+                "input": {
+                    "$ref": "#/definitions/deploymentIdInputObj"
+                }
+            },
+            "title": "Success Response"
+        },
+        "DeploymentIdPutSuccessResponse": {
+            "type": "object",
+            "properties": {
+                "data": {
+                    "$ref": "#/definitions/putOutputObj"
+                },
+                "input": {
+                    "$ref": "#/definitions/putInputObj"
+                }
+            },
+            "title": "Success Response"
+        },
+        "DeploymentDeleteSuccessResponse": {
+            "type": "object",
+            "properties": {
+                "data": {
+                    "$ref": "#/definitions/DeleteOutputObj"
+                },
+                "input": {
+                    "$ref": "#/definitions/deploymentIdInputObj"
+                }
+            },
+            "title": "Success Response"
+        },
+        "400ErrorResponse": {
+            "type": "object",
+            "properties": {
+                "error_type": {
+                    "type": "string",
+                    "default": "Bad Request format"
+                },
+                "message": {
+                    "type": "string"
+                }
+            }
+        },
+        "401ErrorResponse": {
+            "type": "object",
+            "properties": {
+                "errorType": {
+                    "type": "string",
+                    "default": "Unauthorized"
+                },
+                "message": {
+                    "type": "string"
+                }
+            }
+        },
+        "403ErrorResponse": {
+            "type": "object",
+            "properties": {
+                "errorType": {
+                    "type": "string",
+                    "default": "Forbidden"
+                },
+                "message": {
+                    "type": "string"
+                }
+            }
+        },
+        "404ErrorResponse": {
+            "type": "object",
+            "properties": {
+                "error_type": {
+                    "type": "string",
+                    "default": "Resource Not Found"
+                },
+                "message": {
+                    "type": "string"
+                }
+            }
+        },
+        "500ErrorResponse": {
+            "type": "object",
+            "properties": {
+                "error_type": {
+                    "type": "string",
+                    "default": "Internal Server Error"
+                },
+                "message": {
+                    "type": "string"
+                }
+            }
+        },
+        "503ErrorResponse": {
+            "type": "object",
+            "properties": {
+                "error_type": {
+                    "type": "string",
+                    "default": "Service Unavailable"
+                },
+                "message": {
+                    "type": "string"
+                }
+            }
+        },
+        "getInputObj": {
+            "type": "object",
+            "properties": {
+                "service": {
+                    "type": "string",
+                    "description": "Name of the service"
+                },
+                "domain": {
+                    "type": "string",
+                    "description": "Name of the domain the service belongs to"
+                },
+                "environment": {
+                    "type": "string",
+                    "description": "Environment logical id for the deployment"
+                }
+            }
+        },
+        "getOutputObj": {
+            "type": "object",
+            "properties": {
+                "count": {
+                    "type": "integer",
+                    "description": "gives the total count of the record."
+                },
+                "deployments": {
+                    "type": "array",
+                    "description": "describes the deployments details",
+                    "items": {
+                        "type": "object",
+                        "description": "deployment details",
+                        "$ref": "#/definitions/DeploymentObj"
+                    }
+                }
+            }
+        },
+        "DeploymentObj": {
+            "type": "object",
+            "properties": {
+                "deployment_id": {
+                    "type": "string",
+                    "description": "ID of the deployment"
+                },
+                "service_id": {
+                    "type": "string",
+                    "description": "ID of the service"
+                },
+                "service": {
+                    "type": "string",
+                    "description": "Name of the service"
+                },
+                "domain": {
+                    "type": "string",
+                    "description": "Name of the domain the service belongs to"
+                },
+                "environment_logical_id": {
+                    "type": "string",
+                    "description": "Environment logical id for the deployment"
+                },
+                "provider_build_url": {
+                    "type": "string",
+                    "description": "Provider url for the deployment"
+                },
+                "provider_build_id": {
+                    "type": "string",
+                    "description": "Provider build id for the deployment"
+                },
+                "scm_commit_hash": {
+                    "type": "string",
+                    "description": "SCM tool commit hash of the deployment"
+                },
+                "scm_url": {
+                    "type": "string",
+                    "description": "SCM tool url where the source code is pulled from"
+                },
+                "scm_branch": {
+                    "type": "string",
+                    "description": "Name of the branch being deployed"
+                },
+                "status": {
+                    "enum": [
+                        "successful",
+                        "started",
+                        "failed",
+                        "archived",
+                        "aborted",
+                        "in_progress"
+                    ],
+                    "description": "Status of the deployment"
+                },
+                "created_time": {
+                    "type": "string",
+                    "description": "describes the deployment creation time"
+                }
+            }
+        },
+        "postInputObj": {
+            "type": "object",
+            "description": "Create a deployment record",
+            "required": [
+                "service_id",
+                "service",
+                "domain",
+                "environment_logical_id",
+                "provider_build_url",
+                "provider_build_id",
+                "scm_commit_hash",
+                "scm_url",
+                "scm_branch",
+                "status"
+            ],
+            "properties": {
+                "service_id": {
+                    "type": "string",
+                    "description": "ID of the service"
+                },
+                "service": {
+                    "type": "string",
+                    "description": "Name of the service"
+                },
+                "domain": {
+                    "type": "string",
+                    "description": "Name of the domain the service belongs to"
+                },
+                "environment_logical_id": {
+                    "type": "string",
+                    "description": "Environment logical id for the deployment"
+                },
+                "provider_build_url": {
+                    "type": "string",
+                    "description": "Provider url for the deployment"
+                },
+                "provider_build_id": {
+                    "type": "string",
+                    "description": "Provider build id for the deployment"
+                },
+                "scm_commit_hash": {
+                    "type": "string",
+                    "description": "SCM tool commit hash of the deployment"
+                },
+                "scm_url": {
+                    "type": "string",
+                    "description": "SCM tool url where the source code is pulled from"
+                },
+                "scm_branch": {
+                    "type": "string",
+                    "description": "Name of the branch being deployed"
+                },
+                "status": {
+                    "enum": [
+                        "successful",
+                        "started",
+                        "failed",
+                        "archived",
+                        "aborted",
+                        "in_progress"
+                    ],
+                    "description": "Status of the deployment"
+                }
+            }
+        },
+        "postOutputObj": {
+            "type": "object",
+            "description": "describes the deployment created response",
+            "properties": {
+                "result": {
+                    "type": "string",
+                    "description": "gives success or error message of deployment creation"
+                },
+                "deployment_id": {
+                    "type": "string",
+                    "description": "describes the deployment Id"
+                }
+            }
+        },
+        "deploymentIdInputObj": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string",
+                    "description": "deployment id"
+                }
+            }
+        },
+        "deploymentIdOutputObj": {
+            "type": "object",
+            "description": "deployment details",
+            "$ref": "#/definitions/DeploymentObj"
+        },
+        "putInputObj": {
+            "type": "object",
+            "properties": {
+                "service_id": {
+                    "type": "string",
+                    "description": "ID of the service"
+                },
+                "service": {
+                    "type": "string",
+                    "description": "Name of the service"
+                },
+                "domain": {
+                    "type": "string",
+                    "description": "Name of the domain the service belongs to"
+                },
+                "environment_logical_id": {
+                    "type": "string",
+                    "description": "Environment logical id for the deployment"
+                },
+                "provider_build_url": {
+                    "type": "string",
+                    "description": "Provider url for the deployment"
+                },
+                "provider_build_id": {
+                    "type": "string",
+                    "description": "Provider build id for the deployment"
+                },
+                "scm_commit_hash": {
+                    "type": "string",
+                    "description": "SCM tool commit hash of the deployment"
+                },
+                "scm_url": {
+                    "type": "string",
+                    "description": "SCM tool url where the source code is pulled from"
+                },
+                "scm_branch": {
+                    "type": "string",
+                    "description": "Name of the branch being deployed"
+                },
+                "status": {
+                    "enum": [
+                        "successful",
+                        "started",
+                        "failed",
+                        "archived",
+                        "aborted",
+                        "in_progress"
+                    ],
+                    "description": "Status of the deployment"
+                }
+            }
+        },
+        "putOutputObj": {
+            "type": "object",
+            "properties": {
+                "message": {
+                    "type": "string",
+                    "description": "describes the deployment updated details"
+                }
+            }
+        },
+        "DeleteOutputObj": {
+            "type": "object",
+            "properties": {
+                "message": {
+                    "type": "string",
+                    "description": "describes the deployment delete details"
+                }
+            }
+        },
+        "retryOutputObj": {
+            "type": "object",
+            "properties": {
+                "message": {
+                    "type": "string",
+                    "description": "describes the deployment build status"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/jazz_deployments/test/test.js b/jazz_deployments/test/test.js
new file mode 100644
index 0000000000..4bb5af8867
--- /dev/null
+++ b/jazz_deployments/test/test.js
@@ -0,0 +1,11 @@
+const assert = require('chai').assert;
+const index = require('../index');
+
+describe('Sample', function() {
+  it('tests handler', function(done) {
+
+    // Add your test cases here.
+    assert(true);
+    done();
+  });
+});
diff --git a/jazz_usermanagement/index.js b/jazz_usermanagement/index.js
index 013ce14a25..aed8725a7d 100644
--- a/jazz_usermanagement/index.js
+++ b/jazz_usermanagement/index.js
@@ -289,5 +289,5 @@ function updatePassword(cognitoClient, config, userData) {
 
 function getRequestToCreateSCMUser(config, userData) {
 	var scm = new scmFactory(config);
-	return scm.addUserRequest(userData.userid, userData.userpassword);
+	return scm.addUserRequest(userData.userid.toLowerCase(), userData.userpassword);
 }
\ No newline at end of file
diff --git a/jenkins-build-pack-api/Jenkinsfile b/jenkins-build-pack-api/Jenkinsfile
index 4134f47ad0..08bf094faa 100644
--- a/jenkins-build-pack-api/Jenkinsfile
+++ b/jenkins-build-pack-api/Jenkinsfile
@@ -80,6 +80,10 @@ node() {
 		}
 	}
 
+	if(!config){
+		error "Failed to fetch service metadata from catalog"
+	}
+
 	dir(repo_name)
 	{
 		scmModule.setServiceConfig(config)
@@ -135,7 +139,7 @@ node() {
 		}
 
 
-		events.sendStartedEvent('CREATE_DEPLOYMENT', 'Service deployment workflow started', environmentDeploymentMetadata.generateDeploymentMap("started", environment_logical_id, gitCommitHash), environment_logical_id)
+		
 		def requestId = utilModule.generateRequestId()
 		if (requestId != null) {
 			events.setRequestId(requestId)
@@ -143,6 +147,7 @@ node() {
 		} else {
 			error "Request Id Generation failed"
 		}
+		events.sendStartedEvent('CREATE_DEPLOYMENT', 'Service deployment workflow started', environmentDeploymentMetadata.generateDeploymentMap("started", environment_logical_id, gitCommitHash), environment_logical_id)
 
 		stage('Pre-Build Validation') {
 			try {
diff --git a/jenkins-build-pack-lambda/Jenkinsfile b/jenkins-build-pack-lambda/Jenkinsfile
index ef64b68a6d..b1f18c82ea 100644
--- a/jenkins-build-pack-lambda/Jenkinsfile
+++ b/jenkins-build-pack-lambda/Jenkinsfile
@@ -79,6 +79,10 @@ node()  {
 
 	}
 
+	if(!config){
+		error "Failed to fetch service metadata from catalog"
+	}
+
 	dir(repo_name)
 	{
 		scmModule.setServiceConfig(config)
@@ -125,7 +129,7 @@ node()  {
 	if (isScheduleEnabled || isEc2EventEnabled || isS3EventEnabled || isStreamEnabled || isDynamoDbEnabled) {
 		isEventSchdld = true
 	}
-	events.sendStartedEvent('CREATE_DEPLOYMENT', 'Function deployment started', environmentDeploymentMetadata.generateDeploymentMap("started", environment_logical_id, gitCommitHash), environment_logical_id)
+	
 	def requestId = utilModule.generateRequestId()
 	if (requestId != null) {
 		events.setRequestId(requestId)
@@ -134,6 +138,8 @@ node()  {
 		error "Request Id Generation failed"
 	}
 
+	events.sendStartedEvent('CREATE_DEPLOYMENT', 'Function deployment started', environmentDeploymentMetadata.generateDeploymentMap("started", environment_logical_id, gitCommitHash), environment_logical_id)
+
 	dir(repo_name){
 		loadServerlessConfig(runtime, isEventSchdld, isScheduleEnabled, isEc2EventEnabled, isS3EventEnabled, isStreamEnabled, isDynamoDbEnabled)
 		if (domain && domain == "jazz") {
diff --git a/jenkins-build-pack-website/Jenkinsfile b/jenkins-build-pack-website/Jenkinsfile
index 4bd7b1a06f..32eebee9b2 100644
--- a/jenkins-build-pack-website/Jenkinsfile
+++ b/jenkins-build-pack-website/Jenkinsfile
@@ -21,19 +21,18 @@ import groovy.transform.Field
 @Field def g_base_url = ''
 @Field def g_svc_admin_cred_ID = 'SVC_ADMIN'
 
-@Field def service_id = ''
-@Field def preserveEnvKey = ''
-@Field def preserveEnvValue = ''
-@Field def created_by = ''
 @Field def environment = ''
 @Field def context_map = [:]
+@Field def s3Bucket
+@Field def asset_info
+@Field def asset_name
+@Field def service_config
 
 node()  {
 	def jazzBuildModuleURL = getBuildModuleUrl()
 	loadBuildModules(jazzBuildModuleURL)
 
 	def jazz_prod_api_id = utilModule.getAPIIdForCore(configLoader.AWS.API["PROD"])
-
 	g_base_url = "https://${jazz_prod_api_id}.execute-api.${configLoader.AWS.REGION}.amazonaws.com/prod"
 
 	echo "Build Pack website params: " + params
@@ -42,217 +41,524 @@ node()  {
 	def domain = params.domain
 	def service = params.service_name
 	def repo_name = params.service_name
+	def gitCommitOwner
+	def gitCommitHash
 
 	if (domain && domain != "") {
 		repo_name = params.domain + "_" + params.service_name
 	}
 
-	def s3Bucket
-	def config
-
 	auth_token = setCredentials()
 
-        stage('Checkout code base') {
-
+	def current_environment
+	stage('Checkout code base') {
 		sh 'rm -rf ' + repo_name
 		sh 'mkdir ' + repo_name
-
-		dir(repo_name)
-		{
+		dir(repo_name) {
 			checkout([$class: 'GitSCM', branches: [[name: '*/' + params.scm_branch]], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: repo_credential_id, url: scmModule.getRepoCloneUrl(repo_name)]]])
 		}
-
 		// @TODO: dir can be removed, needs to be refactored
-		def configObj = dir(repo_name)
-		{
+		def configObj = dir(repo_name) {
 			return LoadConfiguration()
 		}
 
 		if (configObj.service_id) {
-			config = serviceMetadataLoader.loadServiceMetadata(configObj.service_id)
+			service_config = serviceMetadataLoader.loadServiceMetadata(configObj.service_id)
 		} else {
 			error "Service Id is not available."
 		}
+	}
 
+	if (!service_config) {
+		error "Failed to fetch service metadata from catalog"
 	}
 
-	environmentDeploymentMetadata.initialize(config, configLoader, scmModule, branch, env.BUILD_URL, env.BUILD_ID, g_base_url + "/jazz/environments",auth_token)
-	
-	def environment_logical_id = environmentDeploymentMetadata.getEnvironmentLogicalId(); 
+	environmentDeploymentMetadata.initialize(service_config, configLoader, scmModule, branch, env.BUILD_URL, env.BUILD_ID, g_base_url + "/jazz/environments", auth_token)
+
+	def environment_logical_id = environmentDeploymentMetadata.getEnvironmentLogicalId();
 	if (params.scm_branch == 'master') {
 		environment = 'prod'
+		current_environment = 'PROD'
 		s3Bucket = configLoader.JAZZ.S3.WEBSITE_PROD_BUCKET;
 	} else {
-		if(environment_logical_id) {
+		if (environment_logical_id) {
 			environment = environment_logical_id
 		} else {
 			error "The environment has not been created yet and its missing the logical Id"
-		}		
+		}
+		current_environment = "DEV"
 		s3Bucket = configLoader.JAZZ.S3.WEBSITE_DEV_BUCKET;
 	}
 
 	if (!events) { error "Can't load events module"	} //Fail here
-	events.initialize(configLoader, config, "SERVICE_DEPLOYMENT", branch, environment, g_base_url + "/jazz/events")
+	events.initialize(configLoader, service_config, "SERVICE_DEPLOYMENT", branch, environment, g_base_url + "/jazz/events")
 
 	def create_cloudfront_url
-	context_map = [created_by : config['created_by']]
+	context_map = [created_by : service_config['created_by']]
+	scmModule.setServiceConfig(service_config)
+	gitCommitHash = scmModule.getRepoCommitHash()
+	gitCommitOwner = scmModule.getRepoCommitterInfo(gitCommitHash)
+
+	def requestId = utilModule.generateRequestId()
+	if (requestId != null) {
+		events.setRequestId(requestId)
+		environmentDeploymentMetadata.setRequestId(requestId)
+	} else {
+		error "Request Id Generation failed"
+	}
 
 	dir(repo_name)
 	{
+		events.sendStartedEvent('CREATE_DEPLOYMENT', 'Website deployment started', environmentDeploymentMetadata.generateDeploymentMap("started", environment, , gitCommitHash), environment)
+
 		stage('Pre-Build Validation'){
 
 			events.sendStartedEvent("VALIDATE_INPUT", 'pre-build validation starts', context_map)
 			try {
-				service = config['service']
-				domain = config['domain']
-
+				service = service_config['service']
+				domain = service_config['domain']
 				if (domain != '' && domain != null) {
 					service = domain + '-' + service
 				}
 
 				create_cloudfront_url = true
-
-				if (config['create_cloudfront_url'] == true || config['create_cloudfront_url'] == "true") {
+				if (service_config['create_cloudfront_url'] == true || service_config['create_cloudfront_url'] == "true") {
 					create_cloudfront_url = true
 				}
 
 				echo "create_cloudfront_url====" + create_cloudfront_url
-
-				send_status_email('STARTED', config, '')
-
+				send_status_email('STARTED', '')
 				validateTemplate()
-				validateDeploymentConfigurations(config)
+				validateDeploymentConfigurations()
 			} catch (ex) {
-				send_status_email('FAILED', config, '')
+				send_status_email('FAILED', '')
 				events.sendFailureEvent('VALIDATE_PRE_BUILD_CONF', ex.getMessage(), context_map)
+				events.sendFailureEvent('UPDATE_DEPLOYMENT', ex.getMessage(), environmentDeploymentMetadata.generateDeploymentMap("failed", environment, gitCommitHash), environment)
 				error ex.getMessage()
 			}
 			events.sendCompletedEvent('VALIDATE_PRE_BUILD_CONF', 'pre-build validation completed', context_map)
 		}
 
-		def s3StgBucket  = configLoader.JAZZ.S3.WEBSITE_STG_BUCKET;
-		def s3ProdBucket = configLoader.JAZZ.S3.WEBSITE_PROD_BUCKET;
-		def s3DevBucket  = configLoader.JAZZ.S3.WEBSITE_DEV_BUCKET;
-
-		stage("Deployment to ${environment} Env"){
-				events.sendStartedEvent("DEPLOY_TO_AWS", 'deployment starts', context_map)
-				events.sendStartedEvent('UPDATE_ENVIRONMENT', 'Environment  status update event  for ${environment} deployment', environmentDeploymentMetadata.generateEnvironmentMap("deployment_started", environment), environment)
-				withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: configLoader.AWS_CREDENTIAL_ID, secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) {
-					echo "AWS Configure ......."
-
-					sh "aws configure set profile.cloud-api.region ${configLoader.AWS.REGION}"
-					sh "aws configure set profile.cloud-api.aws_access_key_id $AWS_ACCESS_KEY_ID"
-					sh "aws configure set profile.cloud-api.aws_secret_access_key $AWS_SECRET_ACCESS_KEY"
-					sh "aws configure set preview.cloudfront true"
-
-					def assetInfo = "S3 Folder - /${s3Bucket}/${service}/${environment}"
-					try {
-						try {
-							echo "Checking if the website already exists.."
-							sh "aws s3 ls s3://${s3Bucket}/${service}/${environment}"
-						} catch (ex) {
-							error ex.getMessage()
-						}
-						events.sendStartedEvent("UPDATE_ASSET", 'update assets starts', context_map)
-						try {
-							echo "website with name $service already exists, syncing new files"
-							sh "aws s3 sync ./app s3://${s3Bucket}/${service}/${environment}  --exclude \".git/*\" --exclude \".gitignore\" --exclude \"*.svg\""
-							sh "aws s3 sync ./app s3://${s3Bucket}/${service}/${environment}  --exclude \"*\" --include \"*.svg\" --no-guess-mime-type --content-type image/svg+xml"
-							
-
-							def url = 'n/a'
-							if (create_cloudfront_url == true) {
-								loadBucketPolicy(service, s3Bucket, true)
-
-								def cfDetails = getCloudFrontDetails(environment, service)
-
-								if (cfDetails) {
-									echo "id is ${cfDetails[0]}, domain: ${cfDetails[1]}"
-								}
-
-								updateEnableCompressConfig(environment, service, cfDetails[0])
-
-								invalidateCloudFrontCache(cfDetails[0], service)
-
-								if (cfDetails[1]) {
-									url = "http://" + cfDetails[1].replaceAll("[\n\r]", "")
-								}
-							} else {
-								loadBucketPolicy(service, s3Bucket, false)
-								url = "https://s3.amazonaws.com/${s3Bucket}/${service}/${environment}/index.html"
-							}							
-
-							def svc_status = "You can access your website using following link: ${url}"
-							echo svc_status
-							environmentDeploymentMetadata.setEnvironmentEndpoint(url)
-							send_status_email('COMPLETED', config, svc_status)
-							events.sendCompletedEvent('UPDATE_ASSET', 'update assets completed', context_map)
-							events.sendCompletedEvent('UPDATE_ENVIRONMENT', 'Environment Update event for deployment completion', environmentDeploymentMetadata.generateEnvironmentMap("deployment_completed",   environment), environment)
-							events.sendCompletedEvent('DEPLOY_TO_AWS', 'deployment completed', context_map)
-						} catch (ex) {
-							send_status_email('FAILED', config, '')
-							events.sendFailureEvent('UPDATE_ASSET', ex.getMessage(), context_map)
-							events.sendFailureEvent('UPDATE_ENVIRONMENT', ex.getMessage(), environmentDeploymentMetadata.generateEnvironmentMap("deployment_failed", environment), environment)
-							events.sendFailureEvent('DEPLOY_TO_AWS', ex.getMessage(), context_map)
-						}
+		stage("Deployment to ${current_environment} Env"){
+			events.sendStartedEvent("DEPLOY_TO_AWS", 'deployment starts', context_map)
+			events.sendStartedEvent('UPDATE_ENVIRONMENT', 'Environment  status update event  for ${environment} deployment', environmentDeploymentMetadata.generateEnvironmentMap("deployment_started", environment), environment)
+			withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: configLoader.AWS_CREDENTIAL_ID, secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) {
+				echo "AWS Configure ......."
+
+				sh "aws configure set profile.cloud-api.region ${configLoader.AWS.REGION}"
+				sh "aws configure set profile.cloud-api.aws_access_key_id $AWS_ACCESS_KEY_ID"
+				sh "aws configure set profile.cloud-api.aws_secret_access_key $AWS_SECRET_ACCESS_KEY"
+				sh "aws configure set preview.cloudfront true"
+
+                generateAssetInfo()
+				def assetInfo = "S3 Folder - /${asset_info}"
+
+				echo "Checking if the website already exists.."
+				
+				if (configLoader.JAZZ.BUCKET_PER_SERVICE == "true") {
+					def isBucketExists = checkIfBucketExists(s3Bucket)
+					if (!isBucketExists) {
+						echo "creating a new website with name $s3Bucket"
+						sh "aws s3 mb s3://$s3Bucket --region ${configLoader.AWS.REGION}"
 					}
-					catch (error) {
-						echo "uploading a new website with name $service"
-						events.sendStartedEvent("CREATE_ASSET", 'create assets starts', context_map)
-						try {
-							sh "aws s3 sync ./app s3://${s3Bucket}/$service/${environment}  --exclude \".git/*\" --exclude \".gitignore\" --exclude \"*.svg\""
-							sh "aws s3 sync ./app s3://${s3Bucket}/$service/${environment}  --exclude \"*\" --include \"*.svg\" --no-guess-mime-type --content-type image/svg+xml"
-
-							def url = 'n/a'
-							if (create_cloudfront_url == true) {
-								loadDistributionConfig()
-								generateDistributionConfig( environment, config)
-								sh "aws cloudfront create-distribution-with-tags --distribution-config-with-tags --output json file://distribution_config_with_tags.json"
-
-								loadBucketPolicy(service, s3Bucket, true)
-								url = sh(script: "aws  cloudfront list-distributions --output text --query \"DistributionList.Items[?Origins.Items[?Id=='${configLoader.INSTANCE_PREFIX}-${environment}-static-website-origin-$service']].DomainName\"", returnStdout: true)
-								url = 'http://' + url.replaceAll("[\n\r]", "")
-
-							} else {
-								loadBucketPolicy(service, s3Bucket, false)
-								url = "https://s3.amazonaws.com/${s3Bucket}/${service}/${environment}/index.html"
-							}
-
-							def svc_status = "You can access your website using following link: ${url}"
-
-							echo svc_status
-							environmentDeploymentMetadata.setEnvironmentEndpoint(url)
-							send_status_email('COMPLETED', config, svc_status)
-							events.sendCompletedEvent('CREATE_ASSET', 'create assets completed', context_map)
-							events.sendCompletedEvent('UPDATE_ENVIRONMENT', 'Environment Update event for deployment completion', environmentDeploymentMetadata.generateEnvironmentMap("deployment_completed",   environment), environment)
-							events.sendCompletedEvent('DEPLOY_TO_AWS', 'deployment completed', context_map)
-						} catch (ex) {
-							send_status_email('FAILED', config, '')
-							events.sendFailureEvent('CREATE_ASSET', ex.getMessage(), context_map)
-							events.sendFailureEvent('UPDATE_ENVIRONMENT', ex.getMessage(), environmentDeploymentMetadata.generateEnvironmentMap("deployment_failed", environment), environment)
-							events.sendFailureEvent('DEPLOY_TO_AWS', ex.getMessage(), context_map)
+				}
+				def isBucketwithEnvExists = checkIfBucketExists(asset_info)
+				def asset_event
+				def asset_event_message
+				if (isBucketwithEnvExists) {
+					asset_event = 'UPDATE_ASSET'
+					asset_event_message = 'update'
+				} else {
+					asset_event = 'CREATE_ASSET'
+					asset_event_message = 'create'
+				}
+				events.sendStartedEvent(asset_event, "${asset_event_message} assets starts", context_map)
+				try {
+					sh "aws s3 sync ./app s3://${asset_info}  --exclude \".git/*\" --exclude \".gitignore\" --exclude \"*.svg\""
+					sh "aws s3 sync ./app s3://${asset_info}  --exclude \"*\" --include \"*.svg\" --no-guess-mime-type --content-type image/svg+xml"
+
+					def url
+					if (create_cloudfront_url == true) {
+						updateOrCreateCF()
+						def cloudFrontDistribution = getCloudFrontDetails()
+						url = 'https://' + cloudFrontDistribution['Distribution']
+
+						invalidateCloudFrontCache()
+						generateBucketPolicy(true)
+						echo "CLOUDFRONT UPDATED"
+						echo "You can access the website at $url"					
+					} else {
+						def distributionID = getDistributionId()
+						if (distributionID != null && distributionID != "") {
+							cleanupCloudFrontDistribution()
 						}
+						generateBucketPolicy(false)
+						sh "aws s3 website s3://$s3Bucket --index-document index.html --error-document error.html"					
+						url = generateAssetUrl()
+						echo "You can access the website at $url"
 					}
-					// reset Credentials
-					resetCredentials()
+					def svc_status = "You can access your website using following link: ${url}"
+					echo svc_status
+					environmentDeploymentMetadata.setEnvironmentEndpoint(url)
+					send_status_email('COMPLETED', svc_status)
+					events.sendCompletedEvent(asset_event, "${asset_event_message} assets completed", context_map)
+					events.sendCompletedEvent('UPDATE_DEPLOYMENT',  'Deployment completion Event for $environment deployment',  environmentDeploymentMetadata.generateDeploymentMap("successful",  environment, gitCommitHash), environment)
+					events.sendCompletedEvent('UPDATE_ENVIRONMENT', 'Environment Update event for deployment completion', environmentDeploymentMetadata.generateEnvironmentMap("deployment_completed", environment), environment)
+					events.sendCompletedEvent('DEPLOY_TO_AWS', 'deployment completed', context_map)
+				} catch (ex) {
+					send_status_email('FAILED', '')
+					events.sendFailureEvent(asset_event, ex.getMessage(), context_map)
+					events.sendFailureEvent('UPDATE_DEPLOYMENT',  ex.getMessage(), environmentDeploymentMetadata.generateDeploymentMap("failed", environment, gitCommitHash), environment)
+					events.sendFailureEvent('UPDATE_ENVIRONMENT', ex.getMessage(), environmentDeploymentMetadata.generateEnvironmentMap("deployment_failed", environment), environment)
+					events.sendFailureEvent('DEPLOY_TO_AWS', ex.getMessage(), context_map)
+					error "Deployment Failed. "+ ex.getMessage()
 				}
+
+			}
+			// reset Credentials
+			resetCredentials()
+		}
+	}
+}
+
+def generateAssetUrl(){
+	def url = ""
+	if (configLoader.JAZZ.BUCKET_PER_SERVICE == "true") {
+		url = "http://${s3Bucket}.s3-website-${configLoader.AWS.REGION}.amazonaws.com/${environment}/index.html"
+	} else {
+		url = "http://${s3Bucket}.s3-website-${configLoader.AWS.REGION}.amazonaws.com/${service_config['domain']}-${service_config['service']}/${environment}/index.html"
+	}
+	return url
+}
+
+def generateAssetInfo(){
+	if (configLoader.JAZZ.BUCKET_PER_SERVICE == "true") {
+		if (service_config['s3_bucket_name']) {
+			s3Bucket = service_config['s3_bucket_name']
+		} else {
+			s3Bucket = "${configLoader.INSTANCE_PREFIX}-${utilModule.generateBucketNameForService(service_config['domain'], service_config['service'])}"
+			def serviceMetadataJson = ["s3_bucket_name" : s3Bucket]
+			for (item in service_config.catalog_metadata) {
+				serviceMetadataJson[item.key] = item.value
+			}
+			context_map['metadata'] = serviceMetadataJson
+		}
+		asset_info = "${s3Bucket}/${environment}"
+		asset_name = "${s3Bucket}-${environment}"
+	} else {
+		asset_info = "${s3Bucket}/${service_config['domain']}-${service_config['service']}/${environment}"
+		asset_name = "${s3Bucket}-${service_config['domain']}-${service_config['service']}-${environment}"
+	}
+}
+
+/**
+ * Update the CloudFront Dist for enabling compression & smooth streaming
+ * TODO
+ */
+def updateOrCreateCF() {	
+	echo "Fetching distribution list"	
+	def distributionId = getDistributionId()
+	echo "distributionId...$distributionId"
+	def service = "${service_config['domain']}-${service_config['service']}"
+	if (distributionId == null || distributionId == "") {
+		echo "No Distribution present with the name $service. So creating new distribution."
+		loadDistributionConfig()
+		echo "Generating distribution configuration."
+		generateDistributionConfig()
+		sh "aws cloudfront create-distribution-with-tags --distribution-config-with-tags --output json  file://distribution_config_with_tags.json"		
+	} else {
+		echo "distribution exists..."		
+		updateEnableCompressConfig(distributionId)
+	}
+}
+
+def updateEnableCompressConfig(distributionId) {
+
+	try {
+
+		def cf_config = getDistributionConfig(distributionId)
+		echo "cf_config is $cf_config"		
+		def cfConfig = jsonParse(cf_config)
+		if (cfConfig == null) { error "Could not fetch distribution configuration"}
+
+		def _eTag = cfConfig.ETag
+
+		echo "_eTag is $_eTag"
+		def updateConfig = cfConfig.DistributionConfig
+		if (updateConfig == null) { error "Invalid distribution configuration returned"}
+
+		echo "updateConfig $updateConfig"
+
+		if (!updateConfig.DefaultCacheBehavior.SmoothStreaming || !updateConfig.DefaultCacheBehavior.Compress) {
+			updateConfig.DefaultCacheBehavior.SmoothStreaming = true
+			updateConfig.DefaultCacheBehavior.Compress = true
+
+			def updateConfigJson = JsonOutput.toJson(updateConfig)
+			try {
+				sh "echo '$updateConfigJson' > cf_config.json"
+				sh "cat cf_config.json"
+			} catch (ex) {
+				echo "Ignoring the lazy error0 "+ ex.getMessage()
+			}
+
+			sh "aws cloudfront update-distribution \
+					--distribution-config file://cf_config.json \
+					--id $distributionId \
+					--if-match $_eTag \
+					--output json"
+		}
+	} catch (ex) {
+		if ((ex.getMessage().indexOf("groovy.json.JsonSlurper") > -1) ||
+			(ex.getMessage().indexOf("groovy.json.internal.LazyMap") > -1)) {
+			echo "Ignoring the lazy error1 "+ ex.getMessage()
+		} else {
+			send_status_email('FAILED', '')
+			events.sendFailureEvent('DEPLOY_TO_AWS', ex.getMessage(), context_map)
+			error "Could not update the distribution. "+ ex.getMessage()
+		}
+	}
+}
+/**
+ * Get dist Id if exists
+ *
+ */
+def getDistributionId() {
+	def distributionID
+	try {
+		def outputStr = listDistribution()
+		if (outputStr) {
+			echo "### OutputStr for getting Distribution Id: $outputStr"
+			def outputObj = new JsonSlurper().parseText(outputStr)
+			if (outputObj && outputObj[0].Id) {
+				distributionID = outputObj[0].Id
+			}
+		}
+		return distributionID
+	} catch (ex) {
+		return distributionID
+	}
+}
+
+def listDistribution(){
+	def outputStr = null
+	def service = "${service_config['domain']}-${service_config['service']}"
+	try {
+		outputStr = sh(
+			script: "aws cloudfront list-distributions \
+				--output json \
+				--query \"DistributionList.Items[?Origins.Items[?Id=='${configLoader.INSTANCE_PREFIX}-${environment}-static-website-origin-$service']].{Distribution:DomainName, Id:Id}\"",
+			returnStdout: true
+		)
+		return outputStr
+	} catch (ex) {
+		return outputStr
+	}
+}
+
+/**
+ * Get CloudFront Details
+ */
+def getCloudFrontDetails() {
+	def cfInfo
+	try {
+		def cloudFrontDistributionDetails = listDistribution()
+		echo "cloudFrontDistributionDetails... $cloudFrontDistributionDetails"
+		if (cloudFrontDistributionDetails) {
+			def outputObj = jsonParse(cloudFrontDistributionDetails)
+			cfInfo = outputObj[0]
+		}
+	} catch (ex) {
+		send_status_email('FAILED', '')
+		events.sendFailureEvent('DEPLOY_TO_AWS', ex.getMessage(), context_map)
+		echo "error " + ex.getMessage()
+	}
+	return cfInfo;
+}
+/**
+ * Create an S3 policy for direct S3 access through URLs or only through cloud front
+ * @param isCloudfront if true - cloudfront policy is generated or S3 folder policy is generated
+ *
+ */
+def generateBucketPolicy(isCloudfront) {
+	def policySpec = '{"Version":"2012-10-17","Id":"Policy For ","Statement":[]}'
+	def policyObj 
+	
+	try {
+		def policyJson = sh(returnStdout: true, script: "aws s3api get-bucket-policy --bucket $s3Bucket --query Policy --output text")
+		policyObj = jsonParse(policyJson)
+	} catch (ex) {
+		echo "Bucket policy doesn't exists yet."
+		policyObj = jsonParse(policySpec)
+		policyObj.Id += "$s3Bucket"
+	}
+	if (policyObj) {
+		updateBucketPolicy(isCloudfront, policyObj)
+	}
+}
+
+def updateBucketPolicy(isCloudfront, existingPolicyObj){
+	try {
+		def policyObj = existingPolicyObj
+		def stmtS3 = '{"Sid":"","Effect":"Allow","Principal":{"AWS":"*"},"Action":"s3:GetObject","Resource":"arn:aws:s3:::","Condition":{"IpAddress":{"aws:SourceIp":[]}}}'
+		def stmtCf = '{"Sid":"","Effect":"Allow","Principal":{"AWS":""},"Action":"s3:GetObject","Resource":"arn:aws:s3:::"}'
+		def stmtCfList = '{"Sid":"","Effect":"Allow","Principal":{"AWS":""},"Action":"s3:ListBucket","Resource":"arn:aws:s3:::"}'
+		def existingStmts = policyObj.Statement
+		def cleanupIndex = -1
+		def CFOAI
+
+		try {
+			CFOAI = sh(
+				script: "aws cloudfront list-cloud-front-origin-access-identities --output text \
+			--query \"CloudFrontOriginAccessIdentityList.Items[?Comment=='${configLoader.INSTANCE_PREFIX}-origin_access_identity'].{j: Id}\"",
+				returnStdout: true
+			).trim()
+		} catch (ex) {
+			echo "Failed to list cloudfront origin access identities" 
+		}
+
+		for (aStmt in existingStmts) {
+			cleanupIndex++
+			if ((aStmt['Sid'] == "list-$asset_name") ||
+				(aStmt['Resource'] == "arn:aws:s3:::$asset_info/*")) {
+				policyObj.Statement[cleanupIndex] = null
+			}
+		}
+		policyObj.Statement.removeAll([null])
+		def newStmtObj
+		if (isCloudfront) {
+			def principal = ["AWS": "arn:aws:iam::cloudfront:user/CloudFront Origin Access Identity $CFOAI"]
+			newStmtObj = jsonParse(stmtCf)
+			newStmtObj.Sid = "list-$asset_name"
+			newStmtObj.Principal = principal
+			newStmtObj.Resource += "$asset_info/*"
+			policyObj.Statement << newStmtObj
+
+			//Add list policy
+			def listPolicyObject = jsonParse(stmtCfList)
+			listPolicyObject.Sid = "list-$asset_name"
+			listPolicyObject.Principal = principal
+			listPolicyObject.Resource += "$s3Bucket"
+			policyObj.Statement << listPolicyObject
+		} else {
+			def principal = "*"
+			newStmtObj = jsonParse(stmtS3)
+			newStmtObj.Sid = "list-$asset_name"
+			newStmtObj.Principal = principal
+			newStmtObj.Resource += "$asset_info/*"
+			policyObj.Statement << newStmtObj
+		}
+
+		def newPolicyJson = JsonOutput.prettyPrint(JsonOutput.toJson(policyObj))
+		echo "newPolicyJson... $newPolicyJson"
+		def putPolicyResponse = sh(returnStdout: true, script: "aws s3api put-bucket-policy --output json --bucket $s3Bucket --policy \'${newPolicyJson}\'")
+
+	} catch (ex) {
+		echo "Bucket policy update failed. "+ ex.getMessage()
+		error "Bucket policy update failed. "+ ex.getMessage()
+	}
+
+}
+
+/**
+ * Clean up (can disable only) the active distribution
+ *
+ */
+def cleanupCloudFrontDistribution() {
+	try {
+		def distributionId
+		def _Etag
+		echo "cleaning cloud front distribution..."
+		distributionId = getDistributionId()
+		def distributionConfig = getDistributionConfig(distributionId)
+		_Etag = generateDistributionConfigForDisable(distributionConfig)
+		_Etag = disableCloudFrontDistribution(distributionId, _Etag, "disable-cf-distribution-config.json")
+	} catch (ex) {
+		if ((ex.getMessage()).indexOf("getDistributionId Failed") > -1) {
+			echo "Could not find a CloudFront distribution Id for service: ${service_config['domain']}-${service_config['service']} and environment $environment"
+		} else {
+			error "cleanupCloudFrontDistribution Failed. "+ ex.getMessage()
 		}
 	}
 }
 
-def getS3BucketName(String envname) {
+/**
+ * Disable Distribution configuration
+ * @param distributionID
+ * @param _Etag
+ * @param configFile
+ * @return
+ */
+def disableCloudFrontDistribution(distributionID, _Etag, configFile) {
+	def disableOutput
+	def eTag
+	try {
+		disableOutput = sh(
+			script: "aws cloudfront update-distribution \
+						--output json \
+						--id $distributionID \
+						--distribution-config file://"+ configFile + " \
+						--if-match $_Etag",
+			returnStdout: true
+		)
+		echo "disableOutput... $disableOutput"
+		if (disableOutput) {
+			def disableConfigObj = jsonParse(disableOutput)
+			eTag = disableConfigObj.ETag
+		}
+		echo "disable eTag...$eTag"
+		return eTag
+	} catch (ex) {
+		error "disableCloudFrontDistribution. "+ ex.getMessage()
+	}
+}
 
-	if (envname == "dev") {
-		return configLoader.JAZZ.S3.WEBSITE_DEV_BUCKET;
-	} else if (envname == "stg") {
-		return configLoader.JAZZ.S3.WEBSITE_STG_BUCKET;
-	} else if (envname == "prod") {
-		return configLoader.JAZZ.S3.WEBSITE_PROD_BUCKET;
+/**
+ * Get and save the CloudFront distribution Config corresponding to the service
+ * @param distributionID
+ * @return
+ */
+def getDistributionConfig(distributionId) {
+	def distributionConfig
+	try {
+		distributionConfig = sh(
+			script: "aws cloudfront get-distribution-config \
+						--output json --id "+ distributionId,
+			returnStdout: true
+		)
+		return distributionConfig
+	} catch (ex) {
+		error "getDistributionConfig Failed."+ ex.getMessage()
 	}
 
-	return configLoader.JAZZ.S3.WEBSITE_DEV_BUCKET;
 }
 
+/**
+ * Generate Disable Distribution configuration
+ * @param service
+ * @param stage
+ * @return
+ */
+def generateDistributionConfigForDisable(distributionConfig) {
+	def distributionConfigObj
+	def eTag
+	try {
+		if (distributionConfig) {
+			distributionConfigObj = parseJson(distributionConfig)
+		}
+		eTag = distributionConfigObj.ETag
+		distributionConfigObj.DistributionConfig.Enabled = false
+		def updatedCfg = JsonOutput.toJson(distributionConfigObj.DistributionConfig)
+		echo "updatedCfg... $updatedCfg"
+		try {
+			sh "echo \'$updatedCfg\' > disable-cf-distribution-config.json"
+		} catch (ex) { }
+
+		return eTag
+	} catch (ex) {
+		error "generateDistributionConfigForDisable Failed."+ ex.getMessage()
+	}
+
+}
 def LoadConfiguration() {
 	def prop = [:]
 	def result = readFile('deployment-env.yml').trim()
@@ -295,34 +601,35 @@ def resetCredentials() {
 }
 
 /**
-	Generate the distribution config file
+	Generate the distribution service_config file
 */
-def generateDistributionConfig(envname, config) {
-	sh "sed -i -- 's/{service_name}/${config['domain']}-${config['service']}/g' distribution_config_with_tags.json"
-	sh "sed -i -- 's/{env}/${envname}/g' distribution_config_with_tags.json"
-	sh "sed -i -- 's/{conf_s3bucketname}/${getS3BucketName(envname)}/g' distribution_config_with_tags.json"
+def generateDistributionConfig() {
+	sh "sed -i -- 's/{service_name}/${service_config['domain']}-${service_config['service']}/g' distribution_config_with_tags.json"
+	sh "sed -i -- 's/{env}/${environment}/g' distribution_config_with_tags.json"
+	sh "sed -i -- 's/{conf_s3bucketname}/${s3Bucket}/g' distribution_config_with_tags.json"
 	sh "sed -i -- 's/{conf_stack_prefix}/${configLoader.INSTANCE_PREFIX}/g' distribution_config_with_tags.json"
 	sh "sed -i -- 's:{conf_origin_id}:${configLoader.AWS.CLOUDFRONT_ORIGIN_ID}:g' distribution_config_with_tags.json"
+	if (configLoader.JAZZ.BUCKET_PER_SERVICE == "true") {
+		sh "sed -i -- 's/{origin_path}/${environment}/g' distribution_config_with_tags.json"
+	} else {
+		sh "sed -i -- 's:{origin_path}:${service_config['domain']}-${service_config['service']}/${environment}:g' distribution_config_with_tags.json"
+	}
 
-	sh "sed -i -- 's/{owner}/${config['created_by']}/g' distribution_config_with_tags.json"
-	sh "sed -i -- 's/{domain_name}/${config['domain']}/g' distribution_config_with_tags.json"
+	sh "sed -i -- 's/{owner}/${service_config['created_by']}/g' distribution_config_with_tags.json"
+	sh "sed -i -- 's/{domain_name}/${service_config['domain']}/g' distribution_config_with_tags.json"
 	def distribution_config_with_tags = readFile('distribution_config_with_tags.json').trim()
 	echo(distribution_config_with_tags)
 }
 
-
-
 /**
 	Validate basic configurations in the deployment yaml file and error if any keys are
 	missing.
 */
-def validateDeploymentConfigurations(def prop) {
-
-	if (prop.containsKey("service")) {
-		if (prop['service'] == "") {
+def validateDeploymentConfigurations() {
+	if (service_config.containsKey("service")) {
+		if (service_config['service'] == "") {
 			error "Wrong configuration. Value for Key 'service' is missing in the configuration"
 		}
-
 	} else {
 		error "Wrong configuration. Key 'service' is missing in the configuration"
 	}
@@ -334,187 +641,28 @@ def validateDeploymentConfigurations(def prop) {
 */
 def validateTemplate() {
 	if (fileExists('app/index.html')) {
-
 		echo "index.html is present"
-	}
-	else {
+	} else {
 		error "index.html is not available."
 	}
 
 	if (fileExists('deployment-env.yml')) {
-
 		echo "deployment-env.yml is present"
-	}
-	else {
+	} else {
 		error "deployment-env.yml is not available."
 	}
-
 }
 
 def loadDistributionConfig() {
-
 	checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: repo_credential_id, url:  scmModule.getCoreRepoCloneUrl("website-distribution-pack")]]])
-
-}
-
-def loadBucketPolicy(String service, String s3Bucket, Boolean create_cloudfront_url){
-	def policySpec = '{"Version":"2012-10-17","Id":"Policy For ","Statement":[]}'
-	def policyObj 
-	
-	try {
-		def policyJson = sh(returnStdout: true, script: "aws s3api get-bucket-policy --bucket $s3Bucket --query Policy --output text")
-		echo "policyJson: $policyJson"
-		policyObj = jsonParse(policyJson)
-		echo "loadBucketPolicy readFile: $policyObj"
-	} catch (ex) {
-		echo "Bucket policy doesn't exists yet."
-		policyObj = jsonParse(policySpec)
-		policyObj.Id += "$s3Bucket"
-	}
-	if (policyObj) {
-		updateS3BucketPolicy(service, s3Bucket, create_cloudfront_url, policyObj)
-	}
 }
 
-def loadIPList() {
-
-	dir('_jenkins_buildpack') {
-
-		checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: repo_credential_id, url: scmModule.getCoreRepoCloneUrl("jenkins-build-pack-website")]]])
-	}
-}
-/*
-*	add restrictions so that Cloudfront endpoint can access S3
-*/
-def updateS3BucketPolicy(service, s3Bucket, isCloudfront, existingPolicyObj){
-	echo "updateS3BucketPolicy"
-	try {
-		def policy_filedata
-		def new_policy
-		def stmtS3 = '{"Sid":"","Effect":"Allow","Principal":{"AWS":"*"},"Action":"s3:GetObject","Resource":"arn:aws:s3:::","Condition":{"IpAddress":{"aws:SourceIp":[]}}}'
-		def stmtCf = '{"Sid":"","Effect":"Allow","Principal":{"AWS":""},"Action":"s3:GetObject","Resource":"arn:aws:s3:::"}'
-		def stmtCfList = '{"Sid":"ListBucket","Effect":"Allow","Principal":"*","Action":"s3:ListBucket","Resource":"arn:aws:s3:::"}'
-		def cleanupIndex = -1
-
-		def bucketPolicy = existingPolicyObj
-		def statements = bucketPolicy.Statement
-
-		def CFOAI = sh(
-			script: "aws cloudfront list-cloud-front-origin-access-identities --output text \
-			--query \"CloudFrontOriginAccessIdentityList.Items[?Comment=='${configLoader.INSTANCE_PREFIX}-origin_access_identity'].{j: Id}\"",
-			returnStdout: true
-		).trim()
-
-		for (st in statements) {
-			cleanupIndex++
-			if (st['Sid'] == "$service") {
-				echo "cleanupIndex...$cleanupIndex"
-				bucketPolicy.Statement[cleanupIndex] = null
-			} else if (st['Sid'] == "ListBucket") {
-				bucketPolicy.Statement[cleanupIndex] = null
-			}
-		}
-		bucketPolicy.Statement.removeAll([null])
-
-		//add restrictions so that Cloudfront endpoint can access S3
-		if (isCloudfront) {
-			echo "isCloudfront: $isCloudfront"
-			def principal = ["AWS": "arn:aws:iam::cloudfront:user/CloudFront Origin Access Identity $CFOAI"]
-			new_policy = jsonParse(stmtCf)
-			new_policy.put('Sid', "$service")
-			new_policy.put('Principal', principal)
-			new_policy.put('Resource', "arn:aws:s3:::$s3Bucket/$service/*")
-			bucketPolicy.Statement << new_policy
-
-			//add new list policy statement 
-			def listPolicyObject = jsonParse(stmtCfList)
-			listPolicyObject.put('Principal', principal)
-			listPolicyObject.put('Resource', "arn:aws:s3:::$s3Bucket")
-			bucketPolicy.Statement << listPolicyObject
-		} else {
-			echo "isCloudfront: $isCloudfront"
-			def principal = "*"
-			new_policy = jsonParse(stmtS3)
-			new_policy.put('Sid', "$service")
-			new_policy.put('Principal', principal)
-			new_policy.put('Resource', "arn:aws:s3:::$s3Bucket/$service/*")
-			bucketPolicy.Statement << new_policy
-		}
-
-		echo "updated PolicyStatement : $statements"
-
-		policy_filedata = JsonOutput.prettyPrint(JsonOutput.toJson(bucketPolicy))
-
-		def putPolicyResponse = sh(returnStdout: true, script: "aws s3api put-bucket-policy --output json --bucket $s3Bucket --policy \'${policy_filedata}\'")
-
-	} catch (ex) {
-		echo "Bucket policy update failed. "+ ex.getMessage()
-		error "Bucket policy update failed. "+ ex.getMessage()
-	}
-}
-
-def getCloudFrontDetails(env, service) {
-	try {
-		def distributionId = sh(script: "aws  cloudfront list-distributions --output text \
-										--query \"DistributionList.Items[?Origins.Items[?Id=='${configLoader.INSTANCE_PREFIX}-${env}-static-website-origin-$service']].{j: Id, k: DomainName}\"",
-			returnStdout: true
-		).trim()
-		echo "getCloudFrontDetails are $distributionId"
-		return distributionId.split('\t')
-	}
-	catch (ex) {
-		echo "Failed to get DistributionConfig::::  " + ex.toString()
-	}
-}
-
-def updateEnableCompressConfig(env, service, distributionId) {
-
-	try {
-		def cf_config = sh(script: "aws cloudfront get-distribution-config --id $distributionId --output json",
-			returnStdout: true
-		).trim()
-
-		echo "cf_config is $cf_config"
-		def configParser = new groovy.json.JsonSlurper()
-		def cfConfig = configParser.parseText(cf_config)
-		if (cfConfig == null) { error "Could not fetch distribution configuration"}
-
-		def _eTag = cfConfig.ETag
-
-		echo "_eTag is $_eTag"
-		def updateConfig = cfConfig.DistributionConfig
-		if (updateConfig == null) { error "Invalid distribution configuration returned"}
-
-		echo "updateConfig $updateConfig"
-
-		if (!updateConfig.DefaultCacheBehavior.SmoothStreaming || !updateConfig.DefaultCacheBehavior.Compress) {
-			updateConfig.DefaultCacheBehavior.SmoothStreaming = true
-			updateConfig.DefaultCacheBehavior.Compress = true
-
-			def updateConfigJson = JsonOutput.toJson(updateConfig)
-			try {
-				sh "echo '$updateConfigJson' > cf_config.json"
-				sh "cat cf_config.json"
-			} catch (ex) {
-				echo "Ignoring the lazy error0 "+ ex.getMessage()
-			}
-
-			sh "aws cloudfront update-distribution \
-					--distribution-config file://cf_config.json \
-					--id $distributionId \
-					--if-match $_eTag \
-					--output json"
-		}
-	} catch (ex) {
-		error "Failed while updateEnableCompressConfig " + ex.toString()
-	}
-}
-
-def invalidateCloudFrontCache(distributionId, service) {
+def invalidateCloudFrontCache() {
 	try {
+		def distributionId = getDistributionId()
+		def service = "${service_config['domain']}-${service_config['service']}"
 		if (distributionId) {
-
-			def callerReference = service + "_" + env.BUILD_ID
+			def callerReference = "${service}_${env.BUILD_ID}"
 			def config = "{\"Paths\":{\"Quantity\":1,\"Items\":[\"/*\"]},\"CallerReference\":\"$callerReference\"}"
 
 			def invalidateStatus = sh(
@@ -531,6 +679,20 @@ def invalidateCloudFrontCache(distributionId, service) {
 	}
 }
 
+/** 
+ * Check if bucket exists
+ *
+ */
+def checkIfBucketExists(s3BucketName) {
+	def status = true;
+	try {
+		sh "aws s3 ls s3://$s3BucketName"
+	} catch (ex) {
+		status = false
+	}
+	return status
+}
+
 /**
  * For getting token to access catalog APIs.
  * Must be a service account which has access to all services
@@ -573,22 +735,22 @@ def setCredentials() {
 * Supported build status values = STARTED, FAILED & COMPLETED
 * @return
 */
-def send_status_email (build_status, config, email_content) {
-   	echo "Sending build notification to ${config['created_by']}"
+def send_status_email (build_status, email_content) {
+   	echo "Sending build notification to ${service_config['created_by']}"
 	def body_subject = ''
 	def body_text = ''
 	def cc_email = ''
 	def body_html = ''
    	if (build_status == 'STARTED') {
 		echo "email status started"
-		body_subject = "Jazz Build Notification: Deployment STARTED for service: ${config['service']}"
+		body_subject = "Jazz Build Notification: Deployment STARTED for service: ${service_config['service']}"
    	} else if (build_status == 'FAILED') {
 		echo "email status failed"
 		def build_url = env.BUILD_URL + 'console'
-		body_subject = "Jazz Build Notification: Deployment FAILED for service: ${config['service']}"
+		body_subject = "Jazz Build Notification: Deployment FAILED for service: ${service_config['service']}"
 		body_text = body_text + '\n\nFor more details, please click this link: ' + build_url
    	} else if (build_status == 'COMPLETED') {
-		body_subject = "Jazz Build Notification: Deployment COMPLETED successfully for service: ${config['service']}"
+		body_subject = "Jazz Build Notification: Deployment COMPLETED successfully for service: ${service_config['service']}"
    	} else {
 		echo "Unsupported build status, nothing to email.."
 		return
@@ -599,7 +761,7 @@ def send_status_email (build_status, config, email_content) {
 	def fromStr = 'Jazz Admin <' + configLoader.JAZZ.ADMIN + '>'
 	body = JsonOutput.toJson([
 		from : fromStr,
-		to : config['created_by'],
+		to : service_config['created_by'],
 		subject : body_subject,
 		text : body_text,
 		cc : cc_email,
@@ -614,7 +776,7 @@ def send_status_email (build_status, config, email_content) {
 						-d \'${body}\'", returnStdout: true).trim()
 		def responseJSON = parseJson(sendMail)
 		if (responseJSON.data) {
-			echo "successfully sent e-mail to ${config['created_by']}"
+			echo "successfully sent e-mail to ${service_config['created_by']}"
 		} else {
 			echo "exception occured while sending e-mail: $responseJSON"
 		}
@@ -671,7 +833,6 @@ def parseJson(jsonString) {
     return m
 }
 
-
 def getBuildModuleUrl() {
     if (scm_type && scm_type != "bitbucket") {
 		// right now only bitbucket has this additional tag scm in its git clone path
diff --git a/service-onboarding-build-pack/Jenkinsfile b/service-onboarding-build-pack/Jenkinsfile
index 45364b4963..31ddabc1bd 100644
--- a/service-onboarding-build-pack/Jenkinsfile
+++ b/service-onboarding-build-pack/Jenkinsfile
@@ -102,14 +102,14 @@ node  {
 
 			} else {
 				send_status_email("FAILED")
-				events.sendFailureEvent('VALIDATE_INPUT', ex.getMessage(), context_map)
-				error "Invalid ${service_config['runtime']}"
+				events.sendFailureEvent('VALIDATE_INPUT', "Invalid runtime: ${service_config['runtime']}", context_map)
+				error "Invalid runtime: ${service_config['runtime']}"
 			}
 
 		} else {
 			send_status_email("FAILED")
-			events.sendFailureEvent('VALIDATE_INPUT', ex.getMessage(), context_map)
-			error "Invalid Service Type"
+			events.sendFailureEvent('VALIDATE_INPUT', "Invalid service type", context_map)
+			error "Invalid service type"
 		}
 		events.sendCompletedEvent('VALIDATE_INPUT', 'input validation completed', context_map)
 	}
diff --git a/website-distribution-pack/distribution_config_with_tags.json b/website-distribution-pack/distribution_config_with_tags.json
index 3e7708dc8e..8a803d502a 100644
--- a/website-distribution-pack/distribution_config_with_tags.json
+++ b/website-distribution-pack/distribution_config_with_tags.json
@@ -9,7 +9,7 @@
       "Items": [{
         "Id": "{conf_stack_prefix}-{env}-static-website-origin-{service_name}",
         "DomainName": "{conf_s3bucketname}.s3.amazonaws.com",
-        "OriginPath": "/{service_name}/{env}",
+        "OriginPath": "/{origin_path}",
         "S3OriginConfig": {
           "OriginAccessIdentity": "{conf_origin_id}"
         }
@@ -79,4 +79,4 @@
       }
     ]
   }
-}
+}
\ No newline at end of file