diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1820b80f2d5c91faae3f0b63a158a3a87791dd3a..978f37bb87dd6b3cadd22d16dd95e0ad3c1908ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,6 +32,11 @@ e2e-testing:
     - docker-compose build --no-cache
     - docker-compose up -d
   after_script:
-    - sleep 120
+    - sleep 8
+    - echo "create database ehasa;" | docker exec -i postgis psql -U postgres
+    - echo "create user ehasa;" | docker exec -i postgis psql -U postgres
+    - echo "alter user ehasa with encrypted password 'salasana';" | docker exec -i postgis psql -U postgres
+    - echo "grant all privileges on database ehasa to ehasa;" | docker exec -i postgis psql -U postgres
+    - echo 'create extension "uuid-ossp";' | docker exec -i postgis psql -U postgres ehasa
   allow_failure: true
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 6d24891480045dad07ea95425c5981af8928fa16..f64dd18c7358bda9ee5b8b5bf21c7a63138b07dd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,5 @@ services:
   postgres:
     image: mdillon/postgis
     container_name: postgis
-    volumes:
-      - ./docker:/docker-entrypoint-initdb.d
     ports:
       - 5432:5432
\ No newline at end of file