diff --git a/configs/coinpayments-atomic-swap-checker.yaml b/configs/coinpayments-atomic-swap-checker.yaml
new file mode 100644
index 0000000..f2f6499
--- /dev/null
+++ b/configs/coinpayments-atomic-swap-checker.yaml
@@ -0,0 +1,23 @@
+log:
+  level: warn
+  # we are using sentry for error collection,
+  # you could opt-out by disabling it on the following line
+  disable_sentry: false
+
+sentry:
+  dsn: https://1bbe444efb3b4b15a58d9c0aba739f1c@sentry.tokend.services/6
+
+horizon:
+  endpoint: http://janus
+  signer: SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4
+
+coinpayments:
+  merchant_id: "6936542314febfcc8dd3955fce88e0be"
+  address: https://www.coinpayments.net/api.php
+  private_key: "1004f66dB4081cA6D9c3f0651A1DC64eB754158e48daFb7441c4B632D26628eC"
+  public_key: "f1db0de9c54cac677109f9da823b9627bef1c606fa75634c776100b88170a271"
+  ipn_secret: "supersekr1tandsecure"
+  request_timeout: 30
+
+atomic_swap_checker:
+  signer: SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4
diff --git a/configs/coinpayments-atomic-swap-matcher.yaml b/configs/coinpayments-atomic-swap-matcher.yaml
new file mode 100644
index 0000000..5e9d8a1
--- /dev/null
+++ b/configs/coinpayments-atomic-swap-matcher.yaml
@@ -0,0 +1,23 @@
+log:
+  level: warn
+  # we are using sentry for error collection,
+  # you could opt-out by disabling it on the following line
+  disable_sentry: false
+
+sentry:
+  dsn: https://1bbe444efb3b4b15a58d9c0aba739f1c@sentry.tokend.services/6
+
+horizon:
+  endpoint: http://janus
+  signer: SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4
+
+coinpayments:
+  merchant_id: "6936542314febfcc8dd3955fce88e0be"
+  address: https://www.coinpayments.net/api.php
+  private_key: "1004f66dB4081cA6D9c3f0651A1DC64eB754158e48daFb7441c4B632D26628eC"
+  public_key: "f1db0de9c54cac677109f9da823b9627bef1c606fa75634c776100b88170a271"
+  ipn_secret: "supersekr1tandsecure"
+  request_timeout: 30
+
+atomic_swap_matcher:
+  signer: SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4
diff --git a/configs/poll-closer.yaml b/configs/poll-closer.yaml
new file mode 100644
index 0000000..f11dd8e
--- /dev/null
+++ b/configs/poll-closer.yaml
@@ -0,0 +1,20 @@
+log:
+  level: warn
+  # we are using sentry for error collection,
+  # you could opt-out by disabling it on the following line
+  disable_sentry: true
+
+sentry:
+  dsn: https://1bbe444efb3b4b15a58d9c0aba739f1c@sentry.tokend.services/6
+
+closer:
+  source: GBA4EX43M25UPV4WIE6RRMQOFTWXZZRIPFAI5VPY6Z2ZVVXVWZ6NEOOB
+  signer: SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4
+  concurrency: 100
+
+horizon:
+  endpoint: http://janus/
+  signer: "SAMJKTZVW5UOHCDK5INYJNORF2HRKYI72M5XSZCBYAHQHR34FFR4Z6G4"
+
+listener:
+  addr: :2324
diff --git a/docker-compose.yml b/docker-compose.yml
index b78be6d..9c22ec7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,7 +34,7 @@ services:
     volumes:
       - adks-data:/pgdata
   core:
-    image: tokend/core:3.5.0
+    image: tokend/core:3.5.1
     depends_on:
       - janus
     restart: unless-stopped
@@ -51,7 +51,7 @@ services:
     labels:
       - "autoheal=true"
   horizon:
