diff --git a/.gitmodules b/.gitmodules
index 90f452d..3676b2f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,6 @@
 [submodule "apps/hg_proto/damsel"]
 	path = apps/hg_proto/damsel
-	url = git@github.com:keynslug/damsel.git
-	branch = HG-40/fix/events
+    url = git@github.com:rbkmoney/damsel.git
 [submodule "build_utils"]
 	path = build_utils
 	url = git@github.com:rbkmoney/build_utils.git
diff --git a/Makefile b/Makefile
index 7d780d3..b5dff78 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ compile: submodules rebar-update
 xref: submodules
 	$(REBAR) xref
 
-lint: compile
+lint:
 	elvis rock
 
 dialyze:
diff --git a/TODO.md b/TODO.md
index 882dac8..0d3ffcc 100644
--- a/TODO.md
+++ b/TODO.md
@@ -5,11 +5,9 @@
 * More familiar flow control handling of machines, e.g. catching and wrapping thrown exceptions.
 * Explicit stage denotion in the invoice machine?
 * __Submachine abstraction and payment submachine implementation__.
-* __Properly pass woody contexts around__.
 * __Invoice access control__.
+* __Proper behaviours around machines w/ internal datastructures marshalling, event sources and dispatching.__
 
 # Tests
 
-* Fix excess `localhost` definitions (as soon as service discovery strategy will be finalized, hopefully).
 * __Add generic albeit more complex test suite which covers as many state transitions with expected effects as possible__.
-* Employ macros to minimize pattern matching boilerplate.
diff --git a/apps/hg_proto/damsel b/apps/hg_proto/damsel
index d3883df..fb43ca0 160000
--- a/apps/hg_proto/damsel
+++ b/apps/hg_proto/damsel
@@ -1 +1 @@
-Subproject commit d3883df63982bf9bf5c8e9ac477cd65e1238a45b
+Subproject commit fb43ca0f55da97cb649c7933251ab54fbb651ffe
diff --git a/docker-compose.sh b/docker-compose.sh
index f05a5ea..8eb95fd 100755
--- a/docker-compose.sh
+++ b/docker-compose.sh
@@ -11,7 +11,7 @@ services:
     depends_on:
       - machinegun
   machinegun:
-    image: dr.rbkmoney.com/rbkmoney/mg_prototype:87bef0b
+    image: dr.rbkmoney.com/rbkmoney/mg_prototype:3455e7b
     command: /opt/mgun/bin/mgun foreground
 networks:
   default: