diff --git a/orbit/Containerfile b/orbit/Containerfile
index acc4f0cb..2046925f 100644
--- a/orbit/Containerfile
+++ b/orbit/Containerfile
@@ -51,6 +51,10 @@ COPY --from=build /var/git /var/git
 
 COPY cgitrc /etc/cgitrc
 
+RUN chown -R 100:100 /orbit /radius-venv /var/orbit /var/git
+
+USER 100:100
+
 EXPOSE 9098
 
 CMD /bin/sh -c "source /radius-venv/bin/activate && uwsgi /orbit/radius.ini"
diff --git a/pop/Containerfile b/pop/Containerfile
index bf3f9dcd..eab34eb5 100644
--- a/pop/Containerfile
+++ b/pop/Containerfile
@@ -21,6 +21,8 @@ VOLUME /mnt/mail
 COPY --from=build /tcp_server/tcp_server /usr/local/bin/tcp_server
 COPY --from=build /pop/pop3 /usr/local/bin/pop3
 
+USER 100:100
+
 ARG LISTEN_PORT=995
 EXPOSE ${LISTEN_PORT}
 ENTRYPOINT ["/usr/local/bin/tcp_server", "/usr/local/bin/pop3", "pop3", "/mnt/email_data/mail"]
diff --git a/smtp/Containerfile b/smtp/Containerfile
index 7b18eebc..2a27300d 100644
--- a/smtp/Containerfile
+++ b/smtp/Containerfile
@@ -15,15 +15,19 @@ RUN test -n "$hostname" || (echo 'hostname is not set' && false)
 
 RUN make -C /smtp CC='clang -static' SRVNAME=$hostname
 
-RUN mkdir -p /mnt/email_data/mail /mnt/email_data/logs
+RUN mkdir -p /mnt/email_data/mail /mnt/email_data/logs && \
+	chown -R 100:100 /mnt/email_data && \
+	:
 
 FROM scratch as smtp
 
-COPY --from=build /mnt/email_data /mnt/email_data
+COPY --from=build /mnt /mnt
 VOLUME /mnt/email_data/
 COPY --from=build /tcp_server/tcp_server /usr/local/bin/tcp_server
 COPY --from=build /smtp/smtp /usr/local/bin/smtp
 
+USER 100:100
+
 ARG LISTEN_PORT=465
 EXPOSE ${LISTEN_PORT}
 ENTRYPOINT ["/usr/local/bin/tcp_server", "/usr/local/bin/smtp", "smtp", "/mnt/email_data"]
diff --git a/test.sh b/test.sh
index 8ba7dc0f..0c336b61 100755
--- a/test.sh
+++ b/test.sh
@@ -78,42 +78,42 @@ ${DOCKER} volume export singularity_orbit-db > test/orbit_orig.tar
 # Import an empty orbit db with no users or sessions
 xxd -r <<- 'EOF' | gunzip | ${DOCKER} volume import singularity_orbit-db -
 00000000: 1f8b 0800 0000 0000 0003 edda 4d4f db30  ............MO.0
