diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5cc5fb971..4552fba55 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,16 +60,11 @@ setup:dynamic:
   before_script:
     - apt-get -y update
     - apt-get -y install git
+  variables:
+    GIT_LOG_COMMAND: git log --max-count=1 --pretty=format:%cI
   script:
-    - FRONTEND_IMAGE_VERSION=`git log --all ${FRONTEND_IMAGE_DEPENDENCIES} | grep '^commit' | wc --lines | tee frontend-image-version`
-    - BACKEND_IMAGE_VERSION=`git log --all ${BACKEND_IMAGE_DEPENDENCIES} | grep '^commit' | wc --lines | tee backend-image-version`
-    - git log
-    - git log ${FRONTEND_IMAGE_DEPENDENCIES}
-    - git log ${FRONTEND_IMAGE_DEPENDENCIES} | grep '^commit'
-    - git log ${FRONTEND_IMAGE_DEPENDENCIES} | grep '^commit' | wc --lines
-    - git log ${BACKEND_IMAGE_DEPENDENCIES}
-    - git log ${BACKEND_IMAGE_DEPENDENCIES} | grep '^commit'
-    - git log ${BACKEND_IMAGE_DEPENDENCIES} | grep '^commit' | wc --lines
+    - FRONTEND_IMAGE_VERSION=`${GIT_LOG_COMMAND} ${FRONTEND_IMAGE_DEPENDENCIES} | tee frontend-image-version`
+    - BACKEND_IMAGE_VERSION=`${GIT_LOG_COMMAND} ${BACKEND_IMAGE_DEPENDENCIES} | tee backend-image-version`
     - 'echo "FRONTEND_IMAGE_VERSION: ${FRONTEND_IMAGE_VERSION}, BACKEND_IMAGE_VERSION: ${BACKEND_IMAGE_VERSION}"'
     - cat .gitlab-ci/frontend.yml | .gitlab-ci/dynamci.pl FRONTEND_IMAGE_VERSION=${FRONTEND_IMAGE_VERSION} > frontend.yml
     - cat .gitlab-ci/backend.yml | .gitlab-ci/dynamci.pl BACKEND_IMAGE_VERSION=${BACKEND_IMAGE_VERSION} > backend.yml