diff --git a/elvis.config b/elvis.config
index a7e4eb385..c14f3448d 100644
--- a/elvis.config
+++ b/elvis.config
@@ -1,8 +1,12 @@
 [{ elvis
  , [
     { config,
-      [ #{ dirs    => [ "apps/**/src"
-                      , "apps/**/test"
+      [ #{ dirs    => [ "apps/els_core/src"
+                      , "apps/els_core/test"
+                      , "apps/els_dap/src"
+                      , "apps/els_dap/test"
+                      , "apps/els_lsp/src"
+                      , "apps/els_lsp/test"
                       ]
          , filter  => "*.erl"
          , ruleset => erl_files
diff --git a/rebar.config b/rebar.config
index 21cf9a6e2..5e7983f3b 100644
--- a/rebar.config
+++ b/rebar.config
@@ -12,7 +12,7 @@
        , {redbug,        "2.0.6"}
        , {yamerl,        "0.8.1"}
        , {docsh,         "0.7.2"}
-       , {elvis_core,    {git, "https://github.com/inaka/elvis_core.git", {ref, "2ea45117343f03d6184f23238b4bbabdbf1bf595"}}}
+       , {elvis_core,    "1.1.1"}
        , {rebar3_format, "0.8.2"}
        , {ephemeral,     "2.0.4"}
        , {tdiff,         "0.1.2"}
diff --git a/rebar.lock b/rebar.lock
index 65fd53b30..ce356ca66 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -2,10 +2,7 @@
 [{<<"bucs">>,{pkg,<<"bucs">>,<<"1.0.16">>},1},
  {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.10.1">>},0},
  {<<"docsh">>,{pkg,<<"docsh">>,<<"0.7.2">>},0},
- {<<"elvis_core">>,
-  {git,"https://github.com/inaka/elvis_core.git",
-       {ref,"2ea45117343f03d6184f23238b4bbabdbf1bf595"}},
-  0},
+ {<<"elvis_core">>,{pkg,<<"elvis_core">>,<<"1.1.1">>},0},
  {<<"ephemeral">>,{pkg,<<"ephemeral">>,<<"2.0.4">>},0},
  {<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},2},
  {<<"jsx">>,{pkg,<<"jsx">>,<<"3.0.0">>},0},
@@ -24,6 +21,7 @@
  {<<"bucs">>, <<"D69A4CD6D1238CD1ADC5C95673DBDE0F8459A5DBB7D746516434D8C6D935E96F">>},
  {<<"cowlib">>, <<"5442EB6B4EB1EB7F34DF38145ECB59BA15932FA6465C1C10DC47C7EB91DEA8CD">>},
  {<<"docsh">>, <<"F893D5317A0E14269DD7FE79CF95FB6B9BA23513DA0480EC6E77C73221CAE4F2">>},
+ {<<"elvis_core">>, <<"EB7864CE4BC87D13FBF1C222A82230A4C3D327C21080B73E97FC6343C3A5264D">>},
  {<<"ephemeral">>, <<"B3E57886ADD5D90C82FE3880F5954978222A122CB8BAA123667401BBAAEC51D6">>},
  {<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>},
  {<<"jsx">>, <<"20A170ABD4335FC6DB24D5FAD1E5D677C55DADF83D1B20A8A33B5FE159892A39">>},
@@ -41,6 +39,7 @@
  {<<"bucs">>, <<"FF6A5C72A500AD7AEC1EE3BA164AE3C450EADEE898B0D151E1FACA18AC8D0D62">>},
  {<<"cowlib">>, <<"9B4271E10228E6877199F1D698EAA3B32E69AE82CC68E1443C5CA8E774089A44">>},
  {<<"docsh">>, <<"4E7DB461BB07540D2BC3D366B8513F0197712D0495BB85744F367D3815076134">>},
+ {<<"elvis_core">>, <<"391C95BAA49F2718D7FB498BCF08046DDFC202CF0AAB63B2E439271485C9DC42">>},
  {<<"ephemeral">>, <<"4B293D80F75F9C4575FF4B9C8E889A56802F40B018BF57E74F19644EFEE6C850">>},
  {<<"getopt">>, <<"53E1AB83B9CEB65C9672D3E7A35B8092E9BDC9B3EE80721471A161C10C59959C">>},
  {<<"jsx">>, <<"37BECA0435F5CA8A2F45F76A46211E76418FBEF80C36F0361C249FC75059DC6D">>},