diff --git a/Gemfile b/Gemfile
index ad4005e6af..8db1a3c2c2 100755
--- a/Gemfile
+++ b/Gemfile
@@ -20,12 +20,7 @@ group :development do
   # for development and testing purposes
   gem 'pry', git: 'https://github.com/pry/pry', branch: 'master'
   # module documentation
-  gem 'octokit', git: 'https://github.com/octokit/octokit.rb', branch: 'master'
-  # session aggregator, native builds have issues on arm platforms for now
-  gem 'metasploit-aggregator' if [
-    'x86-mingw32', 'x64-mingw32',
-    'x86_64-linux', 'x86-linux',
-    'darwin'].include?(RUBY_PLATFORM.gsub(/.*darwin.*/, 'darwin'))
+  gem 'octokit'
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 84d8f7864e..f408686fde 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -12,14 +12,6 @@ GIT
   specs:
     bit-struct (0.15.0)
 
-GIT
-  remote: https://github.com/octokit/octokit.rb
-  revision: 5b43070ea756af5d2f3ae2ad419ee6db67539344
-  branch: master
-  specs:
-    octokit (4.6.2)
-      sawyer (~> 0.8.0, >= 0.5.3)
-
 GIT
   remote: https://github.com/pry/pry
   revision: 1f64463184e0a160d0b41d1a1f92b8e2f230278c
@@ -42,6 +34,7 @@ PATH
       jsobfu
       json
       metasm
+      metasploit-aggregator
       metasploit-concern
       metasploit-credential
       metasploit-model
@@ -187,7 +180,7 @@ GEM
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
-    grpc (1.2.0)
+    grpc (1.2.2)
       google-protobuf (~> 3.1)
       googleauth (~> 0.5.1)
     i18n (0.8.1)
@@ -249,6 +242,8 @@ GEM
     nexpose (6.0.0)
     nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
+    octokit (4.7.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
     openssl-ccm (1.2.1)
     openvas-omp (0.0.4)
     os (0.9.6)
@@ -393,10 +388,9 @@ DEPENDENCIES
   cucumber-rails
   factory_girl_rails
   fivemat
-  metasploit-aggregator
   metasploit-framework!
   method_source!
-  octokit!
+  octokit
   pry!
   rake
   redcarpet
diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec
index dcabae5ca0..de652858eb 100644
--- a/metasploit-framework.gemspec
+++ b/metasploit-framework.gemspec
@@ -55,6 +55,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'json'
   # Metasm compiler/decompiler/assembler
   spec.add_runtime_dependency 'metasm'
+  # Metasploit::Aggregator external session proxy
+  spec.add_runtime_dependency 'metasploit-aggregator'
   # Metasploit::Concern hooks
   spec.add_runtime_dependency 'metasploit-concern'
   # Metasploit::Credential database models