diff --git a/packages/effect/src/LayerMap.ts b/packages/effect/src/LayerMap.ts
index eec7659f1bf..093712ac9bc 100644
--- a/packages/effect/src/LayerMap.ts
+++ b/packages/effect/src/LayerMap.ts
@@ -100,8 +100,12 @@ export interface LayerMap<in K, in out I, out S, out E = never> {
  * )
  * ```
  */
-export const make: <I, S, K, L extends Layer.Layer<Exclude<I, Scope.Scope>, any, any>, E = never>(
-  tagOrAccessor: Context.Tag<I, S> | Effect.Effect<S, E, I>,
+export const make: <
+  Accessor extends Context.Tag<any, any> | Effect.Effect<any, any, any>,
+  K,
+  L extends Layer.Layer<Exclude<Effect.Effect.Context<Accessor>, Scope.Scope>, any, any>
+>(
+  tagOrAccessor: Accessor,
   lookup: (key: K) => L,
   options?: {
     readonly idleTimeToLive?: DurationInput | undefined
@@ -109,18 +113,18 @@ export const make: <I, S, K, L extends Layer.Layer<Exclude<I, Scope.Scope>, any,
 ) => Effect.Effect<
   LayerMap<
     K,
-    Exclude<I, Scope.Scope>,
-    S,
-    E | (L extends Layer.Layer<infer _A, infer _E, infer _R> ? _E : never)
+    Exclude<Effect.Effect.Context<Accessor>, Scope.Scope>,
+    Effect.Effect.Success<Accessor>,
+    Effect.Effect.Error<Accessor> | (L extends Layer.Layer<infer _A, infer _E, infer _R> ? _E : never)
   >,
   never,
   Scope.Scope | (L extends Layer.Layer<infer _A, infer _E, infer _R> ? _R : never)
-> = Effect.fnUntraced(function*<I, S, K, L extends Layer.Layer<Exclude<I, Scope.Scope>, any, any>, E = never>(
-  tagOrAccessor: Context.Tag<I, S> | Effect.Effect<S, E, I>,
-  lookup: (key: K) => L,
+> = Effect.fnUntraced(function*<I, S, K, EL, RL, E = never>(
+  tagOrAccessor: Effect.Effect<S, E, I>,
+  lookup: (key: K) => Layer.Layer<Exclude<I, Scope.Scope>, EL, RL>,
   options?: {
     readonly idleTimeToLive?: DurationInput | undefined
-  }
+  } | undefined
 ) {
   const context = yield* Effect.context<never>()
 
@@ -160,12 +164,10 @@ export const make: <I, S, K, L extends Layer.Layer<Exclude<I, Scope.Scope>, any,
  * @category Constructors
  */
 export const fromRecord = <
-  I,
-  S,
-  const Layers extends Record<string, Layer.Layer<Exclude<I, Scope.Scope>, any, any>>,
-  E = never
+  Accessor extends Context.Tag<any, any> | Effect.Effect<any, any, any>,
+  const Layers extends Record<string, Layer.Layer<Exclude<Effect.Effect.Context<Accessor>, Scope.Scope>, any, any>>
 >(
-  tagOrAccessor: Context.Tag<I, S> | Effect.Effect<S, E, I>,
+  tagOrAccessor: Accessor,
   layers: Layers,
   options?: {
     readonly idleTimeToLive?: DurationInput | undefined
@@ -173,9 +175,10 @@ export const fromRecord = <
 ): Effect.Effect<
   LayerMap<
     keyof Layers,
-    Exclude<I, Scope.Scope>,
-    S,
-    E | (Layers[keyof Layers] extends Layer.Layer<infer _A, infer _E, infer _R> ? _E : never)
+    Exclude<Effect.Effect.Context<Accessor>, Scope.Scope>,
+    Effect.Effect.Success<Accessor>,
+    | Effect.Effect.Error<Accessor>
+    | (Layers[keyof Layers] extends Layer.Layer<infer _A, infer _E, infer _R> ? _E : never)
   >,
   never,
   Scope.Scope | (Layers[keyof Layers] extends Layer.Layer<infer _A, infer _E, infer _R> ? _R : never)