diff --git a/Gemfile b/Gemfile
index 94c7f779..479b1325 100644
--- a/Gemfile
+++ b/Gemfile
@@ -43,9 +43,6 @@ gem 'to_xls-rails'
 #Reporting gem
 #gem 'compendium'
 
-# Pagination
-gem 'kaminari', :git => "git://github.com/amatsuda/kaminari.git", :branch => 'master'
-
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
@@ -60,7 +57,7 @@ gem 'bcrypt', '~> 3.1.7'
 gem 'sidekiq'
 
 # Pagination
-gem 'kaminari', :git => "git://github.com/amatsuda/kaminari.git", :branch => 'master'
+gem 'kaminari', '~> 0.16.3' #:git => "git://github.com/amatsuda/kaminari.git", :branch => 'master'
 
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
diff --git a/Gemfile.lock b/Gemfile.lock
index fbf61a33..7281b442 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,21 +1,3 @@
-GIT
-  remote: git://github.com/amatsuda/kaminari.git
-  revision: bc52ae73d41386d344b5d1b18e689e5a988f1a03
-  branch: master
-  specs:
-    kaminari (1.0.1)
-      activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.0.1)
-      kaminari-activerecord (= 1.0.1)
-      kaminari-core (= 1.0.1)
-    kaminari-actionview (1.0.1)
-      actionview
-      kaminari-core (= 1.0.1)
-    kaminari-activerecord (1.0.1)
-      activerecord
-      kaminari-core (= 1.0.1)
-    kaminari-core (1.0.1)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -104,6 +86,9 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    kaminari (0.16.3)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -119,6 +104,7 @@ GEM
     minitest (5.10.2)
     multi_json (1.12.1)
     multi_xml (0.6.0)
+    mysql2 (0.4.6)
     nio4r (2.1.0)
     nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
@@ -255,9 +241,8 @@ DEPENDENCIES
   httparty (~> 0.15.5)
   jbuilder (~> 2.5)
   jquery-rails
-  kaminari!
+  kaminari (~> 0.16.3)
   listen (~> 3.0.5)
-  pg
   mysql2 (>= 0.3.18, < 0.5)
   prawn
   prawn-table