diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 449c565ac6ad35ed34e1feca4eb819110ed5327c..5556f45e36ca4157faad9d2ff3e3d304ed9c2b16 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,17 +4,15 @@ services:
   - name: $CI_REGISTRY/dynamicexposure/server-components/containers/docker-obm-database:master
     alias: postgres
 
-# Make pip cache the installed dependencies
 variables:
-  PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
   POSTGRES_DB: testdatabase
   POSTGRES_USER: tester
   POSTGRES_PASSWORD: somepass
-  GDEIMPORTER_DB_HOST: postgres
-  GDEIMPORTER_DB: ${POSTGRES_DB}
-  GDEIMPORTER_USER: ${POSTGRES_USER}
-  GDEIMPORTER_PASSWORD: ${POSTGRES_PASSWORD}
-  GDEIMPORTER_SOURCEID: 1
+  GDECORE_DB_HOST: postgres
+  GDECORE_DB: ${POSTGRES_DB}
+  GDECORE_USER: ${POSTGRES_USER}
+  GDECORE_PASSWORD: ${POSTGRES_PASSWORD}
+  GDECORE_SOURCEID: 1
 
 cache:
   paths:
diff --git a/gdecore/configuration.py b/gdecore/configuration.py
index ff697759064987f354af27c53e17f914e8a993ec..80e33fcc90da87fa75d87d712ae20a08802b1254 100644
--- a/gdecore/configuration.py
+++ b/gdecore/configuration.py
@@ -125,13 +125,18 @@ class Configuration:
         self.model_name = ConfigurationMethods.assign_parameter(config, "model_name")
 
         self.database_gde_tiles = ConfigurationMethods.retrieve_database_credentials(
-            config, "database_gde_tiles", "test_db_gde_tiles.env", force_config_over_hierarchies
+            config,
+            "database_gde_tiles",
+            "test_db_gde_tiles.env",
+            "GDECORE",
+            force_config_over_hierarchies,
         )
 
         self.database_obm_buildings = ConfigurationMethods.retrieve_database_credentials(
             config,
             "database_obm_buildings",
             "test_db_obm_buildings.env",
+            "GDECORE",
             force_config_over_hierarchies,
         )
 
@@ -139,6 +144,7 @@ class Configuration:
             config,
             "database_completeness",
             "test_db_completeness.env",
+            "GDECORE",
             force_config_over_hierarchies,
         )
 
diff --git a/tests/conftest.py b/tests/conftest.py
index a6db227d9eaf28b8b69ea6863e1bb7f73eb54df6..51a0b07f3763d7c0024a48f69daa506b3f152f49 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -40,13 +40,13 @@ def test_db():
 def init_test_db():
     """Populates the test database."""
 
-    if "GDEIMPORTER_DB_HOST" in os.environ:  # When running the CI pipeline
+    if "GDECORE_DB_HOST" in os.environ:  # When running the CI pipeline
         db_built_up_config = {
-            "host": os.environ.get("GDEIMPORTER_DB_HOST"),
-            "dbname": os.environ.get("GDEIMPORTER_DB"),
+            "host": os.environ.get("GDECORE_DB_HOST"),
+            "dbname": os.environ.get("GDECORE_DB"),
             "port": "",
-            "username": os.environ.get("GDEIMPORTER_USER"),
-            "password": os.environ.get("GDEIMPORTER_PASSWORD"),
+            "username": os.environ.get("GDECORE_USER"),
+            "password": os.environ.get("GDECORE_PASSWORD"),
         }
 
         # Create Database instance and establish the connection and cursor