diff --git a/content/jobuary_2024/_index.md b/content/jobuary_2024/_index.md
index 037d6ec4bf..d34e161871 100644
--- a/content/jobuary_2024/_index.md
+++ b/content/jobuary_2024/_index.md
@@ -2,7 +2,7 @@
 title: "Jobuary 2024"
 date: 2023-09-01T23:11:13Z
 draft: false
-url: "/jobuary/2024"
+url: "/jobuary2024"
 layout: jobuary-2024
 preview: "images/event_posters/2023-2024/jobuary.jpg"
 ---
\ No newline at end of file
diff --git a/content/jobuary_2025/_index.md b/content/jobuary_2025/_index.md
index 4ef2aa16b4..edd3ee79cb 100644
--- a/content/jobuary_2025/_index.md
+++ b/content/jobuary_2025/_index.md
@@ -2,7 +2,9 @@
 title: "Jobuary 2025"
 date: 2024-09-01T23:11:13Z
 draft: false
-url: "/jobuary/2025"
-layout: jobuary-2025
+url: "/jobuary2025"
+layout: jobuary
 preview: "images/event_posters/2023-2024/jobuary.jpg"
+params:
+    jobuary_tag: "jobuary2025"
 ---
\ No newline at end of file
diff --git a/content/jobuary_2026/_index.md b/content/jobuary_2026/_index.md
index 7fee422295..f3faf5c65c 100644
--- a/content/jobuary_2026/_index.md
+++ b/content/jobuary_2026/_index.md
@@ -3,6 +3,8 @@ title: "Jobuary"
 date: 2025-01-23T23:11:13Z
 draft: false
 url: "/jobuary"
-layout: jobuary-2026
+layout: jobuary
 preview: "images/event_posters/2023-2024/jobuary.jpg"
+params:
+    jobuary_tag: "jobuary2026"
 ---
diff --git a/layouts/_default/jobuary-2026.html b/layouts/_default/jobuary-2026.html
deleted file mode 100644
index 4d33ef27a8..0000000000
--- a/layouts/_default/jobuary-2026.html
+++ /dev/null
@@ -1,65 +0,0 @@
-{{ define "main" }}
-  <script src="https://unpkg.com/@lottiefiles/lottie-player@latest/dist/lottie-player.js"></script>
-  <div class="jobuary">
-    <div class="woa-background-wrap">
-      <lottie-player
-        class="woa-background"
-        src="/lottie/jobuary.json"
-        background="transparent"
-        speed="1"
-        loop
-        autoplay
-      ></lottie-player>
-    </div>
-    <div class="jobuary-background-wrap">
-      <!-- <img src="https://media.giphy.com/media/cPlsuCWPznPZ98kV2J/giphy.gif" class="woa-background" /> -->
-    </div>
-    <div class="jobuary-page">
-      <div class="woa-header">
-        <div>
-          <img class="jobuary__logo" src="/images/jobuary-logo.png" />
-        </div>
-        <div class="jobuary__slogan">Kickstart Your Career In Tech</div>
-        <div>
-          <a href="#about"
-            ><button class="jobuary-header-button">Learn More</button></a
-          >
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="jobuary-content" id="about">
-    <h1>Week 1</h1>
-    <div class="jobuary-events">
-      {{ range sort (where (.Site.Taxonomies.tags.jobuary2026) ".Params.tags" "intersect" (slice "week1")) "Date" }}
-        <a class="event_card_link hvr-float" href="{{ .RelPermalink }}"
-          >{{- partial "event_card.html" . -}}</a
-        >
-      {{ end }}
-    </div>
-    <h1>Week 2</h1>
-    <div class="jobuary-events">
-      {{ range sort (where (.Site.Taxonomies.tags.jobuary2026) ".Params.tags" "intersect" (slice "week2")) "Date" }}
-        <a class="event_card_link hvr-float" href="{{ .RelPermalink }}"
-          >{{- partial "event_card.html" . -}}</a
-        >
-      {{ end }}
-    </div>
-    <h1>Week 3</h1>
-    <div class="jobuary-events">
-      {{ range sort (where (.Site.Taxonomies.tags.jobuary2026) ".Params.tags" "intersect" (slice "week3")) "Date" }}
-        <a class="event_card_link hvr-float" href="{{ .RelPermalink }}"
-          >{{- partial "event_card.html" . -}}</a
-        >
-      {{ end }}
-    </div>
-    <h1>Week 4</h1>
-    <div class="jobuary-events">
-      {{ range sort (where (.Site.Taxonomies.tags.jobuary2026) ".Params.tags" "intersect" (slice "week4")) "Date" }}
-        <a class="event_card_link hvr-float" href="{{ .RelPermalink }}"
-          >{{- partial "event_card.html" . -}}</a
-        >
-      {{ end }}
-    </div>
-  </div>
-{{ end }}
diff --git a/layouts/_default/jobuary-2025.html b/layouts/_default/jobuary.html
similarity index 72%
rename from layouts/_default/jobuary-2025.html
rename to layouts/_default/jobuary.html
index 212cb93141..7e1cb9c428 100644
--- a/layouts/_default/jobuary-2025.html
+++ b/layouts/_default/jobuary.html
@@ -31,34 +31,42 @@
   <div class="jobuary-content" id="about">
     <h1>Week 1</h1>
     <div class="jobuary-events">
