diff --git a/typings/index.d.ts b/typings/index.d.ts
index 0814eb050..bb5a5451e 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -483,8 +483,8 @@ export class Command {
    *
    * @returns `this` command for chaining
    */
-  storeOptionsAsProperties(): this & OptionValues;
-  storeOptionsAsProperties(storeAsProperties: true): this & OptionValues;
+  storeOptionsAsProperties<T extends OptionValues>(): this & T;
+  storeOptionsAsProperties<T extends OptionValues>(storeAsProperties: true): this & T;
   storeOptionsAsProperties(storeAsProperties?: boolean): this;
 
   /**
@@ -594,7 +594,7 @@ export class Command {
   /**
    * Return an object containing options as key-value pairs
    */
-  opts(): OptionValues;
+  opts<T extends OptionValues>(): T;
 
   /**
    * Set the description.
diff --git a/typings/index.test-d.ts b/typings/index.test-d.ts
index bc45289ee..53f79b165 100644
--- a/typings/index.test-d.ts
+++ b/typings/index.test-d.ts
@@ -196,6 +196,15 @@ expectType<commander.OptionValues>(opts);
 expectType(opts.foo);
 expectType(opts['bar']);
 
+// opts with generics
+interface MyCheeseOption {
+  cheese: string;
+}
+const myCheeseOption = program.opts<MyCheeseOption>();
+expectType<string>(myCheeseOption.cheese);
+// @ts-expect-error Check that options strongly typed and does not allow arbitrary properties
+expectType(myCheeseOption.foo);
+
 // description
 expectType<commander.Command>(program.description('my description'));
 expectType<string>(program.description());