diff --git a/README.md b/README.md
index c8a782a580835d476f7a4d77f043bdf1a7c0e86f..88bd3d626afb38b5b582461358092775bf25c92f 100644
--- a/README.md
+++ b/README.md
@@ -31,12 +31,6 @@ with environment variables which will be injected in its container.
   ./setup.sh
   ```
 * set the services you would like to use in the docker-compose.yml file, defaults is **infohub**
-* set needed environment variables in an `.env` file and add the file path in `export-env.sh` script
-
-* export environment variables:
-  ```
-  . ./export-env.sh
-  ```
 
 * run docker compose:
   ```
diff --git a/docker-compose.yml b/docker-compose.yml
index 5414bbb25f2bfbc1302c3d831db626b21b970fed..519936e55ad1e98691b1eeac1178378d6ca1075f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,18 @@
 version: '3.4'
 
 services:
+  infohub:
+    container_name: infohub
+    build:
+      context: $GOPATH/src/code.vereign.com/gaiax/tsa/infohub
+      dockerfile: deployment/compose/Dockerfile
+    volumes:
+      - "$GOPATH/src/code.vereign.com/gaiax/tsa/infohub:/go/src/code.vereign.com/gaiax/tsa/infohub"
+    env_file:
+      ./env/infohub.env
+    ports:
+      - "8080:8080"
+
   redis:
     image: "redis:alpine"
     container_name: redis
@@ -19,11 +31,8 @@ services:
 
   driver-did-sov:
     image: universalresolver/driver-did-sov:latest
-    environment:
-      uniresolver_driver_did_sov_libIndyPath: ${uniresolver_driver_did_sov_libIndyPath}
-      uniresolver_driver_did_sov_poolConfigs: ${uniresolver_driver_did_sov_poolConfigs}
-      uniresolver_driver_did_sov_poolVersions: ${uniresolver_driver_did_sov_poolVersions}
-      uniresolver_driver_did_sov_walletName: ${uniresolver_driver_did_sov_walletName}
+    env_file:
+      ./env/resolver.env
     ports:
       - "9092:8080"
 
diff --git a/env/infohub.env b/env/infohub.env
new file mode 100644
index 0000000000000000000000000000000000000000..47b333d6b77e4ec50ecf86a1591ed7cc1d9cc1d8
--- /dev/null
+++ b/env/infohub.env
@@ -0,0 +1,7 @@
+HTTP_HOST=""
+HTTP_PORT="8080"
+HTTP_IDLE_TIMEOUT="60s"
+HTTP_READ_TIMEOUT="10s"
+HTTP_WRITE_TIMEOUT="10s"
+HTTP_MAX_REQUEST_SIZE="1000000"
+REDIS_HOST="redis"
\ No newline at end of file
diff --git a/export-env.sh b/export-env.sh
deleted file mode 100755
index d1d5aec564af28154de8cbf0846674a2b4ef4d23..0000000000000000000000000000000000000000
--- a/export-env.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-## Usage:
-##   . ./export-env.sh
-
-envFiles=(
-  "env/resolver.env"
-)
-
-unamestr=$(uname)
-for f in ${envFiles[@]}; do
-  echo "Exporting $f ..."
-  if [ "$unamestr" = 'Linux' ]; then
-
-    export $(grep -v '^#' $f | xargs -d '\n')
-
-  elif [ "$unamestr" = 'FreeBSD' ] || [ "$unamestr" = 'Darwin' ]; then
-
-    export $(grep -v '^#' $f | xargs -0)
-
-  fi
-done
-
-echo "Done"
-