diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9c250f732..814d942011 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -147,4 +147,6 @@ significant modifications will be credited to OpenTelemetry Authors.
 * Add HTTP client instrumentation to shippingservice
 ([#610](https://github.com/open-telemetry/opentelemetry-demo/pull/610))
 * Added Kafka, accountingservice and frauddetectionservice for async workflows
-  ([#512](https://github.com/open-telemetry/opentelemetry-demo/pull/457))
+([#512](https://github.com/open-telemetry/opentelemetry-demo/pull/457))
+* Added support for non-root containers
+([#615](https://github.com/open-telemetry/opentelemetry-demo/pull/615))
diff --git a/docker-compose.yml b/docker-compose.yml
index cbb40ecdae..ed242cb28e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -327,7 +327,6 @@ services:
       - JAEGER_SERVICE_PORT
       - JAEGER_SERVICE_HOST
       - ENVOY_PORT
-      - ENVOY_UID=0
     depends_on:
       - frontend
       - featureflagservice
@@ -505,6 +504,7 @@ services:
   ffs_postgres:
     image: postgres:14
     container_name: postgres
+    user: postgres
     deploy:
       resources:
         limits:
@@ -625,6 +625,7 @@ services:
   redis-cart:
     image: redis:alpine
     container_name: redis-cart
+    user: redis
     deploy:
       resources:
         limits:
diff --git a/src/adservice/Dockerfile b/src/adservice/Dockerfile
index 86c2864eb4..1076b5dbd0 100644
--- a/src/adservice/Dockerfile
+++ b/src/adservice/Dockerfile
@@ -30,6 +30,7 @@ WORKDIR /usr/src/app/
 
 COPY --from=builder /usr/src/app/ ./
 ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$version/opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
+RUN chmod 644 /app/opentelemetry-javaagent.jar
 ENV JAVA_TOOL_OPTIONS=-javaagent:/app/opentelemetry-javaagent.jar
 
 EXPOSE ${AD_SERVICE_PORT}
diff --git a/src/emailservice/Dockerfile b/src/emailservice/Dockerfile
index d337f208fb..cc6853ef47 100644
--- a/src/emailservice/Dockerfile
+++ b/src/emailservice/Dockerfile
@@ -2,13 +2,12 @@ FROM ruby:3.1.2-slim
 
 RUN apt-get update -y && apt-get install -y build-essential
 
-COPY Gemfile* ./
-
-RUN bundle install
-
 WORKDIR /email_server
 
 COPY . .
 
+RUN bundle install
+RUN chmod 666 ./Gemfile.lock
+
 EXPOSE ${EMAIL_SERVICE_PORT}
 ENTRYPOINT ["bundle", "exec", "ruby", "email_server.rb"]
diff --git a/src/frauddetectionservice/Dockerfile b/src/frauddetectionservice/Dockerfile
index f729438c30..e08b8078ec 100644
--- a/src/frauddetectionservice/Dockerfile
+++ b/src/frauddetectionservice/Dockerfile
@@ -16,6 +16,7 @@ WORKDIR /usr/src/app/
 
 COPY --from=builder /usr/src/app/build/libs/frauddetectionservice-1.0-all.jar ./
 ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$version/opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
+RUN chmod 644 /app/opentelemetry-javaagent.jar
 ENV JAVA_TOOL_OPTIONS=-javaagent:/app/opentelemetry-javaagent.jar
 
 ENTRYPOINT [ "java", "-jar", "frauddetectionservice-1.0-all.jar" ]
diff --git a/src/frontendproxy/Dockerfile b/src/frontendproxy/Dockerfile
index 21b2796004..455ce8ec92 100644
--- a/src/frontendproxy/Dockerfile
+++ b/src/frontendproxy/Dockerfile
@@ -1,6 +1,8 @@
 FROM envoyproxy/envoy-dev:8c202194ac6a2cb781eb6ce27d924b379b1e787f
 RUN apt-get update && apt-get install -y gettext-base && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-COPY ./src/frontendproxy/envoy.tmpl.yaml /etc/envoy/envoy.tmpl.yaml
+USER envoy
+WORKDIR /home/envoy
+COPY ./src/frontendproxy/envoy.tmpl.yaml envoy.tmpl.yaml
 
-ENTRYPOINT ["/bin/sh", "-c", "envsubst < /etc/envoy/envoy.tmpl.yaml > /etc/envoy/envoy.yaml && envoy -c /etc/envoy/envoy.yaml;"]
+ENTRYPOINT ["/bin/sh", "-c", "envsubst < envoy.tmpl.yaml > envoy.yaml && envoy -c envoy.yaml;"]
diff --git a/src/quoteservice/Dockerfile b/src/quoteservice/Dockerfile
index ff18c846df..780dd7a92e 100644
--- a/src/quoteservice/Dockerfile
+++ b/src/quoteservice/Dockerfile
@@ -20,11 +20,10 @@ COPY --from=build /tmp/vendor/ ./vendor/
 COPY ./src/quoteservice/ /var/www
 
 ENV APACHE_DOCUMENT_ROOT /var/www/public
-RUN sed -ri -e 's|/var/www/html|${APACHE_DOCUMENT_ROOT}|g' /etc/apache2/sites-available/*.conf
-RUN a2enmod rewrite
-RUN echo "ServerName quoteservice" >> /etc/apache2/apache2.conf
+RUN sed -ri -e 's|/var/www/html|${APACHE_DOCUMENT_ROOT}|g' /etc/apache2/sites-available/*.conf \
+    && a2enmod rewrite \
+    && echo "ServerName quoteservice" >> /etc/apache2/apache2.conf \
+    && sed -i "s/80/\$\{QUOTE_SERVICE_PORT\}/g" /etc/apache2/sites-available/000-default.conf /etc/apache2/ports.conf
 
+USER www-data
 EXPOSE ${QUOTE_SERVICE_PORT}
-
-ENTRYPOINT sed -i "s/80/${QUOTE_SERVICE_PORT}/g" /etc/apache2/sites-available/000-default.conf /etc/apache2/ports.conf \
-&& apache2-foreground