diff --git a/docker/suricata/Dockerfile b/docker/suricata/Dockerfile
index 007e9d65..dac3172d 100644
--- a/docker/suricata/Dockerfile
+++ b/docker/suricata/Dockerfile
@@ -1,7 +1,7 @@
-FROM alpine:3.15
+FROM alpine:edge
 #
 # Include dist
-ADD dist/ /root/dist/
+COPY dist/ /root/dist/
 #
 # Install packages
 RUN apk -U --no-cache add \
@@ -16,16 +16,18 @@ RUN apk -U --no-cache add \
 # Setup user, groups and configs
     addgroup -g 2000 suri && \
     adduser -S -H -u 2000 -D -g 2000 suri && \
-    chmod 644 /etc/suricata/*.config && \
     cp /root/dist/*.yaml /etc/suricata/ && \
     cp /root/dist/*.conf /etc/suricata/ && \
     cp /root/dist/*.bpf /etc/suricata/ && \
+    cp /root/dist/update.sh /usr/bin/ && \
+    chmod 644 /etc/suricata/*.config && \
+    chmod 755 -R /var/lib/suricata && \
+    chmod 755 /usr/bin/update.sh && \
+    chown -R root:suri /tmp /run && \
 #
 # Download the latest EmergingThreats OPEN ruleset
-    cp /root/dist/update.sh /usr/bin/ && \
-    chmod 755 /usr/bin/update.sh && \
     suricata-update update-sources && \
-    suricata-update --no-reload && \
+    suricata-update --no-test --no-reload && \
 #
 # Clean up
     rm -rf /root/* && \
diff --git a/docker/suricata/dist/suricata.yaml b/docker/suricata/dist/suricata.yaml
index 0bf81036..bb523417 100644
--- a/docker/suricata/dist/suricata.yaml
+++ b/docker/suricata/dist/suricata.yaml
@@ -988,9 +988,9 @@ asn1-max-frames: 256
 ##
 
 # Run Suricata with a specific user-id and group-id:
-#run-as:
-#  user: suri
-#  group: suri
+run-as:
+  user: suri
+  group: suri
 
 # Some logging modules will use that name in event as identifier. The default
 # value is the hostname