diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 2a1c8c2..b6069b1 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -4,12 +4,12 @@
 
 ## Issues
 <!-- Issues this PR will address -->
- - closes #___
- - owner/repo#___
+- closes #___
+- owner/repo#___
 
 ## Checklist
 <!-- Compelte after creating PR -->
- - [ ] Linked issues
- - [ ] Reviewed changes
- - [ ] Updated comments/documentation
- 
\ No newline at end of file
+- [ ] Linked issues
+- [ ] Reviewed changes
+- [ ] Updated comments/documentation
+ 
diff --git a/.github/workflows/Continues Integration.yaml b/.github/workflows/Continues Integration.yaml
deleted file mode 100644
index 139cc2c..0000000
--- a/.github/workflows/Continues Integration.yaml	
+++ /dev/null
@@ -1,86 +0,0 @@
-name: Continues Integration
-on: [push, workflow_dispatch]
-
-jobs:
-  dependencies:
-    name: Install dependencies
-    container:
-      image: node:latest
-      volumes:
-        - /mnt/swarm/gitea/runner/cache/${{ github.workspace }}:{{ github.workspace }}
-        - /mnt/swarm/gitea/runner/cache:/cache
-    steps:
-      - name: Checkout repository
-        uses: ztimson/actions/git/checkout@develop
-
-      - name: Restore cache
-        uses: ztimson/actions/cache/restore@develop
-        with:
-          key: node_modules
-
-      - name: Install dependencies
-        run: npm install
-
-      - name: Cache node_modules
-        uses: ztimson/actions/cache@develop
-        with:
-          key: node_modules
-          pattern: package-lock.json node_modules/*
-
-  build-dev:
-    name: Build
-    needs: dependencies
-    container:
-      image: node:latest
-      volumes:
-        - /mnt/swarm/gitea/runner/cache:/cache
-    steps:
-      - name: Checkout repository
-        uses: ztimson/actions/git/checkout@develop
-
-      - name: Restore cache
-        uses: ztimson/actions/cache/restore@develop
-        with:
-          key: node_modules
-
-      - name: Setup Angular
-        run: npm link @angular/cli
-
-      - name: Compile Angular
-        run: npm run build:dev
-
-  build-prod:
-    name: Build production
-    needs: dependencies
-    container:
-      image: node:latest
-      volumes:
-        - /mnt/swarm/gitea/runner/cache:/cache
-    steps:
-      - name: Checkout repository
-        uses: ztimson/actions/git/checkout@develop
-
-      - name: Restore cache
-        uses: ztimson/actions/cache/restore@develop
-        with:
-          key: node_modules
-
-      - name: Setup Angular
-        run: npm link @angular/cli
-
-      - name: Compile Angular
-        run: npm run build:dev
-
-  docker:
-    name: Build docker image
-    steps:
-      - name: Checkout repository
-        uses: ztimson/actions/git/checkout@develop
-
-      - name: Build docker image
-        uses: ztimson/actions/docker/build@develop
-
-      - name: Push docker image
-        uses: ztimson/actions/docker/push@develop
-        with:
-          registry_pass: ${{secrets.DEPLOY_TOKEN}}
diff --git a/.github/workflows/website.yaml b/.github/workflows/website.yaml
new file mode 100644
index 0000000..843b707
--- /dev/null
+++ b/.github/workflows/website.yaml
@@ -0,0 +1,22 @@
+name: Build Website
+run-name: Build Website
+
+on:
+    push:
+
+jobs:
+    build:
+        name: Build NPM Project
+        uses: ztimson/actions/.github/workflows/npm.yaml@develop
+        with:
+            repository: ${{github.server_url}}/${{github.repository}}.git
+            artifact_name: website
+            artifacts: dist
+
+    publish:
+        name: Build & Push Dockerfile
+        needs: build
+        uses: ztimson/actions/.github/workflows/docker.yaml@develop
+        with:
+            repository: ${{github.server_url}}/${{github.repository}}.git
+            pass: ${{secrets.DEPLOY_TOKEN}}