diff --git a/Dockerfile b/Dockerfile
index 39bfde2..4789099 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,6 +49,9 @@ COPY --from=builder --chown=1001:1001 /app/.next/static ./.next/static
 
 USER nextjs
 
+ARG STRAPI_URL=http://localhost:1337
+ARG STRAPI_TOKEN=TOKEN
+
 EXPOSE 3000
 
 ENV PORT 3000
diff --git a/src/templates/Services.tsx b/src/templates/Services.tsx
index cb578eb..b22a3b1 100644
--- a/src/templates/Services.tsx
+++ b/src/templates/Services.tsx
@@ -35,23 +35,23 @@ interface SectionStruct {
 
 export default function Services({language, data}: Props) {
 	const struct: SectionStruct[] = [
-		...data.ModuleEvaluation.map((module, index) => ({
+		...(data.ModuleEvaluation?.map((module, index) => ({
 			id: index.toString(),
 			description: module.Text,
 			title: module.Title,
 			bullets: [
 				{
 					title: module.Evaluation,
-					values: module.EvaluationValues.split("\n"),
+					values: module.EvaluationValues?.split("\n"),
 					icon: BsIcon[module.EvaluationIcon as keyof typeof BsIcon],
 				},
 				{
 					title: module.Acquire,
-					values: module.AcquireValues.split("\n"),
+					values: module.AcquireValues?.split("\n"),
 					icon: BsIcon[module.AcquireIcon as keyof typeof BsIcon],
 				},
 			],
-		})),
+		})) || []),
 		{
 			id: "progress_tracking",
 			title: data.ProgressTracking.Title,
@@ -59,7 +59,7 @@ export default function Services({language, data}: Props) {
 			bullets: [
 				{
 					title: data.ProgressTracking.Advantages,
-					values: data.ProgressTracking.AdvantageValues.split("\n"),
+					values: data.ProgressTracking.AdvantageValues?.split("\n"),
 					icon: BsFileBarGraph,
 				},
 			],
@@ -74,7 +74,7 @@ export default function Services({language, data}: Props) {
 			bullets: [
 				{
 					title: data.UnifiedEnglishLevelTest.Advantages,
-					values: data.UnifiedEnglishLevelTest.AdvantageValues.split("\n"),
+					values: data.UnifiedEnglishLevelTest.AdvantageValues?.split("\n"),
 					icon: BsBank,
 				},
 			],
@@ -108,7 +108,7 @@ export default function Services({language, data}: Props) {
 								<div className="flex flex-col gap-2">
 									<span className="text-lg font-bold text-mti-rose-light">{bullet.title}</span>
 									<ul className="list-disc gap-2 flex flex-col">
-										{bullet.values.map((value) => (
+										{bullet.values?.map((value) => (
 											<li key={value}>{value}</li>
 										))}
 									</ul>