diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9d16b2fc8a580d4549115d1ce2c5ac3497981f4..9cff6907b3691fabae7cd8d308ad9cc4b1507576 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,15 +102,18 @@ gcloud-psc:
     GCP_DNS_ZONE_GKE_ELASTIC: $GCP_DNS_ZONE_GKE_ELASTIC
     EC_SERVICE_ATTACHMENT_URI: $EC_SERVICE_ATTACHMENT_URI
     EC_DNS_ZONE: $EC_DNS_ZONE
-  script: |-
-    echo $GCP_SA > gcp-sa.json
-    gcloud auth activate-service-account --key-file gcp-sa.json
-    echo "Activate Service Account: OK"
-    gcloud config set project $GCP_PROJECT_ID
-    echo "Set Project: OK"
-    cd $GCLOUD_ROOT_PSC
-    chmod +x ./setting-psc.sh
-    ./setting-psc.sh
+  before_script:
+    - |
+      echo $GCP_SA > gcp-sa.json
+      gcloud auth activate-service-account --key-file gcp-sa.json
+      echo "Activate Service Account: OK"
+      gcloud config set project $GCP_PROJECT_ID
+      echo "Set Project: OK"
+      cd $GCLOUD_ROOT_PSC
+  script:
+    - |
+      chmod +x ./setting-psc.sh
+      ./setting-psc.sh
   artifacts:
     paths:
       - ${CI_PROJECT_DIR}/pscConnectionId.env
@@ -128,14 +131,17 @@ check-elastic:
   variables:
     TF_ADDRESS: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/terraform/state/elastic
     TF_VAR_ec_apikey: $EC_API_KEY
-  script: |-
-    export TF_VAR_psc_connection_id=$(cat ${CI_PROJECT_DIR}/pscConnectionId.env | grep GCP_PSC_CONNECTION_ID | cut -d = -f2)
-    cd $TF_ROOT_ELASTIC
-    gitlab-terraform init 
-    gitlab-terraform validate
-    gitlab-terraform fmt -check
-    gitlab-terraform plan
-    gitlab-terraform plan-json
+  before_script:
+    - |
+      export TF_VAR_psc_connection_id=$(cat ${CI_PROJECT_DIR}/pscConnectionId.env | grep GCP_PSC_CONNECTION_ID | cut -d = -f2)
+      cd $TF_ROOT_ELASTIC
+  script:
+    - |
+      gitlab-terraform init 
+      gitlab-terraform validate
+      gitlab-terraform fmt -check
+      gitlab-terraform plan
+      gitlab-terraform plan-json
   artifacts:
     name: plan
     paths:
@@ -156,9 +162,11 @@ apply-elastic:
   variables:
     TF_ADDRESS: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/terraform/state/elastic
     TF_VAR_ec_apikey: $EC_API_KEY
-  script: |-
-    export TF_VAR_psc_connection_id=$(cat ${CI_PROJECT_DIR}/pscConnectionId.env | grep GCP_PSC_CONNECTION_ID | cut -d = -f2)
-    cd $TF_ROOT_ELASTIC
-    gitlab-terraform init 
-    gitlab-terraform apply -auto-approve
- 
\ No newline at end of file
+  before_script:
+    - |
+      export TF_VAR_psc_connection_id=$(cat ${CI_PROJECT_DIR}/pscConnectionId.env | grep GCP_PSC_CONNECTION_ID | cut -d = -f2)
+      cd $TF_ROOT_ELASTIC
+  script:
+    - |
+      gitlab-terraform init 
+      gitlab-terraform apply -auto-approve