diff --git a/debian/changelog b/debian/changelog
index 8779ba5b73..18dfe52665 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gitlab (13.0.6-2) experimental; urgency=medium
+
+  * Switch to using structure.sql from schema.rb for database initialization
+  * Add rack-timeout gem to Gemfile
+  * Relax dependency on ruby-grape-entity
+
+ -- Pirate Praveen <praveen@debian.org>  Sat, 27 Jun 2020 23:07:50 +0530
+
 gitlab (13.0.6-1+fto10+1) buster-fasttrack; urgency=medium
 
   * Rebuild for buster-fasttrack.
diff --git a/debian/control b/debian/control
index 5026642ed1..04397f0b22 100644
--- a/debian/control
+++ b/debian/control
@@ -99,7 +99,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby-grape (>= 1.3.3~),
 # https://gitlab.com/gitlab-org/gitlab/-/issues/219623
    ruby-rack-timeout,
- ruby-grape-entity (>= 0.7.1~),
+ ruby-grape-entity (>= 0.8.0~),
  ruby-rack-cors (>= 1.0.6~),
 # GraphQL API
  ruby-graphql (>= 1.10.5~),
diff --git a/debian/gitlab.postinst b/debian/gitlab.postinst
index b770cd0118..26b419fafc 100755
--- a/debian/gitlab.postinst
+++ b/debian/gitlab.postinst
@@ -129,9 +129,6 @@ case "$1" in
     # Make yarn.lock writable
     chown ${gitlab_user}: /var/lib/gitlab/yarn.lock
 
-    # Make db/structure.sql writable
-    chown ${gitlab_user}: /var/lib/gitlab/db/structure.sql
-
     runuser -u ${gitlab_user} -- sh -c "chmod 700 ${gitlab_uploads_path}"
     runuser -u ${gitlab_user} -- sh -c 'git config --global core.autocrlf "input"'
 
diff --git a/debian/patches/0770-add-rack-timeout.patch b/debian/patches/0770-add-rack-timeout.patch
new file mode 100644
index 0000000000..6b80080df1
--- /dev/null
+++ b/debian/patches/0770-add-rack-timeout.patch
@@ -0,0 +1,18 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -80,7 +80,6 @@
+ 
+ # API
+ gem 'grape', '~> 1.3', '>= 1.3.3'
+-gem 'rack-timeout'
+ gem 'grape-entity', '~> 0.7.1'
+ gem 'rack-cors', '~> 1.0', '>= 1.0.6', require: 'rack/cors'
+ 
+@@ -160,6 +159,7 @@
+ 
+ # Application server
+ gem 'rack', '~> 2.0', '>= 2.0.9'
++gem 'rack-timeout', require: false
+ 
+ group :unicorn do
+   gem 'unicorn', '~> 5.5'
diff --git a/debian/patches/0780-relax-grape-entity.patch b/debian/patches/0780-relax-grape-entity.patch
new file mode 100644
index 0000000000..96ccb72709
--- /dev/null
+++ b/debian/patches/0780-relax-grape-entity.patch
@@ -0,0 +1,11 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -80,7 +80,7 @@
+ 
+ # API
+ gem 'grape', '~> 1.3', '>= 1.3.3'
+-gem 'grape-entity', '~> 0.7.1'
++gem 'grape-entity', '~> 0.8.0'
+ gem 'rack-cors', '~> 1.0', '>= 1.0.6', require: 'rack/cors'
+ 
+ # GraphQL API
diff --git a/debian/patches/series b/debian/patches/series
index 3ecc7e166f..d48f701c27 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,4 +24,6 @@
 0741-add-graphql-tag.patch
 0750-fix-relative-paths.patch
 0760-update-grape.patch
+0770-add-rack-timeout.patch
+0780-relax-grape-entity.patch
 0790-protobuf-compat.patch
diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh
index 7520014dcd..17af885b08 100755
--- a/debian/rake-tasks.sh
+++ b/debian/rake-tasks.sh
@@ -13,13 +13,13 @@ db_relations="$(LANG=C runuser -u postgres -- sh -c "psql gitlab_production -c \
 if [ "$db_relations" = "No relations found." ] || \
   [ "$db_relations" = "Did not find any relations." ]; then
   echo "Initializing database..."
-  test -f ${gitlab_home}/db/schema.rb || \
+  test -f ${gitlab_home}/db/structure.sql || \
   runuser -u ${gitlab_user} -- sh -c \
-  "cp ${gitlab_data_dir}/db/schema.rb.template ${gitlab_data_dir}/db/schema.rb"
+  "cp ${gitlab_data_dir}/db/structure.sql.template ${gitlab_data_dir}/db/structure.sql"
   runuser -u ${gitlab_user} -- sh -c \
   "touch ${gitlab_data_dir}/.gitlab_shell_secret"
   runuser -u ${gitlab_user} -- sh -c 'touch /var/lib/gitlab/secrets.yml'
-  runuser -u ${gitlab_user} -- sh -c '/usr/bin/bundle exec rake db:schema:load'
+  runuser -u ${gitlab_user} -- sh -c '/usr/bin/bundle exec rake db:structure:load'
 else
   echo "gitlab_production database is not empty, skipping gitlab setup"
 fi
@@ -31,6 +31,7 @@ chmod 0700 ${gitlab_data_dir}/.gitlab_shell_secret
 
 echo "Installing node modules..."
 runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/.node_modules'
+runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/.cache'
 runuser -u ${gitlab_user} -- sh -c 'yarnpkg install'
 # Remove write permissions of .yarn-metadata.json files
 runuser -u ${gitlab_user} -- sh -c 'test -d "/var/lib/gitlab/.cache/yarn/v6" && find /var/lib/gitlab/.cache/yarn/v6/ -name .yarn-metadata.json -perm -a=w -exec chmod 644 {} \;'
diff --git a/debian/rules b/debian/rules
index 0d8fea1c5f..d5baee8968 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ override_dh_install:
 	find debian/gitlab/usr/share/gitlab/ -name .eslintrc.yml -delete
 	mv debian/gitlab/usr/share/gitlab/app/assets/javascripts/locale \
 	debian/gitlab/usr/share/gitlab/app/assets/javascripts/locale.static
-	mv debian/gitlab/var/lib/gitlab/db/schema.rb debian/gitlab/var/lib/gitlab/db/schema.rb.template
+	mv debian/gitlab/var/lib/gitlab/db/structure.sql debian/gitlab/var/lib/gitlab/db/structure.sql.template
 	sed -i 's/__NEW_VERSION__/${DEB_VERSION}/g' debian/gitlab/usr/lib/gitlab/templates/gitlab-debian.conf.example
 
 override_dh_installinit: