diff --git a/src/api-gateways/DevStore.Bff.Checkout/Dockerfile b/src/api-gateways/DevStore.Bff.Checkout/Dockerfile
index ac2b71f..5beac37 100644
--- a/src/api-gateways/DevStore.Bff.Checkout/Dockerfile
+++ b/src/api-gateways/DevStore.Bff.Checkout/Dockerfile
@@ -22,4 +22,9 @@ RUN dotnet publish "DevStore.Bff.Checkout.csproj" -c Release -o /app/publish
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DevStore.Bff.Checkout.dll"]
\ No newline at end of file
+
+# Set a non-root user for running the application
+RUN useradd -r -u 1001 appuser
+USER appuser
+
+ENTRYPOINT ["dotnet", "DevStore.Bff.Checkout.dll"]
diff --git a/src/services/DevStore.Billing.API/Dockerfile b/src/services/DevStore.Billing.API/Dockerfile
index bd46db6..18a98c8 100644
--- a/src/services/DevStore.Billing.API/Dockerfile
+++ b/src/services/DevStore.Billing.API/Dockerfile
@@ -23,4 +23,9 @@ RUN dotnet publish "DevStore.Billing.API.csproj" -c Release -o /app/publish
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DevStore.Billing.API.dll"]
\ No newline at end of file
+
+# Set a non-root user for running the application
+RUN useradd -r -u 1001 appuser
+USER appuser
+
+ENTRYPOINT ["dotnet", "DevStore.Billing.API.dll"]
diff --git a/src/services/DevStore.Catalog.API/Dockerfile b/src/services/DevStore.Catalog.API/Dockerfile
index 689f9ae..7a5ca4a 100644
--- a/src/services/DevStore.Catalog.API/Dockerfile
+++ b/src/services/DevStore.Catalog.API/Dockerfile
@@ -22,4 +22,9 @@ RUN dotnet publish "DevStore.Catalog.API.csproj" -c Release -o /app/publish
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DevStore.Catalog.API.dll"]
\ No newline at end of file
+
+# Set a non-root user for running the application
+RUN useradd -r -u 1001 appuser
+USER appuser
+
+ENTRYPOINT ["dotnet", "DevStore.Catalog.API.dll"]
diff --git a/src/services/DevStore.Customers.API/Dockerfile b/src/services/DevStore.Customers.API/Dockerfile
index d047944..ee0e1c9 100644
--- a/src/services/DevStore.Customers.API/Dockerfile
+++ b/src/services/DevStore.Customers.API/Dockerfile
@@ -22,4 +22,9 @@ RUN dotnet publish "DevStore.Customers.API.csproj" -c Release -o /app/publish
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DevStore.Customers.API.dll"]
\ No newline at end of file
+
+# Set a non-root user for running the application
+RUN useradd -r -u 1001 appuser
+USER appuser
+
+ENTRYPOINT ["dotnet", "DevStore.Customers.API.dll"]
diff --git a/src/services/DevStore.Orders.API/Dockerfile b/src/services/DevStore.Orders.API/Dockerfile
index cde35e1..ee83bbd 100644
--- a/src/services/DevStore.Orders.API/Dockerfile
+++ b/src/services/DevStore.Orders.API/Dockerfile
@@ -24,4 +24,9 @@ RUN dotnet publish "DevStore.Orders.API.csproj" -c Release -o /app/publish
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DevStore.Orders.API.dll"]
\ No newline at end of file
+
+# Set a non-root user for running the application
+RUN useradd -r -u 1001 appuser
+USER appuser
+
+ENTRYPOINT ["dotnet", "DevStore.Orders.API.dll"]
diff --git a/src/services/DevStore.ShoppingCart.API/Dockerfile b/src/services/DevStore.ShoppingCart.API/Dockerfile
index f4f6ec1..89431cf 100644
--- a/src/services/DevStore.ShoppingCart.API/Dockerfile
+++ b/src/services/DevStore.ShoppingCart.API/Dockerfile
@@ -22,4 +22,9 @@ RUN dotnet publish "DevStore.ShoppingCart.API.csproj" -c Release -o /app/publish
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DevStore.ShoppingCart.API.dll"]
\ No newline at end of file
+
+# Set a non-root user for running the application
+RUN useradd -r -u 1001 appuser
+USER appuser
+
+ENTRYPOINT ["dotnet", "DevStore.ShoppingCart.API.dll"]
diff --git a/src/web/DevStore.WebApp.MVC/Dockerfile b/src/web/DevStore.WebApp.MVC/Dockerfile
index ac192f0..efa466f 100644
--- a/src/web/DevStore.WebApp.MVC/Dockerfile
+++ b/src/web/DevStore.WebApp.MVC/Dockerfile
@@ -21,4 +21,9 @@ RUN dotnet publish "DevStore.WebApp.MVC.csproj" -c Release -o /app/publish
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DevStore.WebApp.MVC.dll"]
\ No newline at end of file
+
+# Set a non-root user for running the application
+RUN useradd -r -u 1001 appuser
+USER appuser
+
+ENTRYPOINT ["dotnet", "DevStore.WebApp.MVC.dll"]
diff --git a/src/web/DevStore.WebApp.Status/Dockerfile b/src/web/DevStore.WebApp.Status/Dockerfile
index 4289ac9..fbdde35 100644
--- a/src/web/DevStore.WebApp.Status/Dockerfile
+++ b/src/web/DevStore.WebApp.Status/Dockerfile
@@ -21,4 +21,9 @@ RUN dotnet publish "DevStore.WebApp.Status.csproj" -c Release -o /app/publish /p
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DevStore.WebApp.Status.dll"]
\ No newline at end of file
+
+# Set a non-root user for running the application
+RUN useradd -r -u 1001 appuser
+USER appuser
+
+ENTRYPOINT ["dotnet", "DevStore.WebApp.Status.dll"]