diff --git a/Dockerfile b/Dockerfile
index d8cbd61..733110b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -112,6 +112,8 @@ RUN \
   cp \
     /kasm_release/conf/database/seed_data/default_images_a* \
     /wizard/ && \
+  useradd -u 70 kasm_db && \
+  useradd kasm && \
   echo "**** cleanup ****" && \
   apt-get remove -y g++ gcc make && \
   apt-get -y autoremove && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 36dd94f..adc34b1 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -112,6 +112,8 @@ RUN \
   cp \
     /kasm_release/conf/database/seed_data/default_images_a* \
     /wizard/ && \
+  useradd -u 70 kasm_db && \
+  useradd kasm && \
   echo "**** cleanup ****" && \
   apt-get remove -y g++ gcc make && \
   apt-get -y autoremove && \
diff --git a/README.md b/README.md
index 99706ee..4e2f041 100644
--- a/README.md
+++ b/README.md
@@ -317,6 +317,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **24.09.24:** - Add base users in docker build logic to survive container upgrades.
 * **17.09.24:** - Update base image for 1.16.0 release and fix Nvidia support.
 * **16.02.24:** - Update base image for 1.15.0 release.
 * **22.08.23:** - Update base image for 1.14.0 release.
diff --git a/readme-vars.yml b/readme-vars.yml
index ed45a03..d1368ba 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -116,6 +116,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "24.09.24:", desc: "Add base users in docker build logic to survive container upgrades." }
   - { date: "17.09.24:", desc: "Update base image for 1.16.0 release and fix Nvidia support." }
   - { date: "16.02.24:", desc: "Update base image for 1.15.0 release." }
   - { date: "22.08.23:", desc: "Update base image for 1.14.0 release." }