diff --git a/src/Hangfire.PostgreSql/Scripts/Install.v22.sql b/src/Hangfire.PostgreSql/Scripts/Install.v22.sql
new file mode 100644
index 0000000..55f06fe
--- /dev/null
+++ b/src/Hangfire.PostgreSql/Scripts/Install.v22.sql
@@ -0,0 +1,13 @@
+SET search_path = 'hangfire';
+
+DO $$
+BEGIN
+    IF EXISTS(SELECT 1 FROM "schema" WHERE "version"::integer >= 22) THEN
+        RAISE EXCEPTION 'version-already-applied';
+END IF;
+END $$;
+
+DROP INDEX IF EXISTS jobqueue_queue_fetchat_jobId;
+CREATE INDEX IF NOT EXISTS ix_hangfire_jobqueue_fetchedat_queue_jobid ON jobqueue USING btree (fetchedat nulls first, queue, jobid);
+
+RESET search_path;
diff --git a/tests/Hangfire.PostgreSql.Tests/PostgreSqlInstallerFacts.cs b/tests/Hangfire.PostgreSql.Tests/PostgreSqlInstallerFacts.cs
index b7beb75..1fb173a 100644
--- a/tests/Hangfire.PostgreSql.Tests/PostgreSqlInstallerFacts.cs
+++ b/tests/Hangfire.PostgreSql.Tests/PostgreSqlInstallerFacts.cs
@@ -20,7 +20,7 @@ public void InstallingSchemaUpdatesVersionAndShouldNotThrowAnException()
           PostgreSqlObjectsInstaller.Install(connection, schemaName);
 
           int lastVersion = connection.Query<int>($@"SELECT version FROM ""{schemaName}"".""schema""").Single();
-          Assert.Equal(21, lastVersion);
+          Assert.Equal(22, lastVersion);
 
           connection.Execute($@"DROP SCHEMA ""{schemaName}"" CASCADE;");
         });
@@ -39,7 +39,7 @@ public void InstallingSchemaWithCapitalsUpdatesVersionAndShouldNotThrowAnExcepti
           PostgreSqlObjectsInstaller.Install(connection, schemaName);
 
           int lastVersion = connection.Query<int>($@"SELECT version FROM ""{schemaName}"".""schema""").Single();
-          Assert.Equal(21, lastVersion);
+          Assert.Equal(22, lastVersion);
 
           connection.Execute($@"DROP SCHEMA ""{schemaName}"" CASCADE;");
         });