-    image: tokend/horizon:3.4.0
+    image: tokend/horizon:3.5.0
     depends_on:
       - core
     restart: unless-stopped
@@ -59,9 +59,10 @@ services:
       - POSTGRES_USER=horizon
       - POSTGRES_PASSWORD=horizon
       - POSTGRES_DB=horizon
-      - PGDATA=/pgdata
+      - PGDATA=/data/pgdata
     volumes:
       - ./configs/horizon.yaml:/config.yaml
+      - horizon-data:/data
   api:
     image: tokend/identity:4.4.0
     restart: unless-stopped
@@ -94,14 +95,14 @@ services:
     entrypoint: ""
     command: /opt/config/apply.sh
   web_client:
-    image: tokend/web-client:1.8.0
+    image: tokend/web-client:1.9.0
     restart: unless-stopped
     volumes:
       - ./configs/client.js:/usr/share/nginx/html/static/env.js
     ports:
       - 8060:80
   admin_client:
-    image: tokend/admin-client:1.8.0
+    image: tokend/admin-client:1.9.0
     restart: unless-stopped
     volumes:
       - ./configs/client.js:/usr/share/nginx/html/static/env.js
@@ -143,6 +144,14 @@ services:
     environment:
       - KV_VIPER_FILE=/config.yaml
     command: "run"
+  poll_closer:
+    image: tokend/poll-closer:0.1.1
+    restart: unless-stopped
+    environment:
+      - KV_VIPER_FILE=/config.yaml
+    volumes:
+      - ./configs/poll-closer.yaml:/config.yaml
+    command: run closer
 
   ## 3rd party
 
@@ -162,7 +171,7 @@ services:
   ## Coinpayments
 
   coinpayments-deposit:
-    image: tokend/coinpayments:0.3.0
+    image: tokend/coinpayments:0.4.0
     restart: unless-stopped
     environment:
       - KV_VIPER_FILE=/config.yaml
@@ -170,7 +179,7 @@ services:
       - ./configs/coinpayments-deposit.yaml:/config.yaml
     command: deposit
   coinpayments-deposit-verify:
-    image: tokend/coinpayments:0.3.0
+    image: tokend/coinpayments:0.4.0
     restart: unless-stopped
     environment:
       - KV_VIPER_FILE=/config.yaml
@@ -178,13 +187,29 @@ services:
       - ./configs/coinpayments-deposit-verify.yaml:/config.yaml
     command: deposit-verify
   coinpayments-withdraw:
-    image: tokend/coinpayments:0.3.0
+    image: tokend/coinpayments:0.4.0
     restart: unless-stopped
     environment:
       - KV_VIPER_FILE=/config.yaml
     volumes:
       - ./configs/coinpayments-withdraw.yaml:/config.yaml
     command: withdraw
+  coinpayments-atomic-swap-checker:
+    image: tokend/coinpayments:0.4.0
+    restart: unless-stopped
+    environment:
+      - KV_VIPER_FILE=/config.yaml
+    volumes:
+      - ./configs/coinpayments-atomic-swap-checker.yaml:/config.yaml
+    command: atomic-swap-checker
+  coinpayments-atomic-swap-matcher:
+    image: tokend/coinpayments:0.4.0
+    restart: unless-stopped
+    environment:
+      - KV_VIPER_FILE=/config.yaml
+    volumes:
+      - ./configs/coinpayments-atomic-swap-matcher.yaml:/config.yaml
+    command: atomic-swap-matcher
 
 volumes:
   adks-data:
diff --git a/terraform/main.tf b/terraform/main.tf
index 466dcc6..7b3256d 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -18,5 +18,5 @@ provider "tokend" {
 }
 
 module "tokend_vanilla" {
-  source = "git::https://github.com/tokend/terraform-tokend-vanilla.git?ref=v1.1.0"
+  source = "git::https://github.com/tokend/terraform-tokend-vanilla.git?ref=9ed018b674c727179cb7c41a93824d56b85b8b7b"
 }