diff --git a/.env.dist b/.env.dist
index b9c9f8f..4233442 100644
--- a/.env.dist
+++ b/.env.dist
@@ -20,3 +20,9 @@ RABBITMQ_UI_PORT=8038
 
 REDIS_PORT=6379
 REDISINSIGHT_PORT=8032
+
+POSTGRES_PORT=5432
+POSTGRES_PASSWORD=opencodeco
+PGADMIN_PORT=8034
+PGADMIN_EMAIL="opencodeco@domain.com"
+PGADMIN_PASSWORD="opencodeco"
diff --git a/README.md b/README.md
index 102ed9a..cadfadc 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@
 | `stack mysql`| MySQL & phpMyAdmin (http://localhost:8031) |
 | `stack redis` | Redis & RedisInsight (http://localhost:8032) |
 | `stack mongo` | MongoDB & Mongo Express (http://localhost:8033) |
+| `stack postgres` | PostgreSQL & pgAdmin (http://localhost:8034) |
 | `stack kafka` | Kafka and UI for Apache Kafka (http://localhost:8037) |
 | `stack rabbitmq` | RabbitMQ & Management Plugin (http://localhost:8038) |
 | `stack aws` | AWS services via LocalStack (http://localhost:4566) |
diff --git a/postgres/docker-compose.yml b/postgres/docker-compose.yml
new file mode 100644
index 0000000..6594ea8
--- /dev/null
+++ b/postgres/docker-compose.yml
@@ -0,0 +1,32 @@
+version: '3'
+services:
+  opencodeco-postgres:
+    container_name: opencodeco-postgres
+    image: postgres:latest
+    restart: always
+    ports:
+      - ${POSTGRES_PORT}:5432
+    environment:
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+    volumes:
+      - opencodeco-postgres:/var/lib/postgresql/data
+
+  opencodeco-pgadmin:
+    container_name: opencodeco-pgadmin
+    image: dpage/pgadmin4:latest
+    ports:
+      - ${PGADMIN_PORT}:80
+    environment:
+      - PGADMIN_DEFAULT_EMAIL=${PGADMIN_EMAIL}
+      - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_PASSWORD}
+    depends_on:
+      - opencodeco-postgres
+
+networks:
+  default:
+    name: opencodeco
+    external: true
+
+volumes:
+  opencodeco-postgres:
+    name: opencodeco-postgres
diff --git a/stack b/stack
index 2f01366..32e167d 100755
--- a/stack
+++ b/stack
@@ -16,6 +16,7 @@ if [ $# -eq 0 ] || [ "help" = "${1}" ]; then
     echo ""
     echo "Components:"
     echo "  mysql    MySQL & phpMyAdmin            (http://localhost:${PHPMYADMIN_PORT})"
+    echo "  postgres PostgreSQL & pgAdmin          (http://localhost:${PGADMIN_PORT})"
     echo "  redis    Redis & RedisInsight          (http://localhost:${REDISINSIGHT_PORT})"
     echo "  mongo    MongoDB & Mongo Express       (http://localhost:${MONGO_EXPRESS_PORT})"
     echo "  kafka    Kafka and UI for Apache Kafka (http://localhost:${KAFKA_UI_PORT})"