diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index c45e5d5..d6b6917 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -1,4 +1,12 @@
 steps:
+  ### Test
+#  - id: 'test'
+#    name: 'gcr.io/cloud-builders/mvn'
+#    args: [
+#      'test',
+#      '-Dspring.profiles.active=test'
+#    ]
+  ### Build
   - id: 'build'
     name: 'gcr.io/cloud-builders/mvn'
     args: [
@@ -6,16 +14,14 @@ steps:
       'package',
       '-Dmaven.test.skip=true'
     ]
-  ### Build
-  - id: 'build'
+#    waitFor: ['test']
+  ### docker Build
+  - id: 'docker build'
     name: 'gcr.io/cloud-builders/docker'
-    entrypoint: 'bash'
     args:
-      - '-c'
-      - |
-        echo '$COMMIT_SHA =' $COMMIT_SHA
-        docker build -t gcr.io/$PROJECT_ID/$_PROJECT_NAME:$COMMIT_SHA .
-  ### Test
+      - 'build'
+      - '--tag=gcr.io/$PROJECT_ID/$_PROJECT_NAME:$COMMIT_SHA'
+      - '.'
   ### Publish
   - id: 'publish'
     name: 'gcr.io/cloud-builders/docker'
@@ -49,8 +55,6 @@ steps:
               targetPort: 8080
           selector:
             app: $_PROJECT_NAME
-          type:
-              LoadBalancer
         EOF
 
         cat <<EOF | kubectl apply -f -