diff --git a/data/database.py b/data/database.py
index 1ae5b14d0..5a6c746b0 100644
--- a/data/database.py
+++ b/data/database.py
@@ -452,7 +452,7 @@ class User(BaseModel):
                                  TagManifest, AccessToken, OAuthAccessToken, BlobUpload,
                                  RepositoryNotification, OAuthAuthorizationCode,
                                  RepositoryActionCount, TagManifestLabel, Tag,
-                                 ManifestLabel, BlobUploading}
+                                 ManifestLabel, BlobUploading} | beta_classes
 
       delete_instance_filtered(self, User, delete_nullable, skip_transitive_deletes)
 
@@ -571,7 +571,7 @@ class Repository(BaseModel):
     # These models don't need to use transitive deletes, because the referenced objects
     # are cleaned up directly
     skip_transitive_deletes = {RepositoryTag, RepositoryBuild, RepositoryBuildTrigger, BlobUpload,
-                               Image, TagManifest, TagManifestLabel, Label, DerivedStorageForImage}
+                               Image, TagManifest, TagManifestLabel, Label, DerivedStorageForImage} | beta_classes
     delete_instance_filtered(self, Repository, delete_nullable, skip_transitive_deletes)