diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f89770..7268ce4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: lholota/bash-git
+image: lholota/bash-git:latest
 
 stages:
   - pack
@@ -12,6 +12,10 @@ pack:
     - dev
   script:
     - bash -e ./tools/gitsync.sh pack
+  cache:
+    key: ${CI_COMMIT_REF_NAME}
+    paths: 
+      - mbfiles/
 
 deploy-gitlab:
   stage: deploy
@@ -21,6 +25,10 @@ deploy-gitlab:
     - dev
   script:
     - bash -e ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${GL_REF}/monlor/mbfiles.git
+  cache:
+    key: ${CI_COMMIT_REF_NAME}
+    paths: 
+      - mbfiles/
 
 deploy-coding:
   stage: deploy
@@ -29,8 +37,12 @@ deploy-coding:
     - test
   script:
     - bash -e ./tools/gitsync.sh deploy mbfiles ${CI_COMMIT_REF_NAME} ${CO_REF}/monlor/mbfiles.git
+  cache:
+    key: ${CI_COMMIT_REF_NAME}
+    paths: 
+      - mbfiles/
 
-pack-all:
+pack-master:
   stage: pack
   only:
     - tags
@@ -40,11 +52,27 @@ pack-all:
     - git fetch origin master
     - git checkout master
     - bash -e ./tools/gitsync.sh pack mbfiles-master
+  cache:
+    key: deploy-master
+    paths: 
+      - mbfiles-master/
+
+pack-test:
+  stage: pack
+  only:
+    - tags
+  tags:
+    - deploy-*
+  script:
     - git fetch origin test
     - git checkout test
     - bash -e ./tools/gitsync.sh pack mbfiles-test
+  cache:
+    key: deploy-test
+    paths:
+      - mbfiles-test/
 
-deploy-all:
+deploy-master:
   stage: deploy
   only:
     - tags
@@ -52,19 +80,23 @@ deploy-all:
     - deploy-*
   script:
     - bash -e ./tools/gitsync.sh deploy mbfiles-master ${CI_COMMIT_REF_NAME} ${CO_REF}/monlor/mbfiles.git
+  cache:
+    key: deploy-master
+    paths: 
+      - mbfiles-master/
+
+deploy-test:
+  stage: deploy
+  only:
+    - tags
+  tags:
+    - deploy-*
+  script:
     - bash -e ./tools/gitsync.sh deploy mbfiles-test ${CI_COMMIT_REF_NAME} ${CO_REF}/monlor/mbfiles.git
-
-cache:
-  key: ${CI_COMMIT_REF_NAME}
-  untracked: true
-  paths: 
-    - mbfiles/
-
-cache:
-  key: deploy-all
-  untracked: true
-  paths: 
-    - mbfiles-master/
-    - mbfiles-test/
+  cache:
+    key: deploy-test
+    paths:
+      - mbfiles-test/
+