diff --git a/.gitignore b/.gitignore
index 6e12224..7310832 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,5 @@ vendor/*
 teams/*
 teamcreds.txt
 lib/harbor/certs/*
-sam/
-work.txt
-sam.yml
\ No newline at end of file
+peer_configs/*
+work.txt
\ No newline at end of file
diff --git a/katana-services b/katana-services
index 5435e29..23061e5 160000
--- a/katana-services
+++ b/katana-services
@@ -1 +1 @@
-Subproject commit 5435e29413e5b09999348332a4ce5ec6fb270c45
+Subproject commit 23061e51163dcff8b11d6df74f8224d763df0bec
diff --git a/kubernetes/manifests/kashira.yml b/kubernetes/manifests/kashira.yml
index d9dd7c6..11e95b5 100644
--- a/kubernetes/manifests/kashira.yml
+++ b/kubernetes/manifests/kashira.yml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: cluster-admin
       containers:
         - name: kashira
-          image: harbor.katana.local/katana/kissaki
+          image: harbor.katana.local/katana/kashira
           imagePullPolicy: Always   # added for ease may be remove later
           ports:
             - containerPort: 80
diff --git a/lib/deployment/deployment.go b/lib/deployment/deployment.go
index 2c249c0..c4f8aae 100644
--- a/lib/deployment/deployment.go
+++ b/lib/deployment/deployment.go
@@ -129,9 +129,11 @@ func DeployCluster(kubeconfig *rest.Config, kubeclientset *kubernetes.Clientset)
 		if err = tmpl.Execute(manifest, deploymentConfig); err != nil {
 			return err
 		}
+		//TODO add a receiver handler to avoid throttling or apply all manifest concurrently
 		if err = ApplyManifest(kubeconfig, kubeclientset, manifest.Bytes(), g.KatanaConfig.KubeNameSpace); err != nil {
 			return err
 		}
+		
 	}
 
 	return nil
diff --git a/lib/utils/crypto.go b/lib/utils/crypto.go
index 8917497..12e3b77 100644
--- a/lib/utils/crypto.go
+++ b/lib/utils/crypto.go
@@ -6,6 +6,7 @@ import (
 	"encoding/base64"
 	"encoding/hex"
 	"fmt"
+	"log"
 
 	"github.com/xdg-go/pbkdf2"
 	"golang.org/x/crypto/bcrypt"
@@ -25,65 +26,75 @@ func Base64Encode(str string) string {
 
 func GenerateCerts(domain string, basePath string) error {
 	// Generate ca.key in harbor directory
+	log.Println("cert 1")
 	cmd := "openssl genrsa -out " + basePath + "/ca.key 4096"
 	if err := RunCommand(cmd); err != nil {
 		return err
 	}
-	
+	log.Println("cert 2")
 	// using -traditional flag to get PKCS#1 [different header], otherwise 500 Internal Error
 	cmd = "openssl rsa -in "+basePath+"/ca.key -out "+basePath+"/ca.key -traditional"
 	if err := RunCommand(cmd); err != nil {
 		return err
 	}
 
+	log.Println("cert 3")
 	// using -traditional flag to get PKCS#1 [different header], otherwise 500 Internal Error
 	cmd = "openssl rsa -in "+basePath+"/ca.key -out "+basePath+"/ca.key -traditional"
 	if err := RunCommand(cmd); err != nil {
 		return err
 	}
 
+	log.Println("cert 4")
 	// Generate ca.crt
 	cmd = "openssl req -x509 -new -nodes -sha512 -days 3650 -subj '/C=IN/ST=Delhi/L=Delhi/O=Katana/CN=" + domain + "' -key " + basePath + "/ca.key -out " + basePath + "/ca.crt"
 	if err := RunCommand(cmd); err != nil {
 		return err
 	}
 
+	log.Println("cert 5")
 	// using -traditional flag to get PKCS#1 [different header], otherwise 500 Internal Error
-	cmd = "openssl rsa -in " + basePath + "/" + domain + ".key -out " + basePath + "/" + domain + ".key -traditional"
-	if err := RunCommand(cmd); err != nil {
-		return err
-	}
+	// cmd = "openssl rsa -in " + basePath + "/" + domain + ".key -out " + basePath + "/" + domain + ".key -traditional"
+	// if err := RunCommand(cmd); err != nil {
+	// 	return err
+	// }
 
+	log.Println("cert 6")
 	// Generate private key
 	cmd = "openssl genrsa -out " + basePath + "/" + domain + ".key 4096"
 	if err := RunCommand(cmd); err != nil {
 		return err
 	}
 
+	log.Println("cert 7")
 	// using -traditional flag to get PKCS#1 [different header], otherwise 500 Internal Error
 	cmd="openssl rsa -in "+basePath+"/"+domain+".key -out "+basePath+"/"+domain+".key -traditional"
 	if err := RunCommand(cmd); err != nil {
 		return err
 	}
 
+	log.Println("cert 8")
 	// Generate certificate signing request
 	cmd = "openssl req -sha512 -new -subj '/C=IN/ST=Delhi/L=Delhi/O=Katana/CN=" + domain + "' -key " + basePath + "/" + domain + ".key -out " + basePath + "/" + domain + ".csr"
 	if err := RunCommand(cmd); err != nil {
 		return err
 	}
 
+	log.Println("cert 9")
 	// Generate v3.ext file
 	cmd = "echo 'authorityKeyIdentifier=keyid,issuer\nbasicConstraints=CA:FALSE\nkeyUsage = digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment\nextendedKeyUsage = serverAuth\nsubjectAltName = @alt_names\n[alt_names]\nDNS.1=" + domain + "' > " + basePath + "/v3.ext"
 	if err := RunCommand(cmd); err != nil {
 		return err
 	}
 
+	log.Println("cert 10")
 	// Generate certificate
 	cmd = "openssl x509 -req -sha512 -days 3650 -extfile " + basePath + "/v3.ext -CA " + basePath + "/ca.crt -CAkey " + basePath + "/ca.key -CAcreateserial -in " + basePath + "/" + domain + ".csr -out " + basePath + "/" + domain + ".crt"
 	if err := RunCommand(cmd); err != nil {
 		return err
 	}
 
+	log.Println("cert 11")
 	return nil
 }