diff --git a/src/Admin/entrypoint.sh b/src/Admin/entrypoint.sh
index cc9ba5d68..28fb0d94e 100644
--- a/src/Admin/entrypoint.sh
+++ b/src/Admin/entrypoint.sh
@@ -18,6 +18,11 @@ then
     useradd -r -u $LUID -g $USERNAME $USERNAME
 fi
 
+if [ ! -d "/home/$USERNAME" ]
+then
+    mkhomedir_helper $USERNAME
+fi
+
 chown -R $USERNAME:$USERNAME /app
 mkdir -p /etc/bitwarden/core
 mkdir -p /etc/bitwarden/logs
diff --git a/src/Api/entrypoint.sh b/src/Api/entrypoint.sh
index 1c3d96ef9..17a12ca3f 100644
--- a/src/Api/entrypoint.sh
+++ b/src/Api/entrypoint.sh
@@ -18,6 +18,11 @@ then
     useradd -r -u $LUID -g $USERNAME $USERNAME
 fi
 
+if [ ! -d "/home/$USERNAME" ]
+then
+    mkhomedir_helper $USERNAME
+fi
+
 touch /var/log/cron.log
 chown $USERNAME:$USERNAME /var/log/cron.log
 chown -R $USERNAME:$USERNAME /app
diff --git a/src/Icons/entrypoint.sh b/src/Icons/entrypoint.sh
index 9d26f3fc8..24454e899 100644
--- a/src/Icons/entrypoint.sh
+++ b/src/Icons/entrypoint.sh
@@ -18,6 +18,11 @@ then
     useradd -r -u $LUID -g $USERNAME $USERNAME
 fi
 
+if [ ! -d "/home/$USERNAME" ]
+then
+    mkhomedir_helper $USERNAME
+fi
+
 chown -R $USERNAME:$USERNAME /app
 chown -R $USERNAME:$USERNAME /etc/iconserver
 
diff --git a/src/Identity/entrypoint.sh b/src/Identity/entrypoint.sh
index 99d238c39..5a1df3dcf 100644
--- a/src/Identity/entrypoint.sh
+++ b/src/Identity/entrypoint.sh
@@ -18,6 +18,11 @@ then
     useradd -r -u $LUID -g $USERNAME $USERNAME
 fi
 
+if [ ! -d "/home/$USERNAME" ]
+then
+    mkhomedir_helper $USERNAME
+fi
+
 mkdir -p /etc/bitwarden/identity
 mkdir -p /etc/bitwarden/core
 mkdir -p /etc/bitwarden/logs
diff --git a/util/Attachments/entrypoint.sh b/util/Attachments/entrypoint.sh
index 143473d42..7bfd945ca 100644
--- a/util/Attachments/entrypoint.sh
+++ b/util/Attachments/entrypoint.sh
@@ -18,6 +18,11 @@ then
     useradd -r -u $LUID -g $USERNAME $USERNAME
 fi
 
+if [ ! -d "/home/$USERNAME" ]
+then
+    mkhomedir_helper $USERNAME
+fi
+
 chown -R $USERNAME:$USERNAME /bitwarden_server
 mkdir -p /etc/bitwarden/core/attachments
 chown -R $USERNAME:$USERNAME /etc/bitwarden
diff --git a/util/MsSql/entrypoint.sh b/util/MsSql/entrypoint.sh
index ab453e7ad..a9b575518 100644
--- a/util/MsSql/entrypoint.sh
+++ b/util/MsSql/entrypoint.sh
@@ -18,6 +18,11 @@ then
     useradd -r -u $LUID -g $USERNAME $USERNAME
 fi
 
+if [ ! -d "/home/$USERNAME" ]
+then
+    mkhomedir_helper $USERNAME
+fi
+
 touch /var/log/cron.log
 chown $USERNAME:$USERNAME /var/log/cron.log
 mkdir -p /etc/bitwarden/mssql/backups
diff --git a/util/Nginx/entrypoint.sh b/util/Nginx/entrypoint.sh
index 13fff4b93..996bf1a57 100644
--- a/util/Nginx/entrypoint.sh
+++ b/util/Nginx/entrypoint.sh
@@ -18,6 +18,11 @@ then
     useradd -r -u $LUID -g $USERNAME $USERNAME
 fi
 
+if [ ! -d "/home/$USERNAME" ]
+then
+    mkhomedir_helper $USERNAME
+fi
+
 chown -R $USERNAME:$USERNAME /etc/bitwarden
 cp /etc/bitwarden/nginx/default.conf /etc/nginx/conf.d/default.conf
 mkdir -p /etc/letsencrypt
diff --git a/util/Setup/entrypoint.sh b/util/Setup/entrypoint.sh
index 4500d31ec..1c5282e19 100644
--- a/util/Setup/entrypoint.sh
+++ b/util/Setup/entrypoint.sh
@@ -18,6 +18,11 @@ then
     useradd -r -u $LUID -g $USERNAME $USERNAME
 fi
 
+if [ ! -d "/home/$USERNAME" ]
+then
+    mkhomedir_helper $USERNAME
+fi
+
 chown -R $USERNAME:$USERNAME /app
 mkdir -p /bitwarden/env
 mkdir -p /bitwarden/docker