diff --git a/.zuul.yaml b/.zuul.yaml
index cad3b5af..e12e9d74 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -37,9 +37,18 @@
 
 - job:
     name: docker-build-monasca-base
-    timeout: 10200
-    post-timeout: 3600
-    run: playbooks/run.yml
+    run: playbooks/docker_build_base.yml
+    required-projects:
+      - openstack/monasca-common
+    attempts: 1
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^.*\.md$
+      - ^doc/.*$
+
+- job:
+    name: docker-build-monasca-service
+    run: playbooks/docker_build_service.yml
     required-projects:
       - openstack/monasca-common
     attempts: 1
diff --git a/playbooks/run.yml b/playbooks/docker_build_base.yml
similarity index 100%
rename from playbooks/run.yml
rename to playbooks/docker_build_base.yml
diff --git a/playbooks/docker_build_service.yml b/playbooks/docker_build_service.yml
new file mode 100644
index 00000000..e0723d1d
--- /dev/null
+++ b/playbooks/docker_build_service.yml
@@ -0,0 +1,19 @@
+---
+- hosts: all
+  tasks:
+    - name: Run node setup script
+      shell: "{{ zuul.projects['git.openstack.org/openstack/monasca-common'].src_dir }}/playbooks/setup_ci.sh"
+      become: true
+
+    - name: Changing permission of Docker socket to 666
+      file:
+        path: /run/docker.sock
+        mode: 666
+      become: true
+
+    - name: Build Docker image
+      shell: "{{ zuul.project.src_dir }}/docker/build_image.sh {{ zuul.tag if zuul.pipeline == 'release' else zuul.branch | basename }}"
+      become: true
+
+    - name: List images
+      shell: "docker images --format '{% raw %}{{ .Repository }}:{{ .Tag }}{% endraw %}' | grep monasca"