diff --git a/for-upstream/common.nix b/for-upstream/common.nix
index 1ed72870..bb9de47b 100644
--- a/for-upstream/common.nix
+++ b/for-upstream/common.nix
@@ -29,7 +29,7 @@ in
       type = types.string;
     };
     package = let
-        version = "0.3.0";
+        version = "0.3.1";
       in mkOption {
       description = "Package containing the bin/hercules-ci-agent program";
       type = types.package;
diff --git a/hercules-ci-agent/CHANGELOG.md b/hercules-ci-agent/CHANGELOG.md
index e5e34882..9dd5f9d3 100644
--- a/hercules-ci-agent/CHANGELOG.md
+++ b/hercules-ci-agent/CHANGELOG.md
@@ -7,8 +7,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [0.3.0] - 2019-07-05
+## [0.3.1] - 2019-08-07
+
+### Changed
+
+- Emit a log when evaluator starts to push to cachix
+
+- Increase attribute limit to 50k
+
+- Pin nixpkgs commit and speed up compilation via https://hercules-ci.cachix.org
+
 
+### Fixed
+
+- Possible exception during evaluation was not propagated,
+  resulting into lack of retries
+
+- #8: Refresh agent session on cluster join token change
+
+- Fix segfault on involved IFD project (remove a finalizer)
+
+- Cachix: fix a crash with a lot of attributes (when determining closure graph)
+
+## [0.3.0] - 2019-07-05
 
 ### Changed
 
@@ -65,7 +86,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release
 
-[0.3]: https://github.com/hercules-ci/hercules-ci-agent/compare/hercules-ci-agent-0.2...hercules-ci-agent-0.3
+[0.3.1]: https://github.com/hercules-ci/hercules-ci-agent/compare/hercules-ci-agent-0.3.0...hercules-ci-agent-0.3.1
+[0.3.0]: https://github.com/hercules-ci/hercules-ci-agent/compare/hercules-ci-agent-0.2...hercules-ci-agent-0.3.0
 [0.2]: https://github.com/hercules-ci/hercules-ci-agent/compare/hercules-ci-agent-0.1.1...hercules-ci-agent-0.2
 [0.1.1]: https://github.com/hercules-ci/hercules-ci-agent/compare/hercules-ci-agent-0.1.0.0...hercules-ci-agent-0.1.1
 [Unreleased]: https://github.com/hercules-ci/hercules-ci-agent/compare/stable...master
diff --git a/hercules-ci-agent/hercules-ci-agent.cabal b/hercules-ci-agent/hercules-ci-agent.cabal
index 70866a86..7918c9fa 100644
--- a/hercules-ci-agent/hercules-ci-agent.cabal
+++ b/hercules-ci-agent/hercules-ci-agent.cabal
@@ -1,7 +1,7 @@
 cabal-version: 1.12
 
 name:           hercules-ci-agent
-version:        0.3.0
+version:        0.3.1
 homepage:       https://docs.hercules-ci.com
 bug-reports:    https://github.com/hercules-ci/hercules-ci-agent/issues
 author:         Hercules Labs
diff --git a/hercules-ci-agent/pkg.nix b/hercules-ci-agent/pkg.nix
index 37dd8765..b21989e4 100644
--- a/hercules-ci-agent/pkg.nix
+++ b/hercules-ci-agent/pkg.nix
@@ -1,10 +1,10 @@
-{ mkDerivation, aeson, async, attoparsec, base, bdw-gc, binary
-, binary-conduit, bytestring, cachix, cachix-api, conduit
-, conduit-extra, containers, directory, exceptions, filepath
-, hercules-ci-api, hostname, hspec, http-client, http-client-tls
-, http-conduit, inline-c, inline-c-cpp, katip, lens, lens-aeson
-, lifted-async, lifted-base, monad-control, mtl, network
-, nix-derivation, nix-expr, nix-main, nix-store
+{ mkDerivation, aeson, async, attoparsec, base, base64-bytestring
+, bdw-gc, binary, binary-conduit, bytestring, cachix, cachix-api
+, conduit, conduit-extra, containers, directory, exceptions
+, filepath, hercules-ci-api, hostname, hspec, http-client
+, http-client-tls, http-conduit, inline-c, inline-c-cpp, katip
+, lens, lens-aeson, lifted-async, lifted-base, monad-control, mtl
+, network, nix-derivation, nix-expr, nix-main, nix-store
 , optparse-applicative, process, protolude, safe-exceptions
 , servant, servant-auth-client, servant-client, servant-client-core
 , stdenv, stm, system-filepath, temporary, text, time, tomland
@@ -13,7 +13,7 @@
 }:
 mkDerivation {
   pname = "hercules-ci-agent";
-  version = "0.3.0";
+  version = "0.3.1";
   src = ./hercules-ci-agent;
   isLibrary = true;
   isExecutable = true;
@@ -24,15 +24,16 @@ mkDerivation {
     transformers-base
   ];
   executableHaskellDepends = [
-    aeson async attoparsec base binary binary-conduit bytestring cachix
-    cachix-api conduit conduit-extra containers directory exceptions
-    filepath hercules-ci-api hostname http-client http-client-tls
-    http-conduit inline-c inline-c-cpp katip lens lens-aeson
-    lifted-async lifted-base monad-control mtl network nix-derivation
-    optparse-applicative process protolude safe-exceptions servant
-    servant-auth-client servant-client servant-client-core stm
-    system-filepath temporary text time tomland transformers
-    transformers-base unix unliftio-core unordered-containers uuid
+    aeson async attoparsec base base64-bytestring binary binary-conduit
+    bytestring cachix cachix-api conduit conduit-extra containers
+    directory exceptions filepath hercules-ci-api hostname http-client
+    http-client-tls http-conduit inline-c inline-c-cpp katip lens
+    lens-aeson lifted-async lifted-base monad-control mtl network
+    nix-derivation optparse-applicative process protolude
+    safe-exceptions servant servant-auth-client servant-client
+    servant-client-core stm system-filepath temporary text time tomland
+    transformers transformers-base unix unliftio-core
+    unordered-containers uuid
   ];
   executablePkgconfigDepends = [
     bdw-gc nix-expr nix-main nix-store
diff --git a/nix/cachix-api.nix b/nix/cachix-api.nix
index ae0c8b73..a446c226 100644
--- a/nix/cachix-api.nix
+++ b/nix/cachix-api.nix
@@ -1,14 +1,21 @@
 { mkDerivation, aeson, base, base16-bytestring, bytestring, conduit
-, cookie, cryptonite, deepseq, exceptions, hspec, hspec-discover
-, http-api-data, http-media, lens, memory, protolude, resourcet
-, servant, servant-auth, servant-auth-server, servant-auth-swagger
-, servant-client, servant-swagger, servant-swagger-ui-core, stdenv
-, string-conv, swagger2, text, transformers
+, cookie, cryptonite, deepseq, exceptions, fetchgit, hspec
+, hspec-discover, http-api-data, http-media, lens, memory
+, protolude, resourcet, servant, servant-auth, servant-auth-server
+, servant-auth-swagger, servant-client, servant-swagger
+, servant-swagger-ui-core, stdenv, string-conv, swagger2, text
+, transformers
 }:
 mkDerivation {
   pname = "cachix-api";
   version = "0.2.1";
-  src = (import ./sources.nix).cachix + "/cachix-api";
+  src = fetchgit {
+    url = "https://github.com/cachix/cachix";
+    sha256 = "169cn7airf8kw2275ix0aradpips7cip1ki4qyv0rvarjgszri6k";
+    rev = "d4158f70be7f8b9cf01dd885c4adf1c101880f2f";
+    fetchSubmodules = true;
+  };
+  postUnpack = "sourceRoot+=/cachix-api; echo source root reset to $sourceRoot";
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [
diff --git a/nix/cachix.nix b/nix/cachix.nix
index cd31db31..52cd1e8a 100644
--- a/nix/cachix.nix
+++ b/nix/cachix.nix
@@ -1,18 +1,25 @@
 { mkDerivation, async, base, base16-bytestring, base64-bytestring
 , bytestring, cachix-api, conduit, conduit-extra, containers
-, cookie, cryptonite, dhall, directory, ed25519, filepath, fsnotify
-, here, hspec, hspec-discover, http-client, http-client-tls
-, http-conduit, http-types, inline-c, inline-c-cpp, lzma-conduit
-, megaparsec, memory, mmorph, netrc, nix-main, nix-store
-, optparse-applicative, process, protolude, resourcet, retry
-, safe-exceptions, servant, servant-auth, servant-auth-client
-, servant-client, servant-client-core, servant-conduit, stdenv
-, temporary, text, unix, uri-bytestring, versions
+, cookie, cryptonite, dhall, directory, ed25519, fetchgit, filepath
+, fsnotify, here, hspec, hspec-discover, http-client
+, http-client-tls, http-conduit, http-types, inline-c, inline-c-cpp
+, lzma-conduit, megaparsec, memory, mmorph, netrc, nix-main
+, nix-store, optparse-applicative, process, protolude, resourcet
+, retry, safe-exceptions, servant, servant-auth
+, servant-auth-client, servant-client, servant-client-core
+, servant-conduit, stdenv, temporary, text, unix, uri-bytestring
+, versions
 }:
 mkDerivation {
   pname = "cachix";
   version = "0.2.1";
-  src = (import ./sources.nix).cachix + "/cachix";
+  src = fetchgit {
+    url = "https://github.com/cachix/cachix";
+    sha256 = "169cn7airf8kw2275ix0aradpips7cip1ki4qyv0rvarjgszri6k";
+    rev = "d4158f70be7f8b9cf01dd885c4adf1c101880f2f";
+    fetchSubmodules = true;
+  };
+  postUnpack = "sourceRoot+=/cachix; echo source root reset to $sourceRoot";
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [