diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 83c69715b3f14f214f6819c04b333e18c7538061..84953ada4201e9a5c1d806c27652f20497570aab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -114,14 +114,12 @@ build_backend:
     DOCKER_DRIVER: overlay2
   script:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker build --cache-from $IMAGE_TAG -t "$IMAGE_TAG-$CI_COMMIT_SHA" -t $IMAGE_TAG .
-    - docker push "$IMAGE_TAG-CI_COMMIT_SHA"
-    - docker push $IMAGE_TAG
-#  cache:
-#    key: "$CI_JOB_NAME"
-#    paths:
-#      - .venv
-#      - frontend/node_modules
+    - docker pull "$CONTAINER_IMAGE-base" || true
+    - docker build --cache-from "$CONTAINER_IMAGE-base" -t "$CONTAINER_IMAGE-base" --target node .
+    - docker pull $CONTAINER_IMAGE || true
+    - docker build --cache-from $CONTAINER_IMAGE --cache-from "$CONTAINER_IMAGE-base" -t $CONTAINER_IMAGE .
+    - docker push "$CONTAINER_IMAGE-base"
+    - docker push $CONTAINER_IMAGE
   tags:
     - docker
 
diff --git a/functional_tests/test_export_modal.py b/functional_tests/test_export_modal.py
index 25d57e87ede6ac2d06709a1851731c095b5ecc68..346842dcd377498f7be2eda3d3d61204d7b40b55 100644
--- a/functional_tests/test_export_modal.py
+++ b/functional_tests/test_export_modal.py
@@ -94,7 +94,7 @@ class ExportTestModal(LiveServerTestCase):
         export_type_json.click()
         data_export_btn = data_export_modal.find_element_by_id('export-data-download-btn')
         data_export_btn.click()
-        WebDriverWait(self.browser, 5).until(ec.new_window_is_opened)
+        WebDriverWait(self.browser, 10).until(ec.new_window_is_opened)
         tabs = self.browser.window_handles
         self.assertEqual(2, len(tabs))
         self.browser.switch_to.window(tabs[1])
@@ -110,7 +110,7 @@ class ExportTestModal(LiveServerTestCase):
         instance_export_modal = self.browser.find_element_by_id('instance-export-modal')
         instance_export_btn = instance_export_modal.find_element_by_id('instance-export-dl')
         instance_export_btn.click()
-        WebDriverWait(self.browser, 5).until(ec.new_window_is_opened)
+        WebDriverWait(self.browser, 10).until(ec.new_window_is_opened)
         tabs = self.browser.window_handles
         self.assertEqual(2, len(tabs))
         self.browser.switch_to.window(tabs[1])
diff --git a/functional_tests/util.py b/functional_tests/util.py
index 6b9a5ccb061b69462689f29182d6a8996bdf2b5f..1333e36aad3e41cdd6269fdaae6dcd09c5c2d192 100644
--- a/functional_tests/util.py
+++ b/functional_tests/util.py
@@ -12,7 +12,7 @@ def create_browser() -> webdriver.Firefox:
     options = Options()
     options.headless = bool(os.environ.get('HEADLESS_TESTS', False))
     browser = webdriver.Firefox(options=options)
-    browser.implicitly_wait(5)
+    browser.implicitly_wait(10)
     return browser