diff --git a/matrix.yml b/matrix.yml
index 1ad52e0..bf2d84f 100644
--- a/matrix.yml
+++ b/matrix.yml
@@ -482,7 +482,7 @@
                 - traefik.http.routers.matrix-{{ ansible_facts['hostname'] }}-web.middlewares=secHeaders@file
 
             matrix.{{inventory_hostname}}--commander:
-              image: matrixcommander/matrix-commander
+              image: matrixcommander/matrix-commander:7.5
               volumes:
                 - /etc/localtime:/etc/localtime:ro
                 - ./matrix-commander-data:/data:rw
@@ -525,12 +525,18 @@
           . ./env.user
           date >>matrix.init.log
           docker compose exec -T matrix.{{inventory_hostname}}--synapse register_new_matrix_user -c /data/homeserver.yaml -a -u mx-admin         -p $MATRIX_ADMIN_PASSWORD    http://localhost:8008 >>matrix.init.log 2>&1
+
           # Create System User for Server-Notifications
           docker compose exec -T matrix.{{inventory_hostname}}--synapse register_new_matrix_user -c /data/homeserver.yaml --no-admin -u $MATRIX_SRV_USER -p $MATRIX_SRV_USER_PASSWORD http://localhost:8008 >>matrix.init.log 2>&1
+
+          ## Matrix Commander
+          #
           # Configure CLI Client (matrix-commander) Access
           docker compose -f /home/docker/matrix.$(hostname)/docker-compose.yml run -T matrix.$(hostname)--commander --login password --homeserver matrix.$(hostname) --user-login $MATRIX_SRV_USER --password $MATRIX_SRV_USER_PASSWORD --device $(hostname) --room-default $(hostname)
+
           # Create Room
           docker compose -f /home/docker/matrix.$(hostname)/docker-compose.yml run -T matrix.$(hostname)--commander --room-create $(hostname)
+
           # Invite other users example
           # docker compose -f /home/docker/matrix.$(hostname)/docker-compose.yml run -ti matrix.$(hostname)--commander --room-invite $(hostname) --user @user:matrix.$(hostname)
         backup: yes