diff --git a/db/post_migrate/20170822101017_migrate_pipeline_sidekiq_queues.rb b/db/post_migrate/20170822101017_migrate_pipeline_sidekiq_queues.rb
new file mode 100644
index 00000000000..48fa3af0c60
--- /dev/null
+++ b/db/post_migrate/20170822101017_migrate_pipeline_sidekiq_queues.rb
@@ -0,0 +1,14 @@
+class MigratePipelineSidekiqQueues < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    sidekiq_queue_migrate 'build', to: 'pipeline_default'
+    sidekiq_queue_migrate 'pipeline', to: 'pipeline_default'
+  end
+
+  def down
+    sidekiq_queue_migrate 'pipeline_default', to: 'pipeline'
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 80f8cde1818..d22e8235a09 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170820100558) do
+ActiveRecord::Schema.define(version: 20170822101017) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"