diff --git a/docker/NBI/Dockerfile b/docker/NBI/Dockerfile
index 49399fb..f128f73 100644
--- a/docker/NBI/Dockerfile
+++ b/docker/NBI/Dockerfile
@@ -62,21 +62,25 @@
 COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
 COPY --from=INSTALL /usr/local/lib/python3.8/dist-packages  /usr/local/lib/python3.8/dist-packages
 
-RUN mkdir -p /app/storage/kafka && mkdir -p /app/log
+# Creating the user for the app
+RUN groupadd -g 1000 appuser && \
+    useradd -u 1000 -g 1000 -d /app appuser && \
+    mkdir -p /app/osm_nbi && \
+    mkdir -p /app/storage/kafka && \
+    mkdir /app/log && \
+    chown -R appuser:appuser /app
 
 WORKDIR /app/osm_nbi
 
+# Changing the security context
+USER appuser
+
 EXPOSE 9999
 
 RUN cp -R /usr/lib/python3/dist-packages/osm_nbi/html_public /app/osm_nbi/html_public
 RUN cp /usr/lib/python3/dist-packages/osm_nbi/nbi.cfg /app/osm_nbi/
 RUN cp -R /usr/lib/python3/dist-packages/osm_nbi/http /app/osm_nbi/
 
-# Used for local storage
-VOLUME /app/storage
-# Used for logs
-VOLUME /app/log
-
 # The following ENV can be added with "docker run -e xxx' to configure
 # server
 ENV OSMNBI_SOCKET_HOST     0.0.0.0
@@ -119,4 +123,3 @@
 
 # Run app.py when the container launches
 CMD python3 -m osm_nbi.nbi
-
diff --git a/installers/docker/osm_pods/nbi.yaml b/installers/docker/osm_pods/nbi.yaml
index 2978082..bbdf645 100644
--- a/installers/docker/osm_pods/nbi.yaml
+++ b/installers/docker/osm_pods/nbi.yaml
@@ -44,6 +44,10 @@
       labels:
         app: nbi
     spec:
+      securityContext:
+        runAsUser: 1000
+        runAsGroup: 1000
+        fsGroup: 1000
       initContainers:
       - name: kafka-mongo-test
         image: alpine:latest
@@ -70,10 +74,3 @@
         envFrom:
         - secretRef:
            name: nbi-secret
-        volumeMounts:
-         - name: osm-packages
-           mountPath: /app/storage
-      volumes:
-       - name: osm-packages
-         hostPath:
-          path: /var/lib/osm/osm_osm_packages/_data