diff --git a/debian/changelog b/debian/changelog
index 8a48db763f..bfb879633e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+gitlab (13.12.3+ds1-6) experimental; urgency=medium
+
+  * Move gem install to start of postinst, before regenerating Gemfile.lock
+    (Closes: #990103)
+
+ -- Pirate Praveen <praveen@debian.org>  Mon, 21 Jun 2021 14:09:44 +0530
+
+gitlab (13.12.3+ds1-5) experimental; urgency=medium
+
+  * Add workaround for #989774 (install google-protobuf from rubygems.org)
+
+ -- Pirate Praveen <praveen@debian.org>  Mon, 21 Jun 2021 01:03:03 +0530
+
 gitlab (13.12.3+ds1-4~fto10+1) buster-fasttrack; urgency=medium
 
   * Rebuild for buster-fasttrack.
diff --git a/debian/gitlab.postinst b/debian/gitlab.postinst
index f4444d9949..6badff21bb 100755
--- a/debian/gitlab.postinst
+++ b/debian/gitlab.postinst
@@ -61,6 +61,11 @@ export GEM_HOME=/var/lib/gitlab/.gem
 # Read gitlab_user from gitlab-common.conf
 test -f ${gitlab_common_conf} && . ${gitlab_common_conf}
 
+# Workaround for #966653
+/usr/bin/gem install -v 1.30.2 grpc
+# Workaround for #989774
+/usr/bin/gem install -v 3.17.1 google-protobuf
+
 #######################################################################
 # update Gemfile.lock and yarn.lock, always
 #######################################################################
diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh
index c86ea66e9b..49200e94d5 100755
--- a/debian/rake-tasks.sh
+++ b/debian/rake-tasks.sh
@@ -8,8 +8,6 @@ export DB RAILS_ENV
 
 cd /usr/share/gitlab
 
-# Workaround for #966653
-/usr/bin/gem install -v 1.30.2 grpc
 # Remove all lines from Gemfile.lock
 runuser -u ${gitlab_user} -- sh -c "touch ${gitlab_data_dir}/Gemfile.lock && \
 truncate -s 0 ${gitlab_data_dir}/Gemfile.lock"