diff --git a/environment-dev.yml b/environment-dev.yml
index 8da0295..fa87ef0 100644
--- a/environment-dev.yml
+++ b/environment-dev.yml
@@ -9,13 +9,13 @@ dependencies:
   - nlohmann_json
   - cppzmq
   - xeus>=5.0.0,<=6.0
-  - xeus-zmq
+  - xeus-zmq>=3.0.0,<=4.0
   - sqlite
   - sqlitecpp
   - cpp-tabulate=1.5
-  - xvega
+  - xvega>=0.1.0
   - xproperty>=0.12.0
-  - xvega-bindings=0.0.10
+  - xvega-bindings>=0.1.0
   # Test dependencies
   - pytest
   - jupyter_kernel_test
diff --git a/src/main.cpp b/src/main.cpp
index c11af2d..4f8a1de 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,7 +20,9 @@
 
 #include "xeus/xkernel.hpp"
 #include "xeus/xkernel_configuration.hpp"
-#include "xeus-zmq/xserver_shell_main.hpp"
+
+#include "xeus-zmq/xserver_zmq_split.hpp"
+#include "xeus-zmq/xzmq_context.hpp"
 
 #include "xeus-sqlite/xeus_sqlite_interpreter.hpp"
 #include "xeus-sqlite/xeus_sqlite_config.hpp"
@@ -97,7 +99,7 @@ int main(int argc, char* argv[])
     // Load configuration file
     std::string file_name = extract_filename(argc, argv);
 
-    auto context = xeus::make_context<zmq::context_t>();
+    std::unique_ptr<xeus::xcontext> context = xeus::make_zmq_context();
 
     // Create interpreter instance
     using interpreter_ptr = std::unique_ptr<xeus_sqlite::interpreter>;