diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..a58c5dc8
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+.git
+.cache
+.dot
+**/doc
\ No newline at end of file
diff --git a/apps/.dockerignore b/apps/.dockerignore
new file mode 100644
index 00000000..a58c5dc8
--- /dev/null
+++ b/apps/.dockerignore
@@ -0,0 +1,4 @@
+.git
+.cache
+.dot
+**/doc
\ No newline at end of file
diff --git a/apps/cic-eth b/apps/cic-eth
index 421831f2..a8de41d1 160000
--- a/apps/cic-eth
+++ b/apps/cic-eth
@@ -1 +1 @@
-Subproject commit 421831f26e55bd9eb25bc6c306bd4284e90f30f8
+Subproject commit a8de41d182a5ba22248f2c72d716c8b84c110e93
diff --git a/requirements.txt b/apps/requirements.txt
similarity index 100%
rename from requirements.txt
rename to apps/requirements.txt
diff --git a/docker-compose.yml b/docker-compose.yml
index 8d360b86..5ba19098 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -121,8 +121,8 @@ services:
   cic-eth-tasker:
     # image: grassrootseconomics:cic-eth-service
     build: 
-        context: apps/cic-eth/
-        dockerfile: docker/Dockerfile
+        context: apps/
+        dockerfile: cic-eth/docker/Dockerfiles
     environment:
       CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS
       ETH_PROVIDER: ${ETH_PROVIDER:-http://eth:8545}