diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 10e5cc0fa31ddd64d900e032c5c58e8b1d804de2..ceaf3ebf47ce08a49b9afe0fdc562f9b009ade0a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,10 +12,10 @@ purge-old-containers:
     - testing
   script:
     - echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USER" --password-stdin
-    - docker stop back
     - docker stop postgis
-    - docker rm back
     - docker rm postgis
+    - docker stop back
+    - docker rm back
   after_script:
     - docker logout
   allow_failure: true
@@ -29,6 +29,6 @@ e2e-testing:
   only:
     - testing
   script:
+    - docker run --name postgis -p 5432:5432 -d -v docker:/docker-entrypoint-initdb.d/ mdillon/postgis
     - docker build -t backend .
     - docker run --name back -p 8080:5000 -d backend
-    - docker run --name postgis -p 5432:5432 -d -v docker:/docker-entrypoint-initdb.d/ mdillon/postgis
diff --git a/ormconfig.json b/ormconfig.json
index 372f7a449f827dc0898ff15020c56d34d37f3714..3c002cc0435a709727557ae8ac33196c4819bda4 100644
--- a/ormconfig.json
+++ b/ormconfig.json
@@ -1,7 +1,7 @@
 
 {
     "type": "postgres",
-    "host": "localhost", 
+    "host": "postgis", 
     "port": 5432,
     "username": "ehasa",
     "password": "salasana",