diff --git a/src/Sql/dbo/Tables/CollectionGroup.sql b/src/Sql/dbo/Tables/CollectionGroup.sql
index 3c1f414ddb..67e6ccdbf4 100644
--- a/src/Sql/dbo/Tables/CollectionGroup.sql
+++ b/src/Sql/dbo/Tables/CollectionGroup.sql
@@ -16,14 +16,8 @@ CREATE NONCLUSTERED INDEX IX_CollectionGroup_GroupId
 
 GO
 
-IF NOT EXISTS (
-    SELECT 1
-    FROM sys.indexes
-    WHERE object_id = OBJECT_ID('dbo.CollectionGroup')
-        AND name = 'IX_CollectionGroup_GroupId_ReadOnly'
-)
-BEGIN
-    CREATE NONCLUSTERED INDEX IX_CollectionGroup_GroupId_ReadOnly
-      ON dbo.CollectionGroup (GroupId, ReadOnly)
-      INCLUDE (CollectionId);
-END
+CREATE NONCLUSTERED INDEX IX_CollectionGroup_GroupId_ReadOnly
+    ON dbo.CollectionGroup (GroupId, ReadOnly)
+    INCLUDE (CollectionId);
+
+GO
diff --git a/src/Sql/dbo/Tables/CollectionUser.sql b/src/Sql/dbo/Tables/CollectionUser.sql
index b2d3e1265c..2c043efbd3 100644
--- a/src/Sql/dbo/Tables/CollectionUser.sql
+++ b/src/Sql/dbo/Tables/CollectionUser.sql
@@ -16,15 +16,8 @@ CREATE NONCLUSTERED INDEX IX_CollectionUser_OrganizationUserId
 
 GO
 
-IF NOT EXISTS (
-    SELECT 1
-    FROM sys.indexes
-    WHERE object_id = OBJECT_ID('dbo.CollectionUser')
-        AND name = 'IX_CollectionUser_OrganizationUserId_ReadOnly'
-)
-BEGIN
-    CREATE NONCLUSTERED INDEX IX_CollectionUser_OrganizationUserId_ReadOnly
-      ON dbo.CollectionUser (OrganizationUserId, ReadOnly)
-      INCLUDE (CollectionId);
-END
+CREATE NONCLUSTERED INDEX IX_CollectionUser_OrganizationUserId_ReadOnly
+    ON dbo.CollectionUser (OrganizationUserId, ReadOnly)
+    INCLUDE (CollectionId);
+
 GO
diff --git a/src/Sql/dbo/Vault/Tables/SecurityTask.sql b/src/Sql/dbo/Vault/Tables/SecurityTask.sql
index 2d8e207904..188fc57650 100644
--- a/src/Sql/dbo/Vault/Tables/SecurityTask.sql
+++ b/src/Sql/dbo/Vault/Tables/SecurityTask.sql
@@ -21,16 +21,8 @@ CREATE NONCLUSTERED INDEX [IX_SecurityTask_OrganizationId]
     ON [dbo].[SecurityTask]([OrganizationId] ASC) WHERE OrganizationId IS NOT NULL;
 
 GO
+CREATE NONCLUSTERED INDEX IX_SecurityTask_Status_OrgId_CreationDateDesc
+    ON dbo.SecurityTask (Status, OrganizationId, CreationDate DESC)
+    INCLUDE (CipherId, [Type], RevisionDate);
 
-IF NOT EXISTS (
-    SELECT 1
-    FROM sys.indexes
-    WHERE object_id = OBJECT_ID('dbo.SecurityTask')
-        AND name = 'IX_SecurityTask_Status_OrgId_CreationDateDesc'
-)
-BEGIN
-    CREATE NONCLUSTERED INDEX IX_SecurityTask_Status_OrgId_CreationDateDesc
-      ON dbo.SecurityTask (Status, OrganizationId, CreationDate DESC)
-      INCLUDE (CipherId, [Type], RevisionDate);
-END
 GO