diff --git a/env.template b/env.template
index e6e9807..9a906bb 100644
--- a/env.template
+++ b/env.template
@@ -2,23 +2,23 @@
 COMPOSE_PROJECT_NAME=pipeline
 
 # postgrest and postgresql: required environment variables for 'gamma', prod and 'local'
-POSTGRES_USER=root
-POSTGRES_PASSWORD=supercoolpassword
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
 POSTGRES_DB=data
-POSTGRES_TABLE=couchdb # for dbt use only
 POSTGRES_SCHEMA=v1
+POSTGRES_TABLE=medic # for dbt use only
 
 # dbt: required environment variables for 'gamma', 'prod' and 'local'
-DBT_POSTGRES_USER=dbt_user
-DBT_POSTGRES_PASSWORD=supercoolpassword
+DBT_POSTGRES_USER=postgres
+DBT_POSTGRES_PASSWORD=postgres
 DBT_POSTGRES_SCHEMA=dbt
 DBT_POSTGRES_HOST=postgres # Your postgres instance IP or endpoint in "prod".
 CHT_PIPELINE_BRANCH_URL="https://github.com/medic/cht-pipeline.git#main"
 
 # couchdb and logstash: required environment variables for 'gamma', 'prod' and 'local'
-COUCHDB_USER=test
-COUCHDB_PASSWORD=test
-COUCHDB_DBS="couchdb couchdb_sentinel" # space separated list of databases you want to sync e.g "medic medic_sentinel"
+COUCHDB_USER=medic
+COUCHDB_PASSWORD=password
+COUCHDB_DBS="medic" # space separated list of databases you want to sync e.g "medic medic_sentinel"
 COUCHDB_HOST=couchdb
 COUCHDB_PORT=5984
 COUCHDB_SECURE=false
diff --git a/scripts/config.ts b/scripts/config.ts
index 27adfd3..203bd8d 100644
--- a/scripts/config.ts
+++ b/scripts/config.ts
@@ -1,12 +1,12 @@
 import "dotenv/config"
 import path from "path";
 
-export const COUCHDB_DBS = process.env.COUCHDB_DBS || "couchdb";
+export const COUCHDB_DBS = process.env.COUCHDB_DBS || "medic";
 
 export const POSTGRES = {
-  username: process.env.POSTGRES_USER || 'root',
-  password: process.env.POSTGRES_PASSWORD || 'supercoolpassword',
-  db: process.env.POSTGRES_DB || 'db',
+  username: process.env.POSTGRES_USER || 'postgres',
+  password: process.env.POSTGRES_PASSWORD || 'postgres',
+  db: process.env.POSTGRES_DB || 'data',
   table: process.env.POSTGRES_TABLE,
   schema: process.env.POSTGRES_SCHEMA
 };
diff --git a/tests/e2e-test.spec.ts b/tests/e2e-test.spec.ts
index f7a4dae..7a09a70 100644
--- a/tests/e2e-test.spec.ts
+++ b/tests/e2e-test.spec.ts
@@ -1,6 +1,5 @@
 import { Client } from "ts-postgres";
 import { rootConnect } from "./postgres-utils";
-import request from 'supertest';
 import { POSTGRES, DBT_POSTGRES } from "../scripts/config";
 
 describe("Main workflow Test Suite", () => {
@@ -10,14 +9,18 @@ describe("Main workflow Test Suite", () => {
 
   afterAll(async () => await client.end());
 
-  it("should have data in postgres main tables", async () => {
+  it("should have data in postgres medic table", async () => {
     let couchdbTableResult = await client.query("SELECT * FROM " + POSTGRES.schema + "." + POSTGRES.table);
     expect(couchdbTableResult.rows.length).toBeGreaterThan(0);
+  });
 
-    let dataRecordTableResult = await client.query("SELECT * FROM " + DBT_POSTGRES.schema + ".data_record");
-    expect(dataRecordTableResult.rows.length).toBeGreaterThan(0);
-
+  it("should have data in postgres person table", async () => {
     let personTableResult = await client.query("SELECT * FROM " + DBT_POSTGRES.schema + ".person");
     expect(personTableResult.rows.length).toBeGreaterThan(0);
   });
+
+  it("should have data in postgres data_record table", async () => {
+    let dataRecordTableResult = await client.query("SELECT * FROM " + DBT_POSTGRES.schema + ".data_record");
+    expect(dataRecordTableResult.rows.length).toBeGreaterThan(0);
+  });
 });