diff --git a/src/app/listings/components/shared/selectors/EmulatorSelector.tsx b/src/app/listings/components/shared/selectors/EmulatorSelector.tsx
index 1176058ca..db06e56c7 100644
--- a/src/app/listings/components/shared/selectors/EmulatorSelector.tsx
+++ b/src/app/listings/components/shared/selectors/EmulatorSelector.tsx
@@ -10,6 +10,7 @@ import {
 } from 'react-hook-form'
 import { GitHubIcon, EmulatorIcon } from '@/components/icons'
 import { Autocomplete } from '@/components/ui'
+import { env } from '@/lib/env'
 import { cn } from '@/lib/utils'
 import { type Nullable } from '@/types/utils'
 import { SelectedItemCard } from '../SelectedItemCard'
@@ -137,7 +138,7 @@ export function EmulatorSelector<TFieldValues extends FieldValues = FieldValues>
                         <strong>{props.selectedGame.system.name}</strong>. Try a different search
                         term, or request to add your emulator by opening a GitHub issue.
                         <a
-                          href="https://github.com/Producdevity/EmuReady/issues/new?template=emulator_request.md"
+                          href={env.GITHUB_REQUEST_EMULATOR_URL}
                           target="_blank"
                           rel="noopener noreferrer"
                           aria-label="Request Emulator on GitHub"
diff --git a/src/lib/env.ts b/src/lib/env.ts
index 23a21c923..06b815593 100644
--- a/src/lib/env.ts
+++ b/src/lib/env.ts
@@ -65,9 +65,9 @@ export const env = {
 
   GITHUB_URL,
   GITHUB_README_URL: `${GITHUB_URL}/blob/master/README.md`,
-  GITHUB_SUPPORT_URL: `${GITHUB_URL}/issues/new?template=question.md`,
+  GITHUB_SUPPORT_URL: `${GITHUB_URL}/issues/new?template=question.yml`,
   GITHUB_CONTRIBUTING_URL: `${GITHUB_URL}/blob/master/CONTRIBUTING.md`,
-  GITHUB_REQUEST_EMULATOR_URL: `${GITHUB_URL}/issues/new?template=emulator_request.md`,
+  GITHUB_REQUEST_EMULATOR_URL: `${GITHUB_URL}/issues/new?template=emulator_request.yml`,
 
   GITHUB_ISSUES_URL: `${GITHUB_URL}/issues`,