diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml
index 77996c0..30d52a5 100644
--- a/.forgejo/workflows/build+release.yml
+++ b/.forgejo/workflows/build+release.yml
@@ -1,11 +1,11 @@
 name: 'Build and Release Docker Image'
 author: 'Neshura'
 
-on: 
+on:
     push:
         tags:
             - '[0-9]+.[0-9]+.[0-9]+'
-            - '[0-9]+.[0-9]+.[0-9]+rc[0-9]+'
+            - '[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+'
 jobs:
     test:
         runs-on: docker
@@ -64,7 +64,7 @@ jobs:
                 uses: docker/build-push-action@v5
                 with:
                     push: true
-                    tags: forgejo.neshweb.net/neshweb-sites/main-site:${{  github.ref_name }}, forgejo.neshweb.net/neshweb-sites/main-site:latest
+                    tags: forgejo.neshweb.net/neshweb-sites/${{ github.event.repository.name }}:${{  github.ref_name }}, forgejo.neshweb.net/neshweb-sites/${{ github.event.repository.name }}:latest
     
     release:
         needs: build
diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml
new file mode 100644
index 0000000..bb41e22
--- /dev/null
+++ b/.forgejo/workflows/pull-requests.yml
@@ -0,0 +1,49 @@
+name: 'Build Docker Image on Pull Request'
+author: 'Neshura'
+
+
+on:
+    pull_request:
+      branches:
+        - main
+jobs:
+    test:
+        runs-on: docker
+        steps:
+            -
+                name: Checking Out Repository Code
+                uses: https://code.forgejo.org/actions/checkout@v3
+            -
+                name: Get Yarn Cache Directory
+                id: yarn-cache-dir-path
+                run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+            -
+                name: Set Up Yarn Cache
+                uses: actions/cache@v3
+                id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+                with:
+                    path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+                    key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+                    restore-keys: |
+                      ${{ runner.os }}-yarn-
+            -
+                name: Install Dependencies
+                run: yarn install
+            -
+                name: Run Linter
+                run: yarn lint
+            -
+                name: Check if Version in package.json matches Tag
+                run: |
+                    echo "Test"
+                    VERSION=$(cat package.json | grep "version" | sed 's/.*://' | tr -d , | tr -d \" )
+                    if test $VERSION != "${{  github.ref_name }}"; then 
+                        echo "Expected Version is: '${{  github.ref_name }}' actual Version is: '$VERSION'"; 
+                        exit 1
+                    else 
+                        echo "Version is: '$VERSION'"; 
+                    fi
+            -
+                name: Build website
+                run: yarn build
+