diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c687089811b968e878ad532e9bd40596913f38f2..95a3a826e954b7a2aeebd548adb5f9e94abcd497 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,6 +59,7 @@ tests:
   stage: test
   image: $TEST_IMAGE
   services:
+    - postgres:latest
       # this will cause a warning, as the gitlab ci runner health check will test the wrong
       # port on rabbitmq container:
       # https://gitlab.com/gitlab-org/gitlab-runner/issues/3163
@@ -69,6 +70,9 @@ tests:
       # https://gitlab.com/gitlab-org/gitlab-ce/issues/42214
       command: [ "bin/elasticsearch", "-Ediscovery.type=single-node" ]
   variables:
+    POSTGRES_DB: nomad
+    POSTGRES_USER: postgres
+    POSTGRES_PASSWORD: nomad
     RABBITMQ_ERLANG_COOKIE: SWQOKODSQALRPCLNMEQG
     RABBITMQ_DEFAULT_USER: rabbitmq
     RABBITMQ_DEFAULT_PASS: rabbitmq
diff --git a/nomad/dependencies.py b/nomad/dependencies.py
index f910cfceb092a1dbdc18a8fafc85ae7064e36024..fb2a7fc92711d5207187d89a546cbcf944af6d3f 100644
--- a/nomad/dependencies.py
+++ b/nomad/dependencies.py
@@ -45,7 +45,6 @@ import logging
 import subprocess
 import shutil
 
-_meta_info_path = './submodules/nomad-meta-info/meta_info/nomad_meta_info/'
 _logger = logging.getLogger(__name__)
 base_dir = './.dependencies'
 
@@ -133,6 +132,8 @@ class PythonGit():
                 new_branch = git.create_head(self.git_branch)
                 git.head.reference = new_branch
 
+            git.submodule_update(init=True)
+
             if os.path.exists('requirements.txt'):
                 _logger.info('install requirements.txt for %s' % self.name)
                 self._run_pip_install('-r', 'requirements.txt')
@@ -164,6 +165,10 @@ dependencies = [
     #     git_url='https://gitlab.mpcdf.mpg.de/NoMaD/NomadRepositoryParser.git',
     #     git_branch='v2.1'
     # ),
+    PythonGit(
+        name='nomad-lab-base',
+        git_url='https://gitlab.mpcdf.mpg.de/nomad-lab/nomad-lab-base.git',
+        git_branch='nomad-FAIR'),
     PythonGit(
         name='nomad-meta-info',
         git_url='https://gitlab.mpcdf.mpg.de/nomad-lab/nomad-meta-info.git',
diff --git a/repository/utils.http b/repository/utils.http
index 2e413034939d8791310318dd44cd342726cf58cb..6a03f9d937cb3448c632543eb925e91efeb21e82 100644
--- a/repository/utils.http
+++ b/repository/utils.http
@@ -20,7 +20,7 @@ content-type: application/json
 
 
 ###
-POST http://localhost:8000/nomad/api/uploads/9SRMChG9SZCyqBeigPM2Hg HTTP/1.1;
+POST http://localhost:8000/nomad/api/uploads/C9PUSYFvSceP7EneqR9hrA HTTP/1.1;
 content-type: application/json
 Authorization: Basic bGVvbmFyZC5ob2ZzdGFkdGVyQG5vbWFkLWZhaXJkaS50ZXN0cy5kZTpub21hZA==