diff --git a/packages/amazonq/.changes/next-release/Bug Fix-cca2f62e-6304-43fb-b982-88bdee0c503d.json b/packages/amazonq/.changes/next-release/Bug Fix-cca2f62e-6304-43fb-b982-88bdee0c503d.json
new file mode 100644
index 0000000000..cb95c3cc1b
--- /dev/null
+++ b/packages/amazonq/.changes/next-release/Bug Fix-cca2f62e-6304-43fb-b982-88bdee0c503d.json	
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Inline suggestions are now provided in Docker Compose files, which VS Code identifies with the `dockercompose` language id"
+}
diff --git a/packages/amazonq/test/unit/codewhisperer/util/runtimeLanguageContext.test.ts b/packages/amazonq/test/unit/codewhisperer/util/runtimeLanguageContext.test.ts
index 9d2dbf7954..691405d2c6 100644
--- a/packages/amazonq/test/unit/codewhisperer/util/runtimeLanguageContext.test.ts
+++ b/packages/amazonq/test/unit/codewhisperer/util/runtimeLanguageContext.test.ts
@@ -40,6 +40,7 @@ describe('runtimeLanguageContext', function () {
             ['sql', true],
             ['json', true],
             ['yaml', true],
+            ['dockercompose', true],
             ['tf', true],
             ['dart', true],
             ['lua', true],
@@ -128,6 +129,7 @@ describe('runtimeLanguageContext', function () {
             ['python', 'python'],
             ['javascript', 'javascript'],
             ['typescript', 'typescript'],
+            ['dockercompose', 'yaml'],
             ['javascriptreact', 'jsx'],
             ['typescriptreact', 'tsx'],
             ['csharp', 'csharp'],
diff --git a/packages/core/src/codewhisperer/models/constants.ts b/packages/core/src/codewhisperer/models/constants.ts
index 2dc53f0fdd..32216d3b65 100644
--- a/packages/core/src/codewhisperer/models/constants.ts
+++ b/packages/core/src/codewhisperer/models/constants.ts
@@ -110,6 +110,7 @@ export const platformLanguageIds = [
     'golang', // Cloud9 reports Go files with this language-id
     'json',
     'yaml',
+    'dockercompose', // VS Code reports docker-compose files with this language-id; treat as YAML.
     'tf',
     'hcl',
     'terraform',
diff --git a/packages/core/src/codewhisperer/util/runtimeLanguageContext.ts b/packages/core/src/codewhisperer/util/runtimeLanguageContext.ts
index b87db0a65e..8f9f29bb9e 100644
--- a/packages/core/src/codewhisperer/util/runtimeLanguageContext.ts
+++ b/packages/core/src/codewhisperer/util/runtimeLanguageContext.ts
@@ -102,6 +102,9 @@ export class RuntimeLanguageContext {
             typescriptreact: 'tsx',
             yml: 'yaml',
             yaml: 'yaml',
+            // VS Code assigns docker-compose files the 'dockercompose' language-id
+            // instead of 'yaml'; map it so completions are provided as YAML.
+            dockercompose: 'yaml',
             dart: 'dart',
             lua: 'lua',
             powershell: 'powershell',