diff --git a/README.md b/README.md
index e0534d746d1aa9e7b26212ebdbf9b03e836c77e4..b178b6350e253b30d3ed40bca5ea755c006a291e 100644
--- a/README.md
+++ b/README.md
@@ -58,16 +58,16 @@ docker-compose ps
 docker-compose logs -f 
 
 # follow the logs of specified services only
-docker-compose logs -f gateway infohub
+docker-compose logs -f policy task
 
 # restart a service
-docker-compose restart gateway
+docker-compose restart policy
 
 # restart a service and reload its environment variables
-docker-compose up -d gateway
+docker-compose up -d policy
 
 # rebuild the docker image of a service
-docker-compose build gateway
+docker-compose build task
 ```
 
 ## 3rd Party Services
diff --git a/docker-compose.yml b/docker-compose.yml
index 8b0fbbd0783336e4eb316a4ddd6de7d5fab96e95..46ba6365aecca2020356ade5dfb0b7230827750c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,6 +26,8 @@ services:
       - ./env/task.env
     ports:
       - "8082:8080"
+    depends_on:
+      - mongo
 
   cache:
     container_name: cache
@@ -66,7 +68,6 @@ services:
     container_name: mongo
     image: mongo:3.6
     environment:
-      MONGO_INITDB_DATABASE: policy
       MONGO_INITDB_ROOT_USERNAME: root
       MONGO_INITDB_ROOT_PASSWORD: root
     ports:
diff --git a/env/task.env b/env/task.env
index fa0b76299e2cce03e604c36e4ec45899e41d3714..71709520e7db1a39ce746c38fb77282396e6e50e 100644
--- a/env/task.env
+++ b/env/task.env
@@ -2,4 +2,7 @@ HTTP_HOST=""
 HTTP_PORT="8080"
 HTTP_IDLE_TIMEOUT="120s"
 HTTP_READ_TIMEOUT="10s"
-HTTP_WRITE_TIMEOUT="10s"
\ No newline at end of file
+HTTP_WRITE_TIMEOUT="10s"
+MONGO_ADDR="mongodb://mongo:27017/task?authSource=admin"
+MONGO_USER="root"
+MONGO_PASS="root"
diff --git a/mongo/docker-entrypoint-initdb.d/mongo-init.js b/mongo/docker-entrypoint-initdb.d/mongo-init.js
index 78642cf320b0d4441e4bc86b76b38a56625ae2cb..0de038aa97b453da4f206755760ae982a81946a3 100644
--- a/mongo/docker-entrypoint-initdb.d/mongo-init.js
+++ b/mongo/docker-entrypoint-initdb.d/mongo-init.js
@@ -1,4 +1,4 @@
-b = db.getSiblingDB('policy');
+db = db.getSiblingDB('policy');
 db.createCollection('policies');
 db.policies.insertMany(
     [
@@ -17,3 +17,19 @@ db.policies.insertMany(
         },
     ]
 );
+
+db = db.getSiblingDB('task');
+db.createCollection('taskTemplates');
+db.taskTemplates.insertMany(
+    [
+        {
+            "name":"didResolve",
+            "url":"{{didResolveURL}}",
+            "method":"POST",
+            "requestPolicy":"",
+            "responsePolicy":"",
+            "finalPolicy":"",
+            "cacheKey":"didResolve",
+        },
+    ]
+);
diff --git a/setup.sh b/setup.sh
index 8b634807ec138c8f509433e443b13666fc2eb4c4..7a32f33eeb19cd28cd2a4dfe6adc9f80d872c72d 100755
--- a/setup.sh
+++ b/setup.sh
@@ -38,6 +38,7 @@ function getServices() {
   mkdir -p "${GAIAX_TSA_DIR}" && cd "$_"
 
   local services=(
+    "cache"
     "policy"
     "task"
   )