diff --git a/.github/workflows/Main Cuda Docker Build.yml b/.github/workflows/Main Cuda Docker Build.yml
deleted file mode 100644
index 9609728a..00000000
--- a/.github/workflows/Main Cuda Docker Build.yml	
+++ /dev/null
@@ -1,49 +0,0 @@
-name: Main CUDA Docker Build
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Delete huge unnecessary tools folder
-        run: rm -rf /opt/hostedtoolcache
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          
-      - name: Extract version from tag
-        id: version
-        run: |
-          VERSION=${GITHUB_REF#refs/tags/v}
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-
-      - name: Build and push CUDA Docker image
-        uses: docker/build-push-action@v6
-        with:
-          platforms: linux/amd64,linux/arm64
-          push: true
-          file: ./Dockerfile-cuda128
-          tags: |
-            ghcr.io/rishikanthc/scriberr:${{ steps.version.outputs.version }}-cuda128
-            ghcr.io/rishikanthc/scriberr:latest-cuda128
-
-      - name: Verify multi-platform image
-        run: |
-          docker buildx imagetools inspect ghcr.io/rishikanthc/scriberr:${{ steps.version.outputs.version }}-cuda128
-          docker buildx imagetools inspect ghcr.io/rishikanthc/scriberr:latest-cuda128
\ No newline at end of file
diff --git a/.github/workflows/Main Docker Build.yml b/.github/workflows/Main Docker Build.yml
deleted file mode 100644
index 60329e70..00000000
--- a/.github/workflows/Main Docker Build.yml	
+++ /dev/null
@@ -1,49 +0,0 @@
-name: Main Docker Build
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Delete huge unnecessary tools folder
-        run: rm -rf /opt/hostedtoolcache
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          
-      - name: Extract version from tag
-        id: version
-        run: |
-          VERSION=${GITHUB_REF#refs/tags/v}
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-
-      - name: Build and push CPU Docker image
-        uses: docker/build-push-action@v6
-        with:
-          platforms: linux/amd64,linux/arm64
-          push: true
-          file: ./Dockerfile
-          tags: |
-            ghcr.io/rishikanthc/scriberr:${{ steps.version.outputs.version }}
-            ghcr.io/rishikanthc/scriberr:latest
-
-      - name: Verify multi-platform image
-        run: |
-          docker buildx imagetools inspect ghcr.io/rishikanthc/scriberr:${{ steps.version.outputs.version }}
-          docker buildx imagetools inspect ghcr.io/rishikanthc/scriberr:latest
\ No newline at end of file
diff --git a/.github/workflows/Nightly Cuda Docker Build.yml b/.github/workflows/Nightly Cuda Docker Build.yml
index 4c615703..76291701 100644
--- a/.github/workflows/Nightly Cuda Docker Build.yml	
+++ b/.github/workflows/Nightly Cuda Docker Build.yml	
@@ -1,44 +1,47 @@
-name: Nightly CUDA Docker Build
-
-on:
-  pull_request:
-    types: [closed]
-    branches:
-      - nightly
-
-jobs:
-  docker:
-    if: github.event.pull_request.merged == true
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Delete huge unnecessary tools folder
-        run: rm -rf /opt/hostedtoolcache
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push CUDA nightly image
-        uses: docker/build-push-action@v6
-        with:
-          platforms: linux/amd64,linux/arm64
-          push: true
-          file: ./Dockerfile-cuda128
-          tags: |
-            ghcr.io/rishikanthc/scriberr:nightly-cuda128
-
-      - name: Verify multi-platform image
-        run: |
+name: Nightly CUDA Docker Build
+
+on:
+  pull_request:
+    types: [closed]
+    branches:
+      - nightly
+
+jobs:
+  docker:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Delete huge unnecessary tools folder
+        run: rm -rf /opt/hostedtoolcache
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push CUDA nightly image
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          file: ./Dockerfile-cuda128
+          tags: |
+            ghcr.io/rishikanthc/scriberr:nightly-cuda128
+
+      - name: Verify multi-platform image
+        run: |
           docker buildx imagetools inspect ghcr.io/rishikanthc/scriberr:nightly-cuda128
\ No newline at end of file
diff --git a/.github/workflows/Nightly Docker Build.yml b/.github/workflows/Nightly Docker Build.yml
index ba742c10..e46a6501 100644
--- a/.github/workflows/Nightly Docker Build.yml	
+++ b/.github/workflows/Nightly Docker Build.yml	
@@ -1,44 +1,47 @@
-name: Nightly Docker Build
-
-on:
-  pull_request:
-    types: [closed]
-    branches:
-      - nightly
-
-jobs:
-  docker:
-    if: github.event.pull_request.merged == true
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Delete huge unnecessary tools folder
-        run: rm -rf /opt/hostedtoolcache
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push CPU nightly image
-        uses: docker/build-push-action@v6
-        with:
-          platforms: linux/amd64,linux/arm64
-          push: true
-          file: ./Dockerfile
-          tags: |
-            ghcr.io/rishikanthc/scriberr:nightly
-
-      - name: Verify multi-platform image
-        run: |
+name: Nightly Docker Build
+
+on:
+  pull_request:
+    types: [closed]
+    branches:
+      - nightly
+
+jobs:
+  docker:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Delete huge unnecessary tools folder
+        run: rm -rf /opt/hostedtoolcache
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push CPU nightly image
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          file: ./Dockerfile
+          tags: |
+            ghcr.io/rishikanthc/scriberr:nightly
+
+      - name: Verify multi-platform image
+        run: |
           docker buildx imagetools inspect ghcr.io/rishikanthc/scriberr:nightly
\ No newline at end of file
diff --git a/.github/workflows/version-and-release.yml b/.github/workflows/version-and-release.yml
index d87318da..49c5e5d2 100644
--- a/.github/workflows/version-and-release.yml
+++ b/.github/workflows/version-and-release.yml
@@ -1,4 +1,4 @@
-name: Create Release
+name: Create Release and Build Docker Images
 
 on:
   pull_request:
@@ -12,6 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: write
+      packages: write
     
     steps:
       - name: Checkout code
@@ -27,7 +28,7 @@ jobs:
       - name: Determine new version
         id: version
         run: |
-          CURRENT_VERSION="0.3.0"
+          CURRENT_VERSION="0.4.1"
           # Check commit messages to determine version increment
           COMMITS=$(git log $(git describe --tags --abbrev=0 2>/dev/null || echo HEAD~10)..HEAD --pretty=format:"%s")
           
@@ -77,3 +78,48 @@ jobs:
             
             Changes in this release:
             ${{ github.event.pull_request.title }} (#${{ github.event.pull_request.number }})
+
+      - name: Delete huge unnecessary tools folder
+        run: rm -rf /opt/hostedtoolcache
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Build and push CPU Docker image
+      - name: Build and push CPU Docker image
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          file: ./Dockerfile
+          tags: |
+            ghcr.io/rishikanthc/scriberr:${{ steps.version.outputs.new_version }}
+            ghcr.io/rishikanthc/scriberr:latest
+
+      # Build and push CUDA Docker image
+      - name: Build and push CUDA Docker image
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          file: ./Dockerfile-cuda128
+          tags: |
+            ghcr.io/rishikanthc/scriberr:${{ steps.version.outputs.new_version }}-cuda128
+            ghcr.io/rishikanthc/scriberr:latest-cuda128
+
+      - name: Verify multi-platform images
+        run: |
+          docker buildx imagetools inspect ghcr.io/rishikanthc/scriberr:${{ steps.version.outputs.new_version }}
+          docker buildx imagetools inspect ghcr.io/rishikanthc/scriberr:latest
+          docker buildx imagetools inspect ghcr.io/rishikanthc/scriberr:${{ steps.version.outputs.new_version }}-cuda128
+          docker buildx imagetools inspect ghcr.io/rishikanthc/scriberr:latest-cuda128
\ No newline at end of file