diff --git a/apps/iot/src/iot.app.src b/apps/iot/src/iot.app.src
index 4fa9965..a1ada88 100644
--- a/apps/iot/src/iot.app.src
+++ b/apps/iot/src/iot.app.src
@@ -9,7 +9,7 @@
     ranch,
     cowboy,
     lager,
-    jiffy,
+    %jiffy,
     parse_trans,
     hackney,
     poolboy,
diff --git a/rebar.config b/rebar.config
index 1c7763e..fc9279c 100644
--- a/rebar.config
+++ b/rebar.config
@@ -4,9 +4,9 @@
     {hackney, ".*", {git, "https://github.com/benoitc/hackney.git", {tag, "1.16.0"}}},
     {sync, ".*", {git, "https://github.com/rustyio/sync.git", {branch, "master"}}},
     {cowboy, ".*", {git, "https://github.com/ninenines/cowboy.git", {tag, "2.5.0"}}},
-    {jiffy, ".*", {git, "https://github.com/davisp/jiffy.git", {tag, "1.0.5"}}},
+    {jiffy, ".*", {git, "https://github.com/davisp/jiffy.git", {tag, "1.1.1"}}},
     {parse_trans, ".*", {git, "https://github.com/uwiger/parse_trans", {tag, "3.0.0"}}},
-    {lager, ".*", {git,"https://github.com/basho/lager", {tag, "3.2.4"}}}
+    {lager, ".*", {git,"https://github.com/erlang-lager/lager.git", {tag, "3.9.2"}}}
 ]}.
 
 {relx, [{release, {iot, "0.1.0"},
@@ -39,4 +39,4 @@
                      ]
             }]}]}.
 
-{erl_opts, [{parse_transform,lager_transform}]}.
\ No newline at end of file
+{erl_opts, [{parse_transform,lager_transform}]}.
diff --git a/rebar.lock b/rebar.lock
index 4b50cfe..c0d8370 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -9,10 +9,7 @@
        {ref,"106ba84bb04537879d8ce59321a04e0682110b91"}},
   1},
  {<<"fs">>,{pkg,<<"fs">>,<<"6.1.1">>},1},
- {<<"goldrush">>,
-  {git,"https://github.com/basho/goldrush.git",
-       {ref,"8f1b715d36b650ec1e1f5612c00e28af6ab0de82"}},
-  1},
+ {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
  {<<"hackney">>,
   {git,"https://github.com/benoitc/hackney.git",
        {ref,"f3e9292db22c807e73f57a8422402d6b423ddf5f"}},
@@ -20,11 +17,11 @@
  {<<"idna">>,{pkg,<<"idna">>,<<"6.0.1">>},1},
  {<<"jiffy">>,
   {git,"https://github.com/davisp/jiffy.git",
-       {ref,"6dadc0cd22b06e2b1972ee8aba5708c478418926"}},
+       {ref,"9ea1b35b6e60ba21dfd4adbd18e7916a831fd7d4"}},
   0},
  {<<"lager">>,
-  {git,"https://github.com/basho/lager",
-       {ref,"81eaef0ce98fdbf64ab95665e3bc2ec4b24c7dac"}},
+  {git,"https://github.com/erlang-lager/lager.git",
+       {ref,"459a3b2cdd9eadd29e5a7ce5c43932f5ccd6eb88"}},
   0},
  {<<"metrics">>,{pkg,<<"metrics">>,<<"1.0.1">>},1},
  {<<"mimerl">>,{pkg,<<"mimerl">>,<<"1.2.0">>},1},
@@ -50,6 +47,7 @@
 {pkg_hash,[
  {<<"certifi">>, <<"B7CFEAE9D2ED395695DD8201C57A2D019C0C43ECAF8B8BCB9320B40D6662F340">>},
  {<<"fs">>, <<"9D147B944D60CFA48A349F12D06C8EE71128F610C90870BDF9A6773206452ED0">>},
+ {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
  {<<"idna">>, <<"1D038FB2E7668CE41FBF681D2C45902E52B3CB9E9C77B55334353B222C2EE50C">>},
  {<<"metrics">>, <<"25F094DEA2CDA98213CECC3AEFF09E940299D950904393B2A29D191C346A8486">>},
  {<<"mimerl">>, <<"67E2D3F571088D5CFD3E550C383094B47159F3EEE8FFA08E64106CDF5E981BE3">>},
@@ -58,6 +56,7 @@
 {pkg_hash_ext,[
  {<<"certifi">>, <<"3B3B5F36493004AC3455966991EAF6E768CE9884693D9968055AEEEB1E575040">>},
  {<<"fs">>, <<"EF94E95FFE79916860649FED80AC62B04C322B0BB70F5128144C026B4D171F8B">>},
+ {<<"goldrush">>, <<"99CB4128CFFCB3227581E5D4D803D5413FA643F4EB96523F77D9E6937D994CEB">>},
  {<<"idna">>, <<"A02C8A1C4FD601215BB0B0324C8A6986749F807CE35F25449EC9E69758708122">>},
  {<<"metrics">>, <<"69B09ADDDC4F74A40716AE54D140F93BEB0FB8978D8636EADED0C31B6F099F16">>},
  {<<"mimerl">>, <<"F278585650AA581986264638EBF698F8BB19DF297F66AD91B18910DFC6E19323">>},