diff --git a/Gemfile b/Gemfile
index 2a4f79d5b0..7f71f399c6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -184,7 +184,7 @@ group :test, :development do
 end
 
 group :development do
-  gem 'annotate', '~> 2.7.0'
+  gem 'annotate', '< 3.1.1'
   gem 'capistrano', '~> 2.15.0', '< 3.0.0'
     gem 'net-ssh', ['~> 2.9.0', '< 3.0.0']
       gem 'net-ssh-gateway', ['>= 1.1.0', '< 2.0.0']
diff --git a/Gemfile.lock b/Gemfile.lock
index bca0c3a9e9..44e9ae55ce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -432,7 +432,7 @@ DEPENDENCIES
   active_model_otp!
   acts_as_versioned!
   alaveteli_features!
-  annotate (~> 2.7.0)
+  annotate (< 3.1.1)
   bcrypt (~> 3.1.13)
   bootstrap-sass (~> 2.3.2.2)
   bullet (~> 6.1.0)
diff --git a/Gemfile.rails_next.lock b/Gemfile.rails_next.lock
index 11db9a0d67..5f676398ad 100644
--- a/Gemfile.rails_next.lock
+++ b/Gemfile.rails_next.lock
@@ -440,7 +440,7 @@ DEPENDENCIES
   active_model_otp!
   acts_as_versioned!
   alaveteli_features!
-  annotate (~> 2.7.0)
+  annotate (< 3.1.1)
   bcrypt (~> 3.1.13)
   bootstrap-sass (~> 2.3.2.2)
   bullet (~> 6.1.0)
diff --git a/script/annotate-models b/script/annotate-models
index 7b6daa3c5e..6d3f5673aa 100755
--- a/script/annotate-models
+++ b/script/annotate-models
@@ -2,4 +2,8 @@
 #
 # annotates the models in app/ with schema information
 
-bundle exec annotate --show-migration --position before --exclude tests,fixtures
+bundle exec annotate \
+  --show-migration \
+  --position before \
+  --models \
+  --exclude tests,fixtures