diff --git a/DOCUMENTATION/_settings/content/documentation/index.md b/DOCUMENTATION/_settings/content/documentation/index.md
index 7d4addc9..a62d2e8e 100644
--- a/DOCUMENTATION/_settings/content/documentation/index.md
+++ b/DOCUMENTATION/_settings/content/documentation/index.md
@@ -706,6 +706,23 @@ docker-compose up -d mariadb phpmyadmin
 
 
 
+<br>
+<a name="Use-Adminer"></a>
+## Use Adminer
+
+1 - Run the Adminer Container (`adminer`) with the `docker-compose up` command. Example:
+
+```bash
+docker-compose up -d adminer  
+```
+
+2 - Open your browser and visit the localhost on port **8080**:  `http://localhost:8080`
+
+
+
+
+
+
 <br>
 <a name="Use-pgAdmin"></a>
 ## Use PgAdmin
diff --git a/DOCUMENTATION/_settings/content/getting-started/index.md b/DOCUMENTATION/_settings/content/getting-started/index.md
index b0d3fc29..4beac5d0 100644
--- a/DOCUMENTATION/_settings/content/getting-started/index.md
+++ b/DOCUMENTATION/_settings/content/getting-started/index.md
@@ -168,7 +168,7 @@ docker-compose up -d nginx mysql
 
 You can select your own combination of containers form the list below:
 
-> `nginx`, `hhvm`, `php-fpm`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `apache2`, `caddy`, `memcached`, `beanstalkd`, `beanstalkd-console`, `rabbitmq`, `beanstalkd-console`, `workspace`, `phpmyadmin`, `aerospike`, `pgadmin`, `elasticsearch`, `rethinkdb`, `postgres-postgis`, `certbot`, `mailhog`, `minio` and more...!
+> `nginx`, `hhvm`, `php-fpm`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `apache2`, `caddy`, `memcached`, `beanstalkd`, `beanstalkd-console`, `rabbitmq`, `beanstalkd-console`, `workspace`, `phpmyadmin`, `adminer`, `aerospike`, `pgadmin`, `elasticsearch`, `rethinkdb`, `postgres-postgis`, `certbot`, `mailhog`, `minio` and more...!
 
 *(Please note that sometimes we forget to update the docs, so check the `docker-compose.yml` file to see an updated list of all available containers).*
 
diff --git a/DOCUMENTATION/_settings/content/introduction/index.md b/DOCUMENTATION/_settings/content/introduction/index.md
index 44ae7a70..904ed152 100644
--- a/DOCUMENTATION/_settings/content/introduction/index.md
+++ b/DOCUMENTATION/_settings/content/introduction/index.md
@@ -169,6 +169,7 @@ What's better than a **Demo Video**:
 	- RabbitMQ Console
 - **Tools:**
 	- PhpMyAdmin
+  - Adminer
 	- PgAdmin
 	- ElasticSearch
 	- Selenium
diff --git a/adminer/Dockerfile b/adminer/Dockerfile
new file mode 100644
index 00000000..058170cc
--- /dev/null
+++ b/adminer/Dockerfile
@@ -0,0 +1,9 @@
+FROM adminer:latest
+
+MAINTAINER Patrick Artounian <partounian@gmail.com>
+
+# Add volume for sessions to allow session persistence
+VOLUME /sessions
+
+# We expose Adminer on port 8080 (Adminer's default)
+EXPOSE 8080
diff --git a/docker-compose.yml b/docker-compose.yml
index 57b0cf51..5954433b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -339,6 +339,15 @@ services:
       depends_on:
         - "${PMA_DB_ENGINE}"
 
+### Adminer Container ####################################
+
+    adminer:
+      build: ./adminer
+      ports:
+        - "${ADM_PORT}:8080"
+      depends_on:
+        - php-fpm
+
 ### pgAdmin Container #######################################
 
     pgadmin:
@@ -415,6 +424,8 @@ volumes:
     driver: "local"
   phpmyadmin:
     driver: "local"
+  adminer:
+    driver: "local"
   aerospike:
     driver: "local"
   caddy:
diff --git a/env-example b/env-example
index e1d1efa1..d773a6b3 100644
--- a/env-example
+++ b/env-example
@@ -122,6 +122,9 @@ PMA_PASSWORD=secret
 PMA_ROOT_PASSWORD=secret
 PMA_PORT=88
 
+### Adminer Container
+ADM_PORT=88
+
 ### MISC
 # Replace with your Docker Host IP (will be appended to /etc/hosts)
 DOCKER_HOST_IP=10.0.75.1