diff --git a/Gemfile b/Gemfile
index 3ae5cb0c62..f57fca5605 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,4 +5,3 @@ gem 'pry'
 gem 'octokit'
 gem 'netrc'
 gem 'rake'
-gem 'stellar_core_commander', git: 'https://github.com/stellar/stellar_core_commander.git', branch: 'master'
diff --git a/Gemfile.lock b/Gemfile.lock
index 161d6cea6c..798e9b6b26 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,27 +1,9 @@
-GIT
-  remote: https://github.com/stellar/stellar_core_commander.git
-  revision: 59cde2af715c9c264dacb77e608a5d61b7d41a88
-  branch: master
-  specs:
-    stellar_core_commander (0.0.13)
-      activesupport (~> 6)
-      contracts (~> 0.16)
-      faraday (~> 0.9.1)
-      faraday_middleware (~> 0.9.1)
-      pg (~> 0.18.1)
-      pry (~> 0.11.3)
-      sequel (~> 5.5.0)
-      slop (~> 3.6.0)
-      stellar-base (>= 0.17.0)
-      stellar-sdk (>= 0.5.0)
-      typhoeus (~> 0.8.0)
-
 GIT
   remote: https://github.com/stellar/xdrgen.git
-  revision: d30a909ff8d782dee7eadc0b4e02a89e4195eb79
+  revision: 9dacf24a73b3e73105e9272ccf333704dcc82333
   branch: master
   specs:
-    xdrgen (0.0.1)
+    xdrgen (0.1.0)
       activesupport (~> 6)
       memoist (~> 0.11.0)
       slop (~> 3.4)
@@ -30,93 +12,47 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activesupport (6.0.3.1)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    base32 (0.3.2)
-    citrus (3.0.2)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.6)
-    contracts (0.16.0)
-    digest-crc (0.5.1)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
-    excon (0.73.0)
-    faraday (0.9.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.8)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
-    faraday-digestauth (0.4.1)
-      faraday (>= 0.7)
-      net-http-digest_auth (~> 1.4)
-    faraday_hal_middleware (0.1.1)
-      faraday_middleware (>= 0.9)
-    faraday_middleware (0.9.2)
-      faraday (>= 0.7.4, < 0.10)
-    ffi (1.12.2)
-    hyperclient (0.9.3)
-      addressable
-      faraday (>= 0.9.0)
-      faraday-digestauth (>= 0.3.0)
-      faraday_hal_middleware
-      faraday_middleware
-      net-http-digest_auth
-    i18n (1.8.2)
+      ruby2_keywords
+    faraday-net_http (1.0.1)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     memoist (0.11.0)
-    method_source (0.9.2)
-    minitest (5.14.1)
+    method_source (1.0.0)
+    minitest (5.14.4)
     multipart-post (2.1.1)
-    net-http-digest_auth (1.4.1)
     netrc (0.11.0)
-    octokit (4.18.0)
+    octokit (4.20.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    pg (0.18.4)
     polyglot (0.3.5)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    public_suffix (4.0.5)
-    rake (13.0.1)
-    rbnacl (7.1.1)
-      ffi
+    pry (0.14.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.6)
+    rake (13.0.3)
+    ruby2_keywords (0.0.4)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    sequel (5.5.0)
     slop (3.6.0)
-    stellar-base (0.22.0)
-      activesupport (>= 5.0.0)
-      base32
-      digest-crc
-      rbnacl (>= 6.0)
-      xdr (~> 3.0.0)
-    stellar-sdk (0.8.0)
-      activesupport (>= 5.0)
-      contracts (~> 0.16)
-      excon (~> 0.44, >= 0.44.4)
-      hyperclient (~> 0.7)
-      stellar-base (>= 0.22.0)
-      toml-rb (~> 1.1, >= 1.1.1)
-    thread_safe (0.3.6)
-    toml-rb (1.1.2)
-      citrus (~> 3.0, > 3.0)
     treetop (1.5.3)
       polyglot (~> 0.3)
-    typhoeus (0.8.0)
-      ethon (>= 0.8.0)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    xdr (3.0.0)
-      activemodel (>= 5.2.0)
-      activesupport (>= 5.2.0)
-    zeitwerk (2.3.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -126,8 +62,7 @@ DEPENDENCIES
   octokit
   pry
   rake
-  stellar_core_commander!
   xdrgen!
 
 BUNDLED WITH
-   1.17.2
+   2.2.15