diff --git a/.gitmodules b/.gitmodules
index 8582311a..e69de29b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "rsmp_schema"]
-	path = lib/rsmp_schema
-	url = https://github.com/rsmp-nordic/rsmp_schema.git
diff --git a/Gemfile b/Gemfile
index 702bc03a..2d58f8ea 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,3 +2,5 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in rsmp.gemspec
 gemspec
+
+gem 'rsmp_schemer', git: 'https://github.com/rsmp-nordic/rsmp_schemer'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8c0a0406..705d94f0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/rsmp-nordic/rsmp_schemer
+  revision: dc7504b4bfc2d7531b6caaccd2bdf2459d0d3f82
+  specs:
+    rsmp_schemer (0.1.0)
+      json_schemer (~> 0.2.18)
+
 PATH
   remote: .
   specs:
@@ -5,7 +12,6 @@ PATH
       async (~> 1.28.7)
       async-io (~> 1.30.2)
       colorize (~> 0.8.1)
-      json_schemer (~> 0.2.18)
       thor (~> 1.0.1)
 
 GEM
@@ -91,6 +97,7 @@ DEPENDENCIES
   cucumber (~> 3.1.2)
   rake (~> 13.0.1)
   rsmp!
+  rsmp_schemer!
   rspec (~> 3.9.0)
   rspec-expectations (~> 3.9.1)
   timecop (~> 0.9.1)
diff --git a/lib/rsmp_schema b/lib/rsmp_schema
deleted file mode 160000
index 622ea944..00000000
--- a/lib/rsmp_schema
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 622ea9440db8bfd2f15d26f2c0c3849f04990c9c
diff --git a/rsmp.gemspec b/rsmp.gemspec
index b843e524..dfe15287 100644
--- a/rsmp.gemspec
+++ b/rsmp.gemspec
@@ -45,7 +45,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "async-io", "~> 1.30.2"
   spec.add_dependency "colorize", "~> 0.8.1"
   spec.add_dependency "thor", "~> 1.0.1"
-  spec.add_dependency "json_schemer", "~> 0.2.18"
+  #spec.add_dependency "json_schemer", "~> 0.2.18"
 
   spec.add_development_dependency "bundler", "~> 2.2.3"
   spec.add_development_dependency "rake", "~> 13.0.1"