diff --git a/Dockerfile b/Dockerfile
index 603bfae..cca72c5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,8 +9,6 @@ ENV RUN_INSTALL_SCRIPT="false"
 ENV RUN_PROMETHEUS_EXPORTER="false"
 ENV TZ=""
 
-RUN dbus-uuidgen --ensure=/etc/machine-id
-
 # Add Folders and Shell Scripts
 RUN mkdir "/.ssh"
 VOLUME ["/backups"]
diff --git a/entrypoint-script/entrypoint.sh b/entrypoint-script/entrypoint.sh
index 118ae4e..7512756 100755
--- a/entrypoint-script/entrypoint.sh
+++ b/entrypoint-script/entrypoint.sh
@@ -191,6 +191,7 @@ function run_correct_ssh_service() {
 # Main Code
 #####################################################################################################
 set_environment_variables_if_not_empty
+dbus-uuidgen --ensure=/etc/machine-id
 add_borg_user
 
 print_container_info