diff --git a/plugins/auth-node/src/sign-in/commonSignInResolvers.ts b/plugins/auth-node/src/sign-in/commonSignInResolvers.ts
new file mode 100644
index 0000000000..5b5da07c73
--- /dev/null
+++ b/plugins/auth-node/src/sign-in/commonSignInResolvers.ts
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { createSignInResolverFactory } from './createSignInResolverFactory';
+
+/**
+ * A collection of common sign-in resolvers that work with any auth provider.
+ *
+ * @public
+ */
+export namespace commonSignInResolvers {
+  /**
+   * A common sign-in resolver that looks up the user using their email address
+   * as email of the entity.
+   */
+  export const emailMatchingUserEntityProfileEmail =
+    createSignInResolverFactory({
+      create() {
+        return async (info, ctx) => {
+          const { profile } = info;
+
+          if (!profile.email) {
+            throw new Error(
+              'Login failed, user profile does not contain an email',
+            );
+          }
+
+          return ctx.signInWithCatalogUser({
+            filter: {
+              'spec.profile.email': profile.email,
+            },
+          });
+        };
+      },
+    });
+
+  /**
+   * A common sign-in resolver that looks up the user using the local part of
+   * their email address as the entity name.
+   */
+  export const emailLocalPartMatchingUserEntityName =
+    createSignInResolverFactory({
+      create() {
+        return async (info, ctx) => {
+          const { profile } = info;
+
+          if (!profile.email) {
+            throw new Error(
+              'Login failed, user profile does not contain an email',
+            );
+          }
+          const [localPart] = profile.email.split('@');
+
+          return ctx.signInWithCatalogUser({
+            entityRef: { name: localPart },
+          });
+        };
+      },
+    });
+}
diff --git a/plugins/auth-node/src/sign-in/index.ts b/plugins/auth-node/src/sign-in/index.ts
index a560002e04..736393a762 100644
--- a/plugins/auth-node/src/sign-in/index.ts
+++ b/plugins/auth-node/src/sign-in/index.ts
@@ -23,4 +23,4 @@ export {
   readDeclarativeSignInResolver,
   type ReadDeclarativeSignInResolverOptions,
 } from './readDeclarativeSignInResolver';
-export * as commonSignInResolvers from './resolvers';
+export { commonSignInResolvers } from './commonSignInResolvers';
diff --git a/plugins/auth-node/src/sign-in/resolvers/byEmail.ts b/plugins/auth-node/src/sign-in/resolvers/byEmail.ts
deleted file mode 100644
index 0e087c7c7f..0000000000
--- a/plugins/auth-node/src/sign-in/resolvers/byEmail.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2023 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { createSignInResolverFactory } from '../createSignInResolverFactory';
-
-/**
- * A common sign-in resolver that looks up the user using their email address
- * as email of the entity.
- */
-export const byEmail = createSignInResolverFactory({
-  create() {
-    return async (info, ctx) => {
-      const { profile } = info;
-
-      if (!profile.email) {
-        throw new Error('Login failed, user profile does not contain an email');
-      }
-
-      return ctx.signInWithCatalogUser({
-        filter: {
-          'spec.profile.email': profile.email,
-        },
-      });
-    };
-  },
-});
diff --git a/plugins/auth-node/src/sign-in/resolvers/byEmailLocalPart.ts b/plugins/auth-node/src/sign-in/resolvers/byEmailLocalPart.ts
deleted file mode 100644
index 9328e7d6f7..0000000000
--- a/plugins/auth-node/src/sign-in/resolvers/byEmailLocalPart.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2023 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { createSignInResolverFactory } from '../createSignInResolverFactory';
-
-/**
- * A common sign-in resolver that looks up the user using the local part of
- * their email address as the entity name.
- */
-export const byEmailLocalPart = createSignInResolverFactory({
-  create() {
-    return async (info, ctx) => {
-      const { profile } = info;
-
-      if (!profile.email) {
-        throw new Error('Login failed, user profile does not contain an email');
-      }
-      const [localPart] = profile.email.split('@');
-
-      return ctx.signInWithCatalogUser({
-        entityRef: { name: localPart },
-      });
-    };
-  },
-});
diff --git a/plugins/auth-node/src/sign-in/resolvers/index.ts b/plugins/auth-node/src/sign-in/resolvers/index.ts
deleted file mode 100644
index b3018391f2..0000000000
--- a/plugins/auth-node/src/sign-in/resolvers/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2023 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export { byEmail } from './byEmail';
-export { byEmailLocalPart } from './byEmailLocalPart';