diff --git a/.env.example b/.env.example
index 05b7c56e..9e6630fe 100644
--- a/.env.example
+++ b/.env.example
@@ -1,14 +1,13 @@
 # --- App
 ENV_APP_NAME="Gus Blog"
 ENV_APP_ENV_TYPE=local
-ENV_APP_ENV=local
 ENV_APP_LOG_LEVEL=debug
 ENV_APP_LOGS_DIR="./storage/logs/logs_%s.log"
 ENV_APP_LOGS_DATE_FORMAT="2006_02_01"
 
 # --- Auth
-ENV_APP_TOKEN_PUBLIC=""
-ENV_APP_TOKEN_PRIVATE=""
+ENV_APP_TOKEN_PUBLIC="foo"
+ENV_APP_TOKEN_PRIVATE="bar"
 
 # --- DB
 ENV_DB_USER_NAME="gus"
@@ -19,16 +18,6 @@ ENV_DB_HOST=localhost
 ENV_DB_SSL_MODE=require
 ENV_DB_TIMEZONE="Asia/Singapore"
 
-# --- This flag is only needed/used for debugging purposes.
-#     Local posgreSQL instalation directory.
-#     Example: /Library/PostgreSQL/17/bin/
-EN_DB_BIN_DIR=""
-
-# --- This flag is only needed/used for docker purposes.
-#     The full db url value is only used for docker purposes given the application works in the -GORM DSN-
-#     Example: postgresql://gocanto-user:gocanto-password@api-db:5432/oullin_db?sslmode=require
-ENV_DB_URL=""
-
 # --- The logs directory for Caddy to persists its logs.
 CADDY_LOGS_PATH="./storage/logs/caddy"
 
diff --git a/.env.prod.example b/.env.prod.example
index 1f8a8477..95bc4727 100644
--- a/.env.prod.example
+++ b/.env.prod.example
@@ -1,13 +1,38 @@
+# --- App
+ENV_APP_NAME="Gus Blog"
+ENV_APP_ENV_TYPE=production
+ENV_APP_LOG_LEVEL=debug
+ENV_APP_LOGS_DIR="./storage/logs/logs_%s.log"
+ENV_APP_LOGS_DATE_FORMAT="2006_02_01"
+
+# --- Auth
+ENV_APP_TOKEN_PUBLIC=""
+ENV_APP_TOKEN_PRIVATE=""
+
 # --- DB
-ENV_DB_PORT=5432
-ENV_DB_HOST=localhost
-ENV_DB_SSL_MODE=require
-ENV_DB_TIMEZONE="Asia/Singapore"
+ENV_DB_PORT=
+ENV_DB_HOST=
+ENV_DB_SSL_MODE=
+ENV_DB_TIMEZONE=
+DB_VOLUME_DATA_DIRECTORY=./database/infra/data
 
 # --- Database Secrets
 DB_SECRET_USERNAME=./database/infra/secrets/pg_username
 DB_SECRET_PASSWORD=./database/infra/secrets/pg_password
 DB_SECRET_DBNAME=./database/infra/secrets/pg_dbname
 
+
+# --- Sentry
+ENV_SENTRY_DSN=""
+ENV_SENTRY_CSP=""
+
+# --- HTTP
+ENV_HTTP_HOST=
+ENV_HTTP_PORT=
+
+# --- Docker
+ENV_DOCKER_USER=
+ENV_DOCKER_USER_GROUP=
+
 # --- Caddy
-CADDY_LOGS_PATH="/var/log/oullin/caddy"
+CADDY_LOGS_PATH=./storage/logs/caddy
diff --git a/.gitignore b/.gitignore
index 8247a93d..15344de3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@
 .env.production
 tmp
 
+database/infra/data
+
 # --- [API]: Storage
 storage/logs/*.*
 storage/media/*.*
diff --git a/config/makefile/env.mk b/config/makefile/env.mk
index 6d5cf69e..2d5e0cb1 100644
--- a/config/makefile/env.mk
+++ b/config/makefile/env.mk
@@ -33,7 +33,6 @@ env\:fresh:
 env\:print:
 	@echo "APP NAME ........ : $(ENV_APP_NAME)		"
 	@echo "APP TYPE ........ : $(ENV_APP_ENV_TYPE)	"
-	@echo "APP ENV ......... : $(ENV_APP_ENV)		"
 	@echo "ROOT_NETWORK .... : $(ROOT_NETWORK)      "
 	@echo " --------------------------------------- "
 	@echo "DB_MIGRATE_PATH . : $(DB_MIGRATE_PATH)	"