diff --git a/concordia-postgres/00_concordia_db.sql b/concordia-postgres/00_concordia_db.sql
new file mode 100644
index 0000000..aaf3bf4
--- /dev/null
+++ b/concordia-postgres/00_concordia_db.sql
@@ -0,0 +1,55 @@
+DROP TABLE IF EXISTS tm;
+CREATE TABLE tm (
+    id SERIAL PRIMARY KEY,
+    source_lang_id integer,
+    target_lang_id integer,
+    name varchar(40),
+    lemmatized bool DEFAULT false
+);
+
+DROP TABLE IF EXISTS request;
+CREATE TABLE request (
+    id SERIAL PRIMARY KEY,
+    source_file_path varchar(100),
+    target_file_path varchar(100),
+    source_lang_id integer,
+    target_lang_id integer,
+    name varchar(40),
+    status integer,
+    type integer,
+    tm_id integer,
+    created timestamp default now()
+);
+
+
+DROP TABLE IF EXISTS language;
+CREATE TABLE language (
+    id SERIAL PRIMARY KEY,
+    code varchar(10),
+    name varchar(30)
+);
+
+DROP TABLE IF EXISTS unit;
+CREATE TABLE unit (
+    id SERIAL PRIMARY KEY,
+    tm_id integer,
+    source_id integer,
+    source_segment text,
+    target_segment text,
+    source_tokens integer[],
+    target_tokens integer[],
+    alignments text
+);
+
+CREATE INDEX ON unit(tm_id);
+CREATE INDEX ON unit(source_id);
+
+DROP TABLE IF EXISTS source;
+CREATE TABLE source (
+    id SERIAL PRIMARY KEY,
+    external_id integer,
+    name text,
+    link text
+);
+
+CREATE INDEX ON source(external_id);
diff --git a/concordia-postgres/01_lang.sql b/concordia-postgres/01_lang.sql
new file mode 100644
index 0000000..c0baa81
--- /dev/null
+++ b/concordia-postgres/01_lang.sql
@@ -0,0 +1,6 @@
+INSERT INTO language(code, name) VALUES ('pl', 'Polish');
+INSERT INTO language(code, name) VALUES ('en', 'English');
+INSERT INTO language(code, name) VALUES ('de', 'German');
+INSERT INTO language(code, name) VALUES ('es', 'Spanish');
+INSERT INTO language(code, name) VALUES ('it', 'Italian');
+INSERT INTO language(code, name) VALUES ('hr', 'Croatian');
diff --git a/concordia-postgres/Dockerfile b/concordia-postgres/Dockerfile
new file mode 100644
index 0000000..6741987
--- /dev/null
+++ b/concordia-postgres/Dockerfile
@@ -0,0 +1,8 @@
+FROM library/postgres
+
+ENV POSTGRES_USER concordia
+ENV POSTGRES_PASSWORD concordia
+ENV POSTGRES_DB concordia_db
+
+COPY 00_concordia_db.sql /docker-entrypoint-initdb.d/
+COPY 01_lang.sql /docker-entrypoint-initdb.d/
\ No newline at end of file
diff --git a/concordia-server/Dockerfile b/concordia-server/Dockerfile
index 72acd2a..6894d87 100644
--- a/concordia-server/Dockerfile
+++ b/concordia-server/Dockerfile
@@ -10,6 +10,5 @@ RUN cd concordia-server && mkdir build && cd build && ../cmake.sh && make
 COPY fcgi_concordia /etc/nginx/sites-available
 RUN rm /etc/nginx/sites-enabled/default
 RUN ln -s /etc/nginx/sites-available/fcgi_concordia /etc/nginx/sites-enabled/fcgi_concordia
-RUN /usr/sbin/nginx -g "daemon on;"
 
-#CMD concordia-server/scripts/start.sh
\ No newline at end of file
+CMD /usr/sbin/nginx -g "daemon on;" && sleep 4 && concordia-server/scripts/simplestart.sh
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 816dbae..d2ea4c6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,22 +3,15 @@ version: '3.1'
 services:
 
   concordia-postgres:
-    image: postgres
+    build: ./concordia-postgres
     container_name: concordia-postgres
     restart: always
-    ports:
-      - "10001:5432"
-    environment:
-      POSTGRES_USER: webuser
-      POSTGRES_PASSWORD: webpassword
-      POSTGRES_DB: backend_db
-  concordia-server:
-    build: ./concordia-server
-    container_name: concordia-server
-    ports:
-      - "10002:80"
-
   lemmagen:
     build: ./lemmagen
     container_name: lemmagen
     restart: always
+  concordia-server:
+    build: ./concordia-server
+    container_name: concordia-server
+    ports:
+      - "10001:80"
diff --git a/getContainerBash.sh b/getContainerBash.sh
new file mode 100755
index 0000000..0e76a4c
--- /dev/null
+++ b/getContainerBash.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+sudo docker start $1
+sudo docker exec -it $1 /bin/bash
\ No newline at end of file