diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index f2ea893..931b0e8 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,43 +1,50 @@
-name: Deploy to GitHub Pages
+name: Github Pages Astro CI
 
 on:
-  # Trigger the workflow every time you push to the `main` branch
-  # Using a different branch name? Replace `main` with your branch’s name
+ # Trigger the workflow every time you push to the `main` branch
   push:
-    branches: [main]
+    branches: [ main ]
   # Allows you to run this workflow manually from the Actions tab on GitHub.
   workflow_dispatch:
-
-# Allow this job to clone the repo and create a page deployment
+  
+  # Allow this job to clone the repo and create a page deployment
 permissions:
   contents: read
   pages: write
   id-token: write
 
-# Allow one concurrent deployment
-concurrency:
-  group: "pages"
-  cancel-in-progress: true
-
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout your repository using git
-        uses: actions/checkout@v3
-      - name: Install, build, and upload your site output
-        uses: withastro/action@v0
-        with:
-          node-version: 16 # The specific version of Node that should be used to build your site. Defaults to 16. (optional)
-            # path: . # The root location of your Astro project inside the repository. (optional)
-            # package-manager: yarn # The Node package manager that should be used to install dependencies and build your site. Automatically detected based on your lockfile. (optional)
+    - name: Check out your repository using git
+      uses: actions/checkout@v2
+
+    - name: Use Node.js 16
+      uses: actions/setup-node@v2
+      with:
+        node-version: '16'
+        cache: 'npm'
+
+    # Not using npm? Change `npm ci` to `yarn install` or `pnpm i`
+    - name: Install dependencies
+      run: npm ci
+
+    # Not using npm? Change `npm run build` to `yarn build` or `pnpm run build`
+    - name: Build Astro
+      run: npm run build --if-present
+
+    - name: Upload artifact
+      uses: actions/upload-pages-artifact@v1
+      with:
+        path: ./dist
 
   deploy:
-    needs: build
-    runs-on: ubuntu-latest
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
diff --git a/README.md b/README.md
index 47c90bc..c51204b 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 ## This is a workaround while [@cjlaserna](https://github.com/cjlaserna) is not being able to update her project
 - Support [@cjlaserna](https://github.com/cjlaserna)'s projects. :)
 
-# [NookOffice - Hourly Animal Crossing Music](https://nookoffice.live/)
+# [NookOffice - Hourly Animal Crossing Music](https://vijiatjack.github.io/nookoffice/)
 
-![Maintained](https://img.shields.io/badge/Maintained%3F-yes-green.svg) [![Site Status](https://img.shields.io/website-up-down-green-red/https/nookoffice.live.svg)](https://nookoffice.live/)
+![Maintained](https://img.shields.io/badge/Maintained%3F-yes-green.svg) [![Site Status](https://img.shields.io/website-up-down-green-red/https/nookoffice.live.svg)](https://vijiatjack.github.io/nookoffice/)
 <br />
 NookOffice hosts hourly rotating Animal Crossing tracks for relaxing, studying, or working complete with timers & to-do lists.
 <br/>
@@ -32,5 +32,5 @@ NookOffice hosts hourly rotating Animal Crossing tracks for relaxing, studying,
 ---
 
 [![Donate](https://img.shields.io/badge/Ko--fi-F16061?style=for-the-badge&logo=ko-fi&logoColor=white)](https://ko-fi.com/clasernaj)
-[![Notion Compatible](https://img.shields.io/badge/Notion-000000?style=for-the-badge&logo=notion&logoColor=white)](https://nookoffice.live/?embed=true)
+[![Notion Compatible](https://img.shields.io/badge/Notion-000000?style=for-the-badge&logo=notion&logoColor=white)](https://vijiatjack.github.io/nookoffice/?embed=true)
 [![Figma Mockup](https://img.shields.io/badge/Figma-F24E1E?style=for-the-badge&logo=figma&logoColor=white)](https://www.figma.com/file/TIMSI0wSvnRDxgad2BNZv8/Nook-Office?node-id=0%3A1&t=xeY0HWG6hw3KkrcP-1)
diff --git a/package.json b/package.json
index 03ae7f2..db585d0 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,12 @@
 {
 	"name": "@example/basics",
-	"type": "module",
 	"version": "0.0.1",
 	"private": true,
 	"scripts": {
 		"dev": "astro dev",
 		"start": "astro dev",
 		"build": "astro build",
-		"preview": "astro preview",
-		"astro": "astro"
+		"preview": "astro preview"
 	},
 	"dependencies": {
 		"@astrojs/netlify": "^1.2.1",
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 717ecad..c40fb8a 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -13,7 +13,7 @@ const { title } = Astro.props;
 		<meta name="viewport" content="width=device-width" />
 		<link href="https://css.gg/css" rel="stylesheet" />
 		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
-		<link rel="canonical" href="https://nookoffice.live/" />
+		<link rel="canonical" href="https://vijiatjack.github.io/nookoffice/" />
 
 		<!-- Primary Meta Tags -->
 		<title>NookOffice - Hourly Animal Crossing Music</title>
@@ -25,7 +25,7 @@ const { title } = Astro.props;
 
 		<!-- Open Graph / Facebook -->
 		<meta property="og:type" content="website" />
-		<meta property="og:url" content="https://nookoffice.live/" />
+		<meta property="og:url" content="https://vijiatjack.github.io/nookoffice/" />
 		<meta
 			property="og:title"
 			content="NookOffice - Hourly Animal Crossing Music"
@@ -38,7 +38,7 @@ const { title } = Astro.props;
 
 		<!-- Twitter -->
 		<meta property="twitter:card" content="summary_large_image" />
-		<meta property="twitter:url" content="https://nookoffice.live/" />
+		<meta property="twitter:url" content="https://vijiatjack.github.io/nookoffice/" />
 		<meta property="twitter:domain" content="nookoffice.live" />
 		<meta
 			property="twitter:title"