diff --git a/ambari/README.md b/ambari/README.md
index 0b0eaec..8659e79 100644
--- a/ambari/README.md
+++ b/ambari/README.md
@@ -6,46 +6,36 @@ developing software for provisioning, managing, and monitoring Apache Hadoop
 clusters. Ambari provides an intuitive, easy-to-use Hadoop management web UI
 backed by its RESTful APIs.
 
-## docker-compose.yml
-
-```yaml
-ambari:
-  image: vimagick/ambari
-  hostname: ambari-server
-  ports:
-    - "8080:8080"
-  volumes:
-    - ./data/ambari:/etc/ambari-server/conf
-  links:
-    - postgres
-  extra_hosts:
-    - ambari-agent1:172.16.1.101
-    - ambari-agent2:172.16.1.102
-    - ambari-agent3:172.16.1.103
-  restart: unless-stopped
-
-postgres:
-  image: postgres:alpine
-  volumes:
-    - /data/postgres:/var/lib/postgresql/data
-  environment:
-    - POSTGRES_USER=ambari
-    - POSTGRES_PASSWORD=ambari
-    - POSTGRES_DB=ambari
-  restart: unless-stopped
-```
-
-> Make sure that ambari-server is reachable by ambari-agents.
+Make sure that ambari-server is reachable by ambari-agents.
 
 ## Up and Running
 
 ```bash
 $ docker-compose up -d
+
 $ docker-compose exec ambari bash
 >>> ambari-server setup
+Customize user account for ambari-server daemon [y/n] (n)?
+Do you want to change Oracle JDK [y/n] (n)?
+Enter advanced database configuration [y/n] (n)? y
+Enter choice (4):
+Hostname (postgres):
+Port (5432):
+Database name (ambari):
+Postgres schema (public):
+Username (ambari):
+Enter Database Password (ambari):
+Proceed with configuring remote database connection properties [y/n] (y)?
 >>> PGUSER=ambari PGPASSWORD=ambari psql -h postgres -d ambari -f /var/lib/ambari-server/resources/Ambari-DDL-Postgres-CREATE.sql
->>> ambari-server start
-$ curl localhost:8080
+CREATE TABLE ...
+CREATE INDEX ...
+
+$ docker-compose exec ambari ambari-server start
+Waiting for server start........................
+Server started listening on 8080
+Ambari Server 'start' completed successfully.
+
+$ curl http://localhost:8080
 ```
 
 [1]: https://ambari.apache.org/
diff --git a/ambari/docker-compose.yml b/ambari/docker-compose.yml
index 2ae7ab7..0a908ba 100644
--- a/ambari/docker-compose.yml
+++ b/ambari/docker-compose.yml
@@ -1,25 +1,28 @@
-ambari:
-  image: vimagick/ambari
-  hostname: ambari-server
-  ports:
-    - "8080:8080"
-  volumes:
-    - ./data/ssh:/root/.ssh
-    - ./data/ambari:/etc/ambari-server/conf
-  links:
-    - postgres
-  extra_hosts:
-    - ambari-agent1:172.16.1.101
-    - ambari-agent2:172.16.1.102
-    - ambari-agent3:172.16.1.103
-  restart: unless-stopped
+version: "3.7"
 
-postgres:
-  image: postgres:alpine
-  volumes:
-    - /data/postgres:/var/lib/postgresql/data
-  environment:
-    - POSTGRES_USER=ambari
-    - POSTGRES_PASSWORD=ambari
-    - POSTGRES_DB=ambari
-  restart: unless-stopped
+services:
+
+  ambari:
+    image: vimagick/ambari
+    hostname: ambari-server
+    ports:
+      - "8080:8080"
+    volumes:
+      - ./data/ambari:/etc/ambari-server/conf
+    extra_hosts:
+      - ambari-agent1:172.16.1.101
+      - ambari-agent2:172.16.1.102
+      - ambari-agent3:172.16.1.103
+    depends_on:
+      - postgres
+    restart: unless-stopped
+
+  postgres:
+    image: postgres:alpine
+    volumes:
+      - ./data/postgres:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=ambari
+      - POSTGRES_PASSWORD=ambari
+      - POSTGRES_DB=ambari
+    restart: unless-stopped