diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml
index 8f1ecc8..30c46b2 100644
--- a/.github/workflows/BuildImage.yml
+++ b/.github/workflows/BuildImage.yml
@@ -1,74 +1,45 @@
 name: Build Image
 
-on: [push, pull_request, workflow_dispatch]
+on: [push, pull_request_target, workflow_dispatch]
 
 env:
+  GITHUB_REPO: "linuxserver/docker-mods" #don't modify
   ENDPOINT: "linuxserver/mods" #don't modify
   BASEIMAGE: "radarr" #replace
   MODNAME: "striptracks" #replace
 
 jobs:
-  build:
+  set-vars:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.3
-
-      - name: Build image
+      - name: Set Vars
+        id: outputs
         run: |
-          # Build variables
-          VERSION=${GITHUB_SHA:0:7}
-          cat <<EOF
-          Building version $VERSION
-          EOF
-          # Insert version into scripts
-          sed -i -e "s/{{VERSION}}/$VERSION/" \
-            $GITHUB_WORKSPACE/root/usr/local/bin/striptracks.sh \
-            $GITHUB_WORKSPACE/root/etc/cont-init.d/98-striptracks \
-            $GITHUB_WORKSPACE/root/etc/s6-overlay/s6-rc.d/init-mod-radarr-striptracks-add-package/run
-          # Build image
-          docker build --no-cache \
-                       --tag ${{ github.sha }} .
+          echo "GITHUB_REPO=${{ env.GITHUB_REPO }}" >> $GITHUB_OUTPUT
+          echo "ENDPOINT=${{ env.ENDPOINT }}" >> $GITHUB_OUTPUT
+          echo "BASEIMAGE=${{ env.BASEIMAGE }}" >> $GITHUB_OUTPUT
+          echo "MODNAME=${{ env.MODNAME }}" >> $GITHUB_OUTPUT
+          # **** If the mod needs to be versioned, set the versioning logic below. Otherwise leave as is. ****
+          MOD_VERSION=${GITHUB_SHA:0:7}
+          echo "MOD_VERSION=${MOD_VERSION}" >> $GITHUB_OUTPUT
+    outputs:
+      GITHUB_REPO: ${{ steps.outputs.outputs.GITHUB_REPO }}
+      ENDPOINT: ${{ steps.outputs.outputs.ENDPOINT }}
+      BASEIMAGE: ${{ steps.outputs.outputs.BASEIMAGE }}
+      MODNAME: ${{ steps.outputs.outputs.MODNAME }}
+      MOD_VERSION: ${{ steps.outputs.outputs.MOD_VERSION }}
 
-      - name: Tag image
-        if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) }}
-        run: |
-          docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}
-          docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}
-          docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}
-          docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}
-
-      - name: Credential check
-        if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) }}
-        run: |
-          echo "CR_USER=${{ secrets.CR_USER }}" >> $GITHUB_ENV
-          echo "CR_PAT=${{ secrets.CR_PAT }}" >> $GITHUB_ENV
-          echo "DOCKERUSER=${{ secrets.DOCKERUSER }}" >> $GITHUB_ENV
-          echo "DOCKERPASS=${{ secrets.DOCKERPASS }}" >> $GITHUB_ENV
-          if [[ "${{ secrets.CR_USER }}" == "" && "${{ secrets.CR_PAT }}" == "" && "${{ secrets.DOCKERUSER }}" == "" && "${{ secrets.DOCKERPASS }}" == "" ]]; then
-            echo "::error::Push credential secrets missing."
-            echo "::error::You must set either CR_USER & CR_PAT or DOCKERUSER & DOCKERPASS as secrets in your repo settings."
-            echo "::error::See https://github.com/linuxserver/docker-mods/blob/master/README.md for more information/instructions."
-            exit 1
-          fi
-
-      - name: Login to GitHub Container Registry
-        if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.CR_USER && env.CR_PAT }}
-        run: |
-          echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ secrets.CR_USER }} --password-stdin
-
-      - name: Push tags to GitHub Container Registry
-        if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.CR_USER && env.CR_PAT }}
-        run: |
-          docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}
-          docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}
-
-      - name: Login to DockerHub
-        if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.DOCKERUSER && env.DOCKERPASS }}
-        run: |
-          echo ${{ secrets.DOCKERPASS }} | docker login -u ${{ secrets.DOCKERUSER }} --password-stdin
-
-      - name: Push tags to DockerHub
-        if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.DOCKERUSER && env.DOCKERPASS }}
-        run: |
-          docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}
-          docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}
+  build:
+    uses: linuxserver/github-workflows/.github/workflows/docker-mod-builder.yml@v1
+    needs: set-vars
+    secrets:
+      CR_USER: ${{ secrets.CR_USER }}
+      CR_PAT: ${{ secrets.CR_PAT }}
+      DOCKERUSER: ${{ secrets.DOCKERUSER }}
+      DOCKERPASS: ${{ secrets.DOCKERPASS }}
+    with:
+      GITHUB_REPO: ${{ needs.set-vars.outputs.GITHUB_REPO }}
+      ENDPOINT: ${{ needs.set-vars.outputs.ENDPOINT }}
+      BASEIMAGE: ${{ needs.set-vars.outputs.BASEIMAGE }}
+      MODNAME: ${{ needs.set-vars.outputs.MODNAME }}
+      MOD_VERSION: ${{ needs.set-vars.outputs.MOD_VERSION }}
diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml
new file mode 100644
index 0000000..2c30784
--- /dev/null
+++ b/.github/workflows/call_issue_pr_tracker.yml
@@ -0,0 +1,16 @@
+name: Issue & PR Tracker
+
+on:
+  issues:
+    types: [opened,reopened,labeled,unlabeled,closed]
+  pull_request_target:
+    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed]
+  pull_request_review:
+    types: [submitted,edited,dismissed]
+
+jobs:
+  manage-project:
+    permissions:
+      issues: write
+    uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1
+    secrets: inherit
diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml
new file mode 100644
index 0000000..1447bc5
--- /dev/null
+++ b/.github/workflows/permissions.yml
@@ -0,0 +1,10 @@
+name: Permission check
+on:
+  pull_request_target:
+    paths:
+      - '**/run'
+      - '**/finish'
+      - '**/check'
+jobs:
+  permission_check:
+    uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1
diff --git a/Dockerfile b/Dockerfile
index f898516..6b488a8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,21 @@
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:3.17 as buildstage
+
+ARG MOD_VERSION
+
+COPY root/ /root-layer/
+
+RUN \
+  MOD_VERSION="${MOD_VERSION:-unknown}" && \
+  sed -i -e "s/{{VERSION}}/$MOD_VERSION/" \
+    /root-layer/usr/local/bin/striptracks.sh \
+    /root-layer/etc/s6-overlay/s6-rc.d/init-mod-radarr-striptracks-add-package/run
+
 ## Single layer deployed image ##
 FROM scratch
 
 LABEL maintainer="TheCaptain989"
 
 # Copy local files
