diff --git a/Dockerfile b/Dockerfile
index cb6e3f1..4929152 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,9 +33,10 @@ RUN set -x \
         libxxhash-dev \
         libzstd-dev \
     && apt-get autoremove -y --purge \
+    && userdel -r ubuntu \
     && adduser --uid 500 --disabled-password --gecos "Borg Backup" --quiet borg \
     && mkdir -p /var/run/sshd /var/backups/borg /var/lib/docker-borg/ssh mkdir /home/borg/.ssh \
-    && chown borg.borg /var/backups/borg /home/borg/.ssh \
+    && chown borg:borg /var/backups/borg /home/borg/.ssh \
     && chmod 700 /home/borg/.ssh \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/entrypoint.sh b/entrypoint.sh
index 9e8376b..14041bb 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -24,11 +24,11 @@ fi
 
 if [ ! -z ${BORG_AUTHORIZED_KEYS+x} ]; then
     echo -e "${BORG_AUTHORIZED_KEYS}" > /home/borg/.ssh/authorized_keys
-    chown borg.borg /home/borg/.ssh/authorized_keys
+    chown borg:borg /home/borg/.ssh/authorized_keys
     chmod og-rwx /home/borg/.ssh/authorized_keys
 fi
 
-chown -R borg.borg /home/borg
-chown -R borg.borg /home/borg/.ssh
+chown -R borg:borg /home/borg
+chown -R borg:borg /home/borg/.ssh
 
 exec /usr/sbin/sshd -D -e