-      {{ range sort (where (.Site.Taxonomies.tags.jobuary2025) ".Params.tags" "intersect" (slice "week1")) "Date" }}
+      {{ range sort (where (index .Site.Taxonomies.tags .Params.jobuary_tag) ".Params.tags" "intersect" (slice "week1")) "Date" }}
         <a class="event_card_link hvr-float" href="{{ .RelPermalink }}"
           >{{- partial "event_card.html" . -}}</a
         >
+      {{ else }}
+        <p>Coming Soon<p>
       {{ end }}
     </div>
     <h1>Week 2</h1>
     <div class="jobuary-events">
-      {{ range sort (where (.Site.Taxonomies.tags.jobuary2025) ".Params.tags" "intersect" (slice "week2")) "Date" }}
+      {{ range sort (where (index .Site.Taxonomies.tags .Params.jobuary_tag) ".Params.tags" "intersect" (slice "week2")) "Date" }}
         <a class="event_card_link hvr-float" href="{{ .RelPermalink }}"
           >{{- partial "event_card.html" . -}}</a
         >
+      {{ else }}
+        <p>Coming Soon</p>
       {{ end }}
     </div>
     <h1>Week 3</h1>
     <div class="jobuary-events">
-      {{ range sort (where (.Site.Taxonomies.tags.jobuary2025) ".Params.tags" "intersect" (slice "week3")) "Date" }}
+      {{ range sort (where (index .Site.Taxonomies.tags .Params.jobuary_tag) ".Params.tags" "intersect" (slice "week3")) "Date" }}
         <a class="event_card_link hvr-float" href="{{ .RelPermalink }}"
           >{{- partial "event_card.html" . -}}</a
         >
+      {{ else }}
+        <p>Coming Soon</p>
       {{ end }}
     </div>
     <h1>Week 4</h1>
     <div class="jobuary-events">
-      {{ range sort (where (.Site.Taxonomies.tags.jobuary2025) ".Params.tags" "intersect" (slice "week4")) "Date" }}
+      {{ range sort (where (index .Site.Taxonomies.tags .Params.jobuary_tag) ".Params.tags" "intersect" (slice "week4")) "Date" }}
         <a class="event_card_link hvr-float" href="{{ .RelPermalink }}"
           >{{- partial "event_card.html" . -}}</a
         >
+      {{ else }}
+        <p>Coming Soon</p>
       {{ end }}
     </div>
   </div>