diff --git a/.gitignore b/.gitignore
index fe0fe574b8536598528a1f7d46becfb814892327..9db3cfb0b35c9ac31228ab865721650dd0e9512f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,5 @@ lerna-debug.log*
 !.vscode/extensions.json
 
 # db connection
-ormconfig.json
 .env
 *.providers.ts
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..5f123fab424fb63c32caa4f033b34983c4002810
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,21 @@
+stages:
+  - e2e-test
+
+e2e-testing:
+  image:
+    name: docker/compose:1.24.0
+    entrypoint: ['/bin/sh', '-c']
+  services:
+    - docker:dind
+  stage: e2e-test
+  tags: ['compose']
+  only:
+    - testing
+  before_script:
+    - echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USER" --password-stdin
+  script:
+    - docker image prune -f
+    - docker-compose build --no-cache
+    - docker-compose up -d
+  after_script:
+    - docker logout
diff --git a/docker-compose.yml b/docker-compose.yml
index 7ac4913cbab54c870edd0ab853747d763eb56edd..fd068d537d3df70036b4eb58a1718df55cb3263b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,16 +1,14 @@
-version: "3"
+version: '3'
 services:
   ehasa-frontend:
-    image: "ehasa/frontend"
+    image: overflow2019/frontend:test
     ports:
-      - 8080:80
+      - 80:80
   ehasa-backend:
-    image: "ehasa/backend"
+    build: .
     ports:
-      - 5000:5000
+      - 8080:5000
   postgres:
     image: mdillon/postgis
     volumes:
-      - /home/postgres:/var/lib/postgresql/data
-    ports:
-      - 5432:5432
\ No newline at end of file
+      - ./docker:/docker-entrypoint-initdb.d/
\ No newline at end of file
diff --git a/ormconfig.json b/ormconfig.json
new file mode 100644
index 0000000000000000000000000000000000000000..372f7a449f827dc0898ff15020c56d34d37f3714
--- /dev/null
+++ b/ormconfig.json
@@ -0,0 +1,13 @@
+
+{
+    "type": "postgres",
+    "host": "localhost", 
+    "port": 5432,
+    "username": "ehasa",
+    "password": "salasana",
+    "database": "ehasa",
+    "entities": ["src/**/*.entity{.ts,.js}"],
+    "synchronize": true,
+    "logging": true,
+    "dropSchema": false
+  }
\ No newline at end of file