diff --git a/envs/.env.tasking-manager-db.example b/envs/.env.tasking-manager-db.example
new file mode 100644
index 00000000..9176a7d1
--- /dev/null
+++ b/envs/.env.tasking-manager-db.example
@@ -0,0 +1,4 @@
+POSTGRES_DB=tm
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=1234
+POSTGRES_PORT=5432
\ No newline at end of file
diff --git a/envs/.env.tasking-manager.example b/envs/.env.tasking-manager.example
index 902a262c..5887b66e 100644
--- a/envs/.env.tasking-manager.example
+++ b/envs/.env.tasking-manager.example
@@ -37,20 +37,15 @@ POTLATCH2_EDITOR_URL=https://www.openstreetmap.org/edit?editor=potlatch2
 #
 TM_SECRET=xyz
 
-# OpenStreetMap OAuth consumer key and secret (required)
-#
+# OpenStreetMap OAuth 1 consumer key and secret (required)
+
 TM_CONSUMER_KEY=foo
 TM_CONSUMER_SECRET=xyz
 
 TM_DEFAULT_CHANGESET_COMMENT="#{osmseed}-project"
 
 # The connection to the postgres database (required)
-#
-POSTGRES_DB=tm
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=tm
-POSTGRES_ENDPOINT=localhost
-POSTGRES_PORT=5432
+POSTGRES_HOST=tmdb
 
 # The address to use as the sender on auto generated emails (optional)
 #
diff --git a/envs/.env.web.example b/envs/.env.web.example
index 9c720436..e5f6b57f 100644
--- a/envs/.env.web.example
+++ b/envs/.env.web.example
@@ -20,14 +20,22 @@ MAILER_USERNAME=test@gmail.com
 MAILER_PASSWORD=abc...
 MAILER_FROM=no-reply@osmseed.org
 MAILER_PORT=25
+OSM_memcache_servers=""
 
 # Nominatim settings
 NOMINATIM_URL=nominatim-api
 
 # Make sure that the first time this (OPENSTREETMAP_id_key) value is empty. 
-# Once you start you server and create your OAuth 1, fill the value with the Consumer Key.
-OPENSTREETMAP_id_key=""
-OSM_memcache_servers=""
+# Once you start you server and create your OAuth 2.
+### Create OAuth 2 applications
+### Client ID=OPENSTREETMAP_id_key
+OPENSTREETMAP_id_key="xyz..."
+
+### OpenStreetMap Web Site
+# Client ID=OAUTH_CLIENT_ID
+# Client Secret=OAUTH_KEY	
+OAUTH_CLIENT_ID="abc..."
+OAUTH_KEY="efg..."
 
 # NEW_RELIC settings
 # TODO: Needs to be implemented the New Relic functions in order to make running in the web container