diff --git a/llama_stack/templates/fireworks/fireworks.py b/llama_stack/templates/fireworks/fireworks.py
index 5af4b08cc..8add75f7d 100644
--- a/llama_stack/templates/fireworks/fireworks.py
+++ b/llama_stack/templates/fireworks/fireworks.py
@@ -71,14 +71,6 @@ def get_distribution_template() -> DistributionTemplate:
         )
         for m in MODEL_ALIASES
     ]
-    inference_model = ModelInput(
-        model_id="${env.INFERENCE_MODEL}",
-        provider_id="fireworks",
-    )
-    safety_model = ModelInput(
-        model_id="${env.SAFETY_MODEL}",
-        provider_id="fireworks",
-    )
     embedding_model = ModelInput(
         model_id="all-MiniLM-L6-v2",
         provider_id="sentence-transformers",
@@ -133,6 +125,11 @@ def get_distribution_template() -> DistributionTemplate:
                             provider_type="inline::llama-guard",
                             config={},
                         ),
+                        Provider(
+                            provider_id="llama-guard-vision",
+                            provider_type="inline::llama-guard",
+                            config={},
+                        ),
                         Provider(
                             provider_id="code-scanner",
                             provider_type="inline::code-scanner",
@@ -141,15 +138,18 @@ def get_distribution_template() -> DistributionTemplate:
                     ],
                 },
                 default_models=[
-                    inference_model,
-                    safety_model,
+                    *default_models,
                     embedding_model,
                 ],
                 default_shields=[
                     ShieldInput(
-                        shield_id="${env.SAFETY_MODEL}",
+                        shield_id="meta-llama/Llama-Guard-3-8B",
                         provider_id="llama-guard",
                     ),
+                    ShieldInput(
+                        shield_id="meta-llama/Llama-Guard-3-11B-Vision",
+                        provider_id="llama-guard-vision",
+                    ),
                     ShieldInput(
                         shield_id="CodeScanner",
                         provider_id="code-scanner",
diff --git a/llama_stack/templates/fireworks/run-with-safety.yaml b/llama_stack/templates/fireworks/run-with-safety.yaml
index 58cdce85d..a279ab820 100644
--- a/llama_stack/templates/fireworks/run-with-safety.yaml
+++ b/llama_stack/templates/fireworks/run-with-safety.yaml
@@ -33,6 +33,9 @@ providers:
   - provider_id: llama-guard
     provider_type: inline::llama-guard
     config: {}
+  - provider_id: llama-guard-vision
+    provider_type: inline::llama-guard
+    config: {}
   - provider_id: code-scanner
     provider_type: inline::code-scanner
     config: {}
@@ -97,52 +100,52 @@ models:
 - metadata: {}
   model_id: meta-llama/Llama-3.1-8B-Instruct
   provider_id: fireworks
-  provider_model_id: fireworks/llama-v3p1-8b-instruct
+  provider_model_id: accounts/fireworks/models/llama-v3p1-8b-instruct
   model_type: llm
 - metadata: {}
   model_id: meta-llama/Llama-3.1-70B-Instruct
   provider_id: fireworks
-  provider_model_id: fireworks/llama-v3p1-70b-instruct
+  provider_model_id: accounts/fireworks/models/llama-v3p1-70b-instruct
   model_type: llm
 - metadata: {}
   model_id: meta-llama/Llama-3.1-405B-Instruct-FP8
   provider_id: fireworks
-  provider_model_id: fireworks/llama-v3p1-405b-instruct
+  provider_model_id: accounts/fireworks/models/llama-v3p1-405b-instruct
   model_type: llm
 - metadata: {}
   model_id: meta-llama/Llama-3.2-1B-Instruct
   provider_id: fireworks
-  provider_model_id: fireworks/llama-v3p2-1b-instruct
+  provider_model_id: accounts/fireworks/models/llama-v3p2-1b-instruct
   model_type: llm
 - metadata: {}
   model_id: meta-llama/Llama-3.2-3B-Instruct
   provider_id: fireworks
-  provider_model_id: fireworks/llama-v3p2-3b-instruct
+  provider_model_id: accounts/fireworks/models/llama-v3p2-3b-instruct
   model_type: llm
 - metadata: {}
   model_id: meta-llama/Llama-3.2-11B-Vision-Instruct
   provider_id: fireworks
-  provider_model_id: fireworks/llama-v3p2-11b-vision-instruct
+  provider_model_id: accounts/fireworks/models/llama-v3p2-11b-vision-instruct
   model_type: llm
 - metadata: {}
   model_id: meta-llama/Llama-3.2-90B-Vision-Instruct
   provider_id: fireworks
-  provider_model_id: fireworks/llama-v3p2-90b-vision-instruct
+  provider_model_id: accounts/fireworks/models/llama-v3p2-90b-vision-instruct
   model_type: llm
 - metadata: {}
   model_id: meta-llama/Llama-3.3-70B-Instruct
   provider_id: fireworks
-  provider_model_id: fireworks/llama-v3p3-70b-instruct
+  provider_model_id: accounts/fireworks/models/llama-v3p3-70b-instruct
   model_type: llm
 - metadata: {}
   model_id: meta-llama/Llama-Guard-3-8B
   provider_id: fireworks
-  provider_model_id: fireworks/llama-guard-3-8b
+  provider_model_id: accounts/fireworks/models/llama-guard-3-8b
   model_type: llm
 - metadata: {}
   model_id: meta-llama/Llama-Guard-3-11B-Vision
   provider_id: fireworks
-  provider_model_id: fireworks/llama-guard-3-11b-vision
+  provider_model_id: accounts/fireworks/models/llama-guard-3-11b-vision
   model_type: llm
 - metadata:
     embedding_dimension: 384
@@ -152,6 +155,8 @@ models:
 shields:
 - shield_id: meta-llama/Llama-Guard-3-8B
   provider_id: llama-guard
+- shield_id: meta-llama/Llama-Guard-3-11B-Vision
+  provider_id: llama-guard-vision
 - shield_id: CodeScanner
   provider_id: code-scanner
 memory_banks: []
diff --git a/llama_stack/templates/fireworks/run.yaml b/llama_stack/templates/fireworks/run.yaml
index 6c41b3ed7..79fafe66c 100644
--- a/llama_stack/templates/fireworks/run.yaml
+++ b/llama_stack/templates/fireworks/run.yaml
@@ -47,7 +47,7 @@ providers:
     config:
       service_name: ${env.OTEL_SERVICE_NAME:llama-stack}
       sinks: ${env.TELEMETRY_SINKS:console,sqlite}
-      sqlite_db_path: ${env.SQLITE_DB_PATH:~/.llama/distributions/accounts/fireworks/models/trace_store.db}
+      sqlite_db_path: ${env.SQLITE_DB_PATH:~/.llama/distributions/fireworks/trace_store.db}
   eval:
   - provider_id: meta-reference
     provider_type: inline::meta-reference