diff --git a/docker-compose.yml b/docker-compose.yml
index c58a44f9..dd342675 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -45,7 +45,7 @@ services:
       context: apps/contract-migration
       dockerfile: docker/Dockerfile
       args:
-        DOCKER_REGISTRY: $DEV_DOCKER_REGISTRY
+        DOCKER_REGISTRY: ${DEV_DOCKER_REGISTRY:-registry.gitlab.com/grassrootseconomics}
         PIP_INDEX_URL: ${PIP_INDEX_URL:-https://pypi.org/simple}
         EXTRA_PIP_INDEX_URL: ${EXTRA_PIP_INDEX_URL:-https://pip.grassrootseconomics.net:8433}
         EXTRA_PIP_ARGS: $EXTRA_PIP_ARGS
@@ -184,31 +184,14 @@ services:
         EXTRA_PIP_INDEX_URL: ${EXTRA_PIP_INDEX_URL:-https://pip.grassrootseconomics.net:8433}
         EXTRA_PIP_ARGS: $EXTRA_PIP_ARGS
     environment:
-      CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS
-      RPC_PROVIDER: ${RPC_PROVIDER:-http://evm:8545}
-      CHAIN_SPEC: ${CHAIN_SPEC:-evm:byzantium:8996:bloxberg}
-      DATABASE_HOST: ${DATABASE_HOST:-postgres}
-      DATABASE_PORT: ${DATABASE_PORT:-5432}
-      DATABASE_NAME: ${DATABASE_NAME:-cic_eth}
-      DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala}
-      DATABASE_USER: ${DATABASE_USER:-grassroots}
-      DATABASE_ENGINE: ${DATABASE_ENGINE:-postgres}
-      DATABASE_DRIVER: ${DATABASE_DRIVER:-psycopg2}
-      DATABASE_DEBUG: ${DATABASE_DEBUG:-0}
-      DATABASE_POOL_SIZE: 0
       REDIS_PORT: 6379
       REDIS_HOST: redis
       CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis}
       CELERY_RESULT_URL: ${CELERY_RESULT_URL:-redis://redis}
       CELERY_DEBUG: ${CELERY_DEBUG:-1}
-      SIGNER_PROVIDER: ${SIGNER_PROVIDER:-http://cic-signer:8000}
-      SIGNER_SECRET: ${SIGNER_SECRET:-deadbeef}
-      TASKS_TRACE_QUEUE_STATUS: ${TASKS_TRACE_QUEUE_STATUS:-1}
     restart: unless-stopped 
     depends_on:
       - cic-eth-tasker
-      - cic-eth-tracker
-      - cic-eth-dispatcher
     volumes:
       # - ./apps/cic-eth/:/root Useful for developing locally 
       - signer-data:/run/crypto-dev-signer