diff --git a/component-installer.sh b/component-installer.sh
index 1613c53..83da585 100644
--- a/component-installer.sh
+++ b/component-installer.sh
@@ -61,15 +61,15 @@ Requires=docker.service
 
 [Service]
 Restart=always
-ExecStart=/usr/bin/docker run --name ogGui-app -p 4200:4200 -v $ENV_FILE:/app/.env -d opengnsys/oggui:$oggui_version
-ExecStop=/usr/bin/docker stop angular-app
-ExecStopPost=/usr/bin/docker rm -f angular-app
+ExecStart=/usr/bin/docker run --rm --name ogGui-app -p 4200:4200 -v $ENV_FILE:/app/.env -d opengnsys/oggui:$oggui_version
+ExecStop=/usr/bin/docker stop ogGui-app
 
 [Install]
 WantedBy=multi-user.target
 EOF
 
-    systemctl enable oggui-app
+    systemctl daemon-reload
+    systemctl enable --now oggui-app
 
 }
 
@@ -117,7 +117,8 @@ do
                 ;;
             ogGui)
                 echo "Instalando ogGui..."
-                git clone "$OGGUI_REPO" "$component_dir/repo"
+                OGGUI_BRANCH=main
+                git clone --branch "$OGGUI_BRANCH" "$OGGUI_REPO" "$component_dir/repo"
                 echo - ogGui >> /etc/issue
                 install_docker
                 install_oggui_docker