diff --git a/root/usr/libexec/apps/owncast/owncast.sh b/root/usr/libexec/apps/owncast/owncast.sh
index 0a1edd6..97de2f1 100644
--- a/root/usr/libexec/apps/owncast/owncast.sh
+++ b/root/usr/libexec/apps/owncast/owncast.sh
@@ -4,26 +4,23 @@ ACTION=${1}
 shift 1
 
 get_image() {
-  IMAGE_NAME="owncast/owncast:latest"
+  IMAGE_NAME=$(uci get owncast.@owncast[0].image_name 2>/dev/null)
 }
 
 do_install_detail() {
   local config=`uci get owncast.@owncast[0].config_path 2>/dev/null`
   local port=`uci get owncast.@owncast[0].port 2>/dev/null`
   local IMAGE_NAME=`uci get owncast.@owncast[0].image_name 2>/dev/null`
-  local username=`uci get owncast.@owncast[0].username 2>/dev/null`
-  local password=`uci get owncast.@owncast[0].password 2>/dev/null`
-
-  #Generate the generic environment variables for the docker-compose
+  
+  # Generate the generic environment variables for the docker-compose
 
   GEN_PASS=$(< /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c14; echo)
-  GEN_PASS2=$(< /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c14; echo)
   
   # Get our local LAN IP Address
   LAN_IP=$(uci get network.lan.ipaddr)
   # Strip trailing network mask
   LAN_IP="${LAN_IP%/*}"
-   
+  
   if [ -z "$config" ]; then
       echo "config path is empty!"
       exit 1
@@ -31,20 +28,19 @@ do_install_detail() {
 
   [ -z "$port" ] && port=8387
   [ -z "$IMAGE_NAME" ] && IMAGE_NAME=owncast/owncast:latest
-
   
   # Create Docker Compose file with custom variables
-   
-  # Create Docker Compose file with custom variables
-touch docker-compose.yml
-cat > docker-compose.yml <<EOF
+  rm -R /opt/docker2/compose/owncast-app
+  mkdir /opt/docker2/compose/owncast-app
+  touch /opt/docker2/compose/owncast-app/docker-compose.yml
+  cat > /opt/docker2/compose/owncast-app/docker-compose.yml <<EOF
 version: '3.8'
 services:
   owncast:
-    image: owncast/owncast:latest
+    image: $IMAGE_NAME
     restart: unless-stopped
     ports:
-      - "$port:8080"
+      - ${LAN_IP}:$port:8080
     environment:
       - OWNCAST_ADMIN_USERNAME=admin
       - OWNCAST_ADMIN_PASSWORD=password
@@ -58,21 +54,16 @@ services:
       plugsy.category: "Home"
       plugsy.icon: "@styled-icons/simple-icons/Owncast"
       plugsy.link: "http://${LAN_IP}:$port"
-# Fw internal/external TorGuard wireguard port tcp 1935
 EOF
   
-  docker-compose up -d
- 
+  docker-compose -f /opt/docker2/compose/owncast-app/docker-compose.yml up -d
+  
   # Add a new list option to the "shortcutmenu" configuration file
   uci add shortcutmenu lists
   uci set shortcutmenu.@lists[-1].webname="$IMAGE_NAME"
   uci set shortcutmenu.@lists[-1].weburl="$LAN_IP:$port"
   uci set shortcutmenu.@lists[-1].webpath="/"
   uci commit shortcutmenu
-
-  echo "Default username is admin and default password is password."
-  echo "Your Owncast Stream Key is:" {$GEN_PASS}
-  echo "Please make note of these details"
 }
 
 usage() {
@@ -86,25 +77,27 @@ usage() {
 }
 
 case ${ACTION} in
-  "install")
-    get_image
-    do_install_detail
-  ;;
-  "upgrade")
+  "install"|"upgrade")
     get_image
     do_install_detail
   ;;
   "rm")
-    docker rm -f owncast
+    get_image
+    docker-compose -f /opt/docker2/compose/owncast-app/docker-compose.yml down
   ;;
-  "start" | "stop" | "restart")
-    docker ${ACTION} owncast
+  "start"|"stop"|"restart")
+    get_image
+    docker-compose -f /opt/docker2/compose/owncast-app/docker-compose.yml ${ACTION}
   ;;
   "status")
-    docker ps --all -f 'name=owncast' --format '{{.State}}'
+    get_image
+    CONTAINER_NAMES=$(docker ps -a --filter "ancestor=${IMAGE_NAME}" --format '{{.Names}}')
+    docker ps --all -f "name=${CONTAINER_NAMES}" --format '{{.Status}}'
   ;;
   "port")
-    docker ps --all -f 'name=owncast' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://'
+    get_image
+    CONTAINER_NAMES=$(docker ps -a --filter "ancestor=${IMAGE_NAME}" --format '{{.Names}}')
+    docker ps --all -f "name=${CONTAINER_NAMES}" --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://'
   ;;
   *)
     usage