diff --git a/.env.example b/.env.example
index e7b9591..baa5367 100644
--- a/.env.example
+++ b/.env.example
@@ -1,3 +1,10 @@
-POSTGRES_DSN=postgres://postgres:postgres@postgres:5432/cic_custodial
-REDIS_DSN=redis://redis:6379/1
-ASYNQ_DSN=redis://redis:6379/0
\ No newline at end of file
+CUSTODIAL_CHAIN__RPC_ENDPOINT=
+CUSTODIAL_SYSTEM__GAS_FAUCET_ADDRESS=
+CUSTODIAL_SYSTEM__GIFTABLE_TOKEN_ADDRESS=
+CUSTODIAL_SYSTEM__PRIVATE_KEY=
+CUSTODIAL_SYSTEM__PUBLIC_KEY=
+CUSTODIAL_SYSTEM__ACCOUNT_INDEX_ADDRESS=
+CUSTODIAL_POSTGRES__DSN=
+CUSTODIAL_REDIS__DSN=
+CUSTODIAL_ASYNQ__DSN=
+CUSTODIAL_JETSTREAM__ENDPOINT=
\ No newline at end of file
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index e49c451..b9f1dbb 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -54,7 +54,7 @@ jobs:
         cache-to: type=local,dest=/tmp/.buildx-cache
         tags: |
           ghcr.io/grassrootseconomics/cic-custodial/cic-custodial:latest
-          ghcr.io/grassrootseconomics/cic-custodial/cic-custodial:v${{ env.RELEASE_TAG }}
+          ghcr.io/grassrootseconomics/cic-custodial/cic-custodial:${{ env.RELEASE_TAG }}
 
   goreleaser:
     runs-on: ubuntu-latest
diff --git a/docker-compose.dev.yaml b/dev/docker-compose.dev.yaml
similarity index 100%
rename from docker-compose.dev.yaml
rename to dev/docker-compose.dev.yaml
diff --git a/docker-compose.build.yaml b/docker-compose.build.yaml
deleted file mode 100644
index 99bbd04..0000000
--- a/docker-compose.build.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-version: '3.9'
-services:
-  cic-custodial:
-    image: ${IMAGE_BASE_URL:-ghcr.io/grassrootseconomics/cic-custodial}/cic-custodial:${TAG:-latest}
-    build:
-      context: .
-      dockerfile: Dockerfile
-      cache_from:
-        - ${IMAGE_BASE_URL:-ghcr.io/grassrootseconomics/cic-custodial}/cic-custodial:latest
-        
\ No newline at end of file