diff --git a/src/modules/openmower/filesystem/root/boot/openmower/openmower_version.txt b/src/modules/openmower/filesystem/root/boot/openmower/openmower_version.txt
index 64a6530..9d763c6 100644
--- a/src/modules/openmower/filesystem/root/boot/openmower/openmower_version.txt
+++ b/src/modules/openmower/filesystem/root/boot/openmower/openmower_version.txt
@@ -1,11 +1,36 @@
 # select which version of the OpenMower software to run.
 #
-# - beta:     This one is the _most stable_ one of the three. I try to keep this as stable as possible.
-# - alpha:    For people who like to test stuff. This one will be updated fairly often as well and without notice. Only use it, if you want to be among the first people to get new features, but prepare to have issues.
-# - testing:  This one changes very often. Only use it if you want to take part in the development or are asked to use it by a developer.
+#
+# - "releases-beta":     This one is the _most stable_ one of the three. I try to keep this as stable as possible.
+# - "releases-alpha":    For people who like to test stuff. This one will be updated fairly often as well and without notice. Only use it, if you want to be among the first people to get new features, but prepare to have issues.
+# - "releases-testing":  This one changes very often. Only use it if you want to take part in the development or are asked to use it by a developer.
+#
 #
 # Check the https://github.com/ClemensElflein/open_mower_ros repo for the current state.
+#
+# advanced users may want to select different versions as the "releases-..." versions
+
+
+OM_VERSION="releases-beta"
+
+
+
+
+
+###################################
+#     Options for developers      #
+# DO NOT TOUCH as a normal user ! #
+###################################
+
+OM_REPO="clemenselflein"
+
+OM_REG="ghcr.io"
+
 
-OM_VERSION="beta"
 
-export OM_VERSION
\ No newline at end of file
+###################################
+# Export section - DO NOT TOUCH ! #
+###################################
+export OM_REG
+export OM_REPO
+export OM_VERSION
diff --git a/src/modules/openmower/filesystem/root/etc/systemd/system/openmower-debug.service b/src/modules/openmower/filesystem/root/etc/systemd/system/openmower-debug.service
index faecc11..7a8a43f 100644
--- a/src/modules/openmower/filesystem/root/etc/systemd/system/openmower-debug.service
+++ b/src/modules/openmower/filesystem/root/etc/systemd/system/openmower-debug.service
@@ -19,6 +19,7 @@ RestartSec=10s
 TimeoutStartSec=1h
 TimeoutStopSec=120s
 
+# Remove id files from  previous starts
 ExecStartPre=/bin/rm -f %t/container-openmower-debug.pid %t/container-openmower-debug.ctr-id
 
 ExecStart=/usr/bin/podman run --conmon-pidfile %t/container-openmower-debug.pid --cidfile %t/container-openmower-debug.ctr-id --cgroups=no-conmon \
@@ -29,9 +30,10 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/container-openmower-debug.pid
   --volume /boot/openmower/mower_config.txt:/config/mower_config.sh \
   --volume /root/ros_home:/root \
   --label io.containers.autoupdate=image \
-  ghcr.io/clemenselflein/open_mower_ros:releases-${OM_VERSION}
+  ${OM_REG}/${OM_REPO}/open_mower_ros:${OM_VERSION}
 
-#ExecStartPost=/usr/bin/podman image prune --force --filter image=open_mower_ros
+# Remove orphane images from podman auto-update execution
+ExecStartPost=/usr/bin/podman image prune --force --filter label=org.opencontainers.image.title=open_mower_ros
 
 ExecStop=/usr/bin/podman stop --time 30 --ignore --cidfile %t/container-openmower-debug.ctr-id
 
diff --git a/src/modules/openmower/filesystem/root/etc/systemd/system/openmower.service b/src/modules/openmower/filesystem/root/etc/systemd/system/openmower.service
index ceed9ba..110ed33 100644
--- a/src/modules/openmower/filesystem/root/etc/systemd/system/openmower.service
+++ b/src/modules/openmower/filesystem/root/etc/systemd/system/openmower.service
@@ -19,8 +19,13 @@ RestartSec=10s
 TimeoutStartSec=1h
 TimeoutStopSec=120s
 
+# Remove id files from  previous starts
 ExecStartPre=/bin/rm -f %t/container-openmower.pid %t/container-openmower.ctr-id
 
+# Remove any openmower-debug containers
+ExecStartPre=/usr/bin/podman rm -i openmower-debug
+
+# Start the open_mower_ros container
 ExecStart=/usr/bin/podman run --conmon-pidfile %t/container-openmower.pid --cidfile %t/container-openmower.ctr-id --cgroups=no-conmon \
   --replace --detach --tty --privileged \
   --name openmower \
@@ -33,9 +38,10 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/container-openmower.pid --cidf
   --env ROSOUT_DISABLE_FILE_LOGGING=True \
   --tmpfs /root/.ros/log \
   --label io.containers.autoupdate=image \
-  ghcr.io/clemenselflein/open_mower_ros:releases-${OM_VERSION}
+  ${OM_REG}/${OM_REPO}/open_mower_ros:${OM_VERSION}
 
-#ExecStartPost=/usr/bin/podman image prune --force --filter image=open_mower_ros
+# Remove orphane images from podman auto-update execution
+ExecStartPost=/usr/bin/podman image prune --force --filter label=org.opencontainers.image.title=open_mower_ros
 
 ExecStop=/usr/bin/podman stop --time 30 --ignore --cidfile %t/container-openmower.ctr-id