diff --git a/docker-compose.yml b/docker-compose.yml
old mode 100644
new mode 100755
index 84e9c13..9d34332
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ services:
 
   # Neo4j service
   neo4j:
-    image: neo4j:enterprise
+    image: neo4j:3.5.14-enterprise
     ports:
       - "7474:7474"
       - "7687:7687"
diff --git a/scripts/docker/neo4j/init.sh b/scripts/docker/neo4j/init.sh
index 73838c8..e9bee53 100755
--- a/scripts/docker/neo4j/init.sh
+++ b/scripts/docker/neo4j/init.sh
@@ -4,4 +4,4 @@
 echo "~~~"
 echo "~ Init database"
 echo "~~~"
-su-exec neo4j bin/cypher-shell -u neo4j -p admin < /source/scripts/docker/neo4j/initdb.gql
+su neo4j -s /bin/bash -c "bin/cypher-shell -u neo4j -p admin < /source/scripts/docker/neo4j/initdb.gql"
diff --git a/scripts/docker/postgres/Dockerfile b/scripts/docker/postgres/Dockerfile
old mode 100644
new mode 100755
index 6d98600..b75424c
--- a/scripts/docker/postgres/Dockerfile
+++ b/scripts/docker/postgres/Dockerfile
@@ -1,4 +1,4 @@
-FROM postgres:10 AS fdwPostgres
+FROM postgres:10.10 AS fdwPostgres
 
 ENV POSTGRES_USER postgres
 ENV POSTGRES_PASSWORD postgres
@@ -10,16 +10,29 @@ COPY . /neo4j-fdw/source
 RUN apt-get update \
       && apt-get install -y --no-install-recommends \
            build-essential \
-           postgresql-server-dev-10 \
            python-dev \
            python-setuptools \
            python-dev \
            python-pip \
-           postgresql-plpython-10 \
            git \
+           libfaketime \
+           wget \
       && rm -rf /var/lib/apt/lists/*
 
-RUN ["chmod", "+x", "/neo4j-fdw/source/scripts/docker/postgres/init.sh"]
-RUN /neo4j-fdw/source/scripts/docker/postgres/init.sh
+RUN cp /neo4j-fdw/source/scripts/faketime.sh /docker-entrypoint-initdb.d/
 
+RUN mkdir /tmp/pgdebs \
+      && wget --quiet -P /tmp/pgdebs \
+              https://atalia.postgresql.org/morgue/p/postgresql-10/postgresql-server-dev-10_10.10-1.pgdg90%2B1_amd64.deb \
+              https://atalia.postgresql.org/morgue/p/postgresql-10/postgresql-plpython-10_10.10-1.pgdg90%2B1_amd64.deb \
+              https://atalia.postgresql.org/morgue/p/postgresql-10/libpq5_10.10-1.pgdg90%2B1_amd64.deb \
+              https://atalia.postgresql.org/morgue/p/postgresql-10/libpq-dev_10.10-1.pgdg90%2B1_amd64.deb \
+      && apt install -y --allow-downgrades \
+              /tmp/pgdebs/postgresql-server-dev-10_10.10-1.pgdg90+1_amd64.deb \
+              /tmp/pgdebs/postgresql-plpython-10_10.10-1.pgdg90+1_amd64.deb \
+              /tmp/pgdebs/libpq5_10.10-1.pgdg90+1_amd64.deb \
+              /tmp/pgdebs/libpq-dev_10.10-1.pgdg90+1_amd64.deb
+RUN rm -r /tmp/pgdebs
 
+RUN ["chmod", "+x", "/neo4j-fdw/source/scripts/docker/postgres/init.sh"]
+RUN /neo4j-fdw/source/scripts/docker/postgres/init.sh
diff --git a/scripts/faketime.sh b/scripts/faketime.sh
new file mode 100644
index 0000000..5d84eea
--- /dev/null
+++ b/scripts/faketime.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1
+export FAKETIME_DONT_RESET=1
+export FAKETIME="@2019-07-14 17:30:00"
+