diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7e54d81..6d8058d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 executors:
   aebuilder:
     docker:
-      - image: aeternity/builder:xenial-otp21
+      - image: aeternity/builder:bionic-otp25
         user: builder
     working_directory: ~/aesophia
 
diff --git a/rebar.config b/rebar.config
index cdf0378..6dff979 100644
--- a/rebar.config
+++ b/rebar.config
@@ -2,11 +2,10 @@
 
 {erl_opts, [debug_info]}.
 
-{deps, [ {aebytecode, {git, "https://github.com/aeternity/aebytecode.git", {ref,"0699f35"}}}
+{deps, [ {aebytecode, {git, "https://github.com/aeternity/aebytecode.git", {tag, "v3.0.0"}}}
        , {getopt, "1.0.1"}
        , {eblake2, "1.0.0"}
-       , {jsx, {git, "https://github.com/talentdeficit/jsx.git",
-                     {tag, "2.8.0"}}}
+       , {jsx, {git, "https://github.com/talentdeficit/jsx.git", {tag, "2.8.0"}}}
        ]}.
 
 {dialyzer, [
diff --git a/rebar.lock b/rebar.lock
index 0cdb1c0..c282c67 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -1,7 +1,7 @@
 {"1.2.0",
 [{<<"aebytecode">>,
   {git,"https://github.com/aeternity/aebytecode.git",
-       {ref,"0699f35b0398bac6cd4468da654d608375bd853d"}},
+       {ref,"05dfd7ffc7fb1e07ecc0b1e516da571f56d7dc8f"}},
   0},
  {<<"aeserialization">>,
   {git,"https://github.com/aeternity/aeserialization.git",
diff --git a/rebar3 b/rebar3
index ea5a116..a83d554 100755
Binary files a/rebar3 and b/rebar3 differ