-COPY root/ /
+COPY --from=buildstage /root-layer/ /
diff --git a/root/etc/cont-init.d/95-apt-get b/root/etc/cont-init.d/95-apt-get
deleted file mode 100644
index 8e5fe66..0000000
--- a/root/etc/cont-init.d/95-apt-get
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-if [ -f /usr/bin/apt ]; then
-    apt-get update
-fi
diff --git a/root/etc/cont-init.d/98-striptracks b/root/etc/cont-init.d/98-striptracks
deleted file mode 100644
index 31ad3b1..0000000
--- a/root/etc/cont-init.d/98-striptracks
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-cat <<EOF
-----------------
->>> Striptracks Mod by TheCaptain989 <<<
-Repos:
-  Dev/test: https://github.com/TheCaptain989/radarr-striptracks
-  Prod: https://github.com/linuxserver/docker-mods/tree/radarr-striptracks
-
-Version: {{VERSION}}
-----------------
-EOF
-
-# Determine if setup is needed
-if [ ! -f /usr/bin/mkvmerge ]; then
-  echo "Running first time setup."
-
-  if [ -f /usr/bin/apt ]; then
-    # Ubuntu
-    echo "Installing MKVToolNix using apt-get"
-    apt-get -y install mkvtoolnix && \
-    rm -rf /var/lib/apt/lists/*
-  elif [ -f /sbin/apk ]; then
-    # Alpine
-    echo "Installing MKVToolNix using apk"
-    apk add --no-cache mkvtoolnix && \
-    rm -rf /var/lib/apt/lists/*
-  else
-    # Unknown
-    echo "Unknown package manager.  Attempting to install MKVToolNix using apt-get"
-    apt-get -y install mkvtoolnix && \
-    rm -rf /var/lib/apt/lists/*
-  fi
-fi
-
-# Change ownership
-if [ $(stat -c '%G' /usr/local/bin/striptracks.sh) != "abc" ]; then
-  echo "Changing ownership on scripts."
-  chown abc:abc /usr/local/bin/striptracks*.sh
-fi
-
-# Make executable
-if [ ! -x /usr/local/bin/striptracks.sh ]; then
-  echo "Making scripts executable."
-  chmod +x /usr/local/bin/striptracks*.sh
-fi
-
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-radarr-striptracks-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-radarr-striptracks-add-package/run
index 60b5e57..ffb3b88 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-mod-radarr-striptracks-add-package/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-radarr-striptracks-add-package/run
@@ -25,7 +25,7 @@ do
   # Change ownership
   if [ $(stat -c '%G' $file) != "abc" ]; then
     echo "Changing ownership on $file script."
-    chown abc:abc $file
+    lsiown abc:abc $file
   fi
 
   # Make executable
diff --git a/root/usr/local/bin/striptracks-org-eng.sh b/root/usr/local/bin/striptracks-org-eng.sh
old mode 100644
new mode 100755
diff --git a/root/usr/local/bin/striptracks-org-ger.sh b/root/usr/local/bin/striptracks-org-ger.sh
old mode 100644
new mode 100755
diff --git a/root/usr/local/bin/striptracks-org-spa.sh b/root/usr/local/bin/striptracks-org-spa.sh
old mode 100644
new mode 100755