diff --git a/build/cd/deploy.go b/build/cd/deploy.go
index 187b32857795e62eeb1f6588d313e5551a41cbfa..44259a23a5eb80ba986809591020b815928f1fc2 100644
--- a/build/cd/deploy.go
+++ b/build/cd/deploy.go
@@ -311,7 +311,7 @@ func createDeployment(environment, hash string) *appv1.Deployment {
 										Port: intstr.IntOrString{IntVal: 8080},
 									},
 								},
-								InitialDelaySeconds: 20,
+								InitialDelaySeconds: 5,
 								PeriodSeconds:       2,
 							},
 							ReadinessProbe: &corev1.Probe{
@@ -321,7 +321,7 @@ func createDeployment(environment, hash string) *appv1.Deployment {
 										Port: intstr.IntOrString{IntVal: 8080},
 									},
 								},
-								InitialDelaySeconds: 120,
+								InitialDelaySeconds: 10,
 								PeriodSeconds:       2,
 							},
 							ImagePullPolicy: "Always",
diff --git a/build/ci/.terraform-ci.yml b/build/ci/.terraform-ci.yml
index b46b2e421c1f46d37be83b91a254cc3919ad69ff..c8b7f5392b497e95199dc697279bd8d7a87aa2dd 100644
--- a/build/ci/.terraform-ci.yml
+++ b/build/ci/.terraform-ci.yml
@@ -68,4 +68,7 @@ tf:destroy:
   stage: .post
   script:
     - gitlab-terraform destroy
+  needs:
+    - job: apply
+      optional: true
   <<: *tf
\ No newline at end of file
diff --git a/build/ci/.test.yml b/build/ci/.test.yml
index 5970db14de6c93482e613c802c623bbc2a320c0d..5cc97d25b851ded5daeef2621011207e5f055f10 100644
--- a/build/ci/.test.yml
+++ b/build/ci/.test.yml
@@ -12,7 +12,7 @@ integration-test:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH
       allow_failure: true
   script:
-    - sleep 1m
+    - sleep 2m
     - go test -race ./test/integration -v -coverprofile=coverage.out
 
 .test: &test
diff --git a/test/integration/cmdIntegration_test.go b/test/integration/cmdIntegration_test.go
index 0b56c9a3d8226d8ce3b7908e61e09fae2b59f161..5649a4449f69c780c61f65ff52dd77dc4f7cb4ab 100644
--- a/test/integration/cmdIntegration_test.go
+++ b/test/integration/cmdIntegration_test.go
@@ -37,18 +37,22 @@ func testSetupIntegration() {
 	a := os.Getenv("GOSDN_TEST_ENDPOINT")
 	if a != "" {
 		testAddress = a
+		log.Infof("GOSDN_TEST_ENDPOINT set to %v", testAddress)
 	}
 	api := os.Getenv("GOSDN_TEST_API_ENDPOINT")
 	if api != "" {
 		testAPIEndpoint = api
+		log.Infof("GOSDN_TEST_API_ENDPOINT set to %v", testAddress)
 	}
 	u := os.Getenv("GOSDN_TEST_USER")
 	if u != "" {
 		testUsername = u
+		log.Infof("GOSDN_TEST_USER set to %v", testAddress)
 	}
 	p := os.Getenv("GOSDN_TEST_PASSWORD")
 	if p != "" {
 		testPassword = p
+		log.Infof("GOSDN_TEST_PASSWORD set to %v", testAddress)
 	}
 
 	gnmiMessages = map[string]pb.Message{