diff --git a/Gemfile b/Gemfile
index 81955ce14..151158c69 100644
--- a/Gemfile
+++ b/Gemfile
@@ -53,8 +53,7 @@ gem 'mime-types'
 
 gem 'biz'
 
-# temporary till pull request gets merged: https://github.com/composite-primary-keys/composite_primary_keys/pull/404
-gem 'composite_primary_keys', git: 'https://github.com/jkowens/composite_primary_keys.git', branch: 'rails-5_1'
+gem 'composite_primary_keys'
 gem 'delayed_job_active_record'
 gem 'daemons'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 2e8065d0f..c6f5dc9cc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,3 @@
-GIT
-  remote: https://github.com/jkowens/composite_primary_keys.git
-  revision: 7f4670b54b3c6e94992161b4efe2c8717d7c0e71
-  branch: rails-5_1
-  specs:
-    composite_primary_keys (9.0.7)
-      activerecord (~> 5.1.0)
-
 GIT
   remote: https://github.com/thorsteneckel/autodiscover.git
   revision: 29d713ee0c8c25fcf74c4292ff13fe1fa4d0d827
@@ -102,6 +94,8 @@ GEM
       coffee-script
       execjs
       json
+    composite_primary_keys (10.0.0)
+      activerecord (~> 5.1.0)
     concurrent-ruby (1.0.5)
     coveralls (0.8.21)
       json (>= 1.8, < 3)
@@ -482,7 +476,7 @@ DEPENDENCIES
   coffee-rails
   coffee-script-source
   coffeelint
-  composite_primary_keys!
+  composite_primary_keys
   coveralls
   daemons
   delayed_job_active_record