-00000010: 18c0 f104 4adf a452 7a98 7242 f371 9510  ....J..Rz.rB.q..
-00000020: 24a5 eb65 9a34 867a 40eb bad1 b507 4e55  $..e.4.z@.....NU
-00000030: 503d 88a0 298b 5301 47f8 28fb 3ed3 0efb  P=..).S.G.(.>...
-00000040: 323b cec9 30a2 4c6c 9db6 6a5a f4ff 4989  2;..0.Ll..jZ..I.
-00000050: 9dc4 b1fc 3c71 0f96 3b89 0e83 7873 7468  ....<q..;...xsth
-00000060: 2d90 abb5 9acd b4d4 664b cf4b eb5e b3e5  -.......fK.K.^..
-00000070: 365a 0db7 d9dc b65c cf6d b5b6 2de1 2e72  6Z.....\.m..-..r
-00000080: 50c6 54c5 7ea4 87f2 a7fd dc0f ee3f f16e  P.T.~........?.n
-00000090: bf13 c452 bc9f 4463 3f16 dbd6 9a65 dbd6  ...R..Dc?....e..
-000000a0: 0b21 f423 5b1f a53b 4d97 f591 bb73 6dcf  .!.#[..;M....sm.
-000000b0: d1bd 6d6d 461f 2bd5 af56 b152 b3aa 4fab  ..mmF.+..V.R..O.
-000000c0: 9f56 bd6a 6ef5 4ba5 b66a 553e ffc5 3000  .V.jn.K..jU>..0.
-000000d0: 0000 00e0 f75d 3dcb 179c f575 fb7a 2ff6  .....]=....u.z/.
-000000e0: 0f4f 6528 cfa7 4a46 ca94 85dd 5e7b a7df  .Oe(..JF....^{..
-000000f0: 16fd 9d97 9db6 3077 c593 7229 9247 818a  ......0w..r).G..
-00000100: 233f 0e26 e130 1889 208c e591 8cc4 5914  #?.&.0.. .....Y.
-00000110: 8cfd e852 9cc8 cb8d 7249 c5d3 910c e3a4  ...R....rI......
-00000120: 816e 1c84 4762 d0dd db1f b445 f74d 5f74  .n..Gb.....E.M_t
-00000130: 079d 8e6e 9374 19fa 63f9 708b 335f a9f3  ...n.t..c.p.3_..
-00000140: 4974 db87 7954 df2a e69d dd75 db0a c291  It..yT.*...u....
-00000150: bc50 1f4e f5da 6ee8 4fe3 497a 3d34 c31d  .P.N..n.O.Iz=4..
-00000160: 364c adb4 5598 eb05 cfd4 8a57 8f97 bfe7  6L..U......W....
-00000170: a796 e647 49a5 74c0 ca94 b999 fc98 bb3a  ...GI.t........:
-00000180: 3fe2 463c 3991 a119 f7db dede eb9d de81  ?.F<9...........
-00000190: 78d5 3ed8 b86d f1cb f04d 4379 7116 e8c4  x.>..m...MCyq...
-000001a0: fe90 8395 9f85 6486 346c 985a 7e2b 37d7  ......d.4l.Z~+7.
-000001b0: 0b9e a9ad 5c3d b20b 8ee3 d8d7 a534 0769  ....\=.......4.i
-000001c0: 62d2 d3d2 4cf4 b753 e3c1 d930 c797 3e1f  b...L..S...0..>.
-000001d0: 1dfb eaf8 7e90 b333 e9a6 f37a 7d29 ef3c  ....~..3...z}).<
-000001e0: 771e 0ae4 e64b a645 b296 2f26 d3bd 929c  w....K.E../&....
-000001f0: d6fe e92f 0e00 0000 0000 2c58 3939 b1fe  .../......,X99..
-00000200: 0700 0000 0020 d3d8 ff07 0000 0000 20fb  ..... ........ .
-00000210: d8ff 0700 0000 0020 fb58 ff03 0000 0000  ....... .X......
-00000220: 907d fcff 1f00 0000 0080 ec63 ff1f 0000  .}.........c....
-00000230: 0000 80ec 63fd 0f00 0000 0000 0064 d737  ....c........d.7
-00000240: bf0b 8b24 0096 0000                      ...$....
+00000010: 18c0 f104 4adf a4b6 f430 e584 e6e3 9010  ....J....0......
+00000020: 4da0 c061 9ab4 0ef5 80d6 7583 b507 4e55  M..a......u...NU
+00000030: 503d 88a0 098b 5301 c7f2 51f6 7da6 1df6  P=....S...Q.}...
+00000040: 6576 5c12 7005 4cdd 3a6d 685a f4ff 49b1  ev\.p.L.:mhZ..I.
+00000050: 9de4 8965 3f71 0f56 1a84 475e b43e 3c32  ...e?q.V..G^.><2
+00000060: 1e91 1ddb 6e36 d3da 7950 db8e 9394 86d3  ....n6..yP......
+00000070: dcb6 3737 eded 1ddb 316c c7de b19b 86b0  ..77....1l......
+00000080: 1f73 50da 5845 6e18 0fe5 4ffb b16f 4ceb  .sP.XEn...O..oL.
+00000090: ffc4 fbfd 8e17 49f1 2108 476e 2436 8d65  ......I.!.Gn$6.e
+000000a0: c334 8d97 42c4 b7cc f828 dd09 5d8c 8fdc  .4..B....(..]...
+000000b0: 9d73 738e ee4d 633d fc54 a97d 338a 95ba  .ss..Mc=.T.}3...
+000000c0: 51db aa7d ae3a b55c f56b a55e 352a 5ffe  Q..}.:.\.k.^5*_.
+000000d0: e234 0000 0000 e0f7 4d9e e70b d6ca 8a79  .4......M......y
+000000e0: bd17 b947 67d2 9717 6325 43a5 ebc2 ee41  ...Gg...c%C....A
+000000f0: bbd5 6b8b 5eeb 55a7 2df4 55f1 ac5c 0ae5  ..k.^.U.-.U..\..
+00000100: b1a7 a2d0 8dbc c01f 7843 e1f9 913c 96a1  ........xC...<..
+00000110: 380f bd91 1b5e 8953 79b5 562e a968 3c94  8....^.Sy.V..h<.
+00000120: 7e94 04c4 c19e 7f2c fadd bdfd 7e5b 74df  ~......,....~[t.
+00000130: f644 b7df e9c4 3149 97be 3b92 b323 ce5d  .D....1I..;..#.]
+00000140: a52e 8270 da87 beb5 da28 e6ad dd15 d3f0  ...p.....(......
+00000150: fca1 bc54 1fcf e2bd ddc0 1d47 417a 3ed0  ...T.......GAz>.
+00000160: c31d 6ce8 56a9 5198 eb01 47b7 8a93 a78b  ..l.V.Q...G.....
+00000170: 37f9 a9a7 f951 52a9 78c2 4ad7 b97b f9d1  7....QR.x.J..{..
+00000180: 57e3 fc88 5b51 702a 7d3d ee77 077b 6f5a  W...[Qp*}=.w.{oZ
+00000190: 0787 e275 fb70 6d1a f1cb e9eb 4079 79ee  ...u.pm.....@yy.
+000001a0: c589 fd21 074b 3f9b 921e d260 43b7 f28d  ...!.K?....`C...
+000001b0: dc5c 0f38 bab5 3479 6216 2ccb 32af 4b69  .\.8..4yb.,.2.Ki
+000001c0: 0ed2 c4a4 c5c2 bdd9 4f97 c6cc d530 c79b  ........O....0..
+000001d0: be18 9eb8 eae4 e124 efaf a4db ce57 5717  .......$.....WW.
+000001e0: f2d6 0b6b d644 6edf 645a 257b f962 b2dc  ...k.Dn.dZ%{.b..
+000001f0: 2b49 b1fc 4f7f 7100 0000 0000 e091 9593  +I..O.q.........
+00000200: 82fd 3f00 0000 0000 99c6 f77f 0000 0000  ..?.............
+00000210: 00b2 8fef ff00 0000 0000 641f fb7f 0000  ..........d.....
+00000220: 0000 00b2 8fff ff03 0000 0000 907d 7cff  .............}|.
+00000230: 0700 0000 0020 fbd8 ff03 0000 0000 0000  ..... ..........
+00000240: d9f5 1df3 6b21 9400 9600 00              ....k!.....
 EOF
 
 # Restore the old orbit db after testing completes
