diff --git a/app/workers/pages_worker.rb b/app/workers/pages_worker.rb
index c51ec81c9daa48ffcbd030342853f80824dc43b6..59f4b4f16f407b66c0d0473c6e8978a787c498e5 100644
--- a/app/workers/pages_worker.rb
+++ b/app/workers/pages_worker.rb
@@ -5,7 +5,7 @@ class PagesWorker
   BLOCK_SIZE = 32.kilobytes
   MAX_SIZE = 1.terabyte
 
-  sidekiq_options queue: :pages
+  sidekiq_options queue: :pages, retry: false
 
   def perform(build_id)
     @build_id = build_id
@@ -44,25 +44,17 @@ def perform(build_id)
 
       FileUtils.mkdir_p(pages_path)
 
-      # Lock file for time of deployment to prevent the two processes from doing the concurrent deployment
-      File.open(lock_path, File::RDWR|File::CREAT, 0644) do |f|
-        f.flock(File::LOCK_EX)
-        return unless valid?
-
-        # Do atomic move of pages
-        # Move and removal may not be atomic, but they are significantly faster then extracting and removal
-        # 1. We move deployed public to previous public path (file removal is slow)
-        # 2. We move temporary public to be deployed public
-        # 3. We remove previous public path
-        if File.exists?(public_path)
-          FileUtils.move(public_path, previous_public_path)
-        end
-        FileUtils.move(temp_public_path, public_path)
-      end
-
-      if File.exists?(previous_public_path)
-        FileUtils.rm_r(previous_public_path, force: true)
-      end
+      # Ignore deployment if the HEAD changed when we were extracting the archive
+      return unless valid?
+
+      # Do atomic move of pages
+      # Move and removal may not be atomic, but they are significantly faster then extracting and removal
+      # 1. We move deployed public to previous public path (file removal is slow)
+      # 2. We move temporary public to be deployed public
+      # 3. We remove previous public path
+      FileUtils.move(public_path, previous_public_path, force: true)
+      FileUtils.move(temp_public_path, public_path)
+      FileUtils.rm_r(previous_public_path, force: true)
 
       @status.success
     end