diff --git a/src/components/course/course-hero.astro b/src/components/course/course-hero.astro
index 046129d..229b16c 100644
--- a/src/components/course/course-hero.astro
+++ b/src/components/course/course-hero.astro
@@ -19,7 +19,7 @@ const { course }: Props = Astro.props;
     <div class="d-flex align-items-center flex-wrap">
       <div class="d-flex align-items-center me-4">
         <div class="flex-shrink-0 avatar-group avatar-group-xs">
-          {course?.image && (
+          {course.user_created.avatar && (
             <figure class="avatar avatar-xs avatar-circle">
               <Image 
                 class="avatar-img"
diff --git a/src/libs/courses.ts b/src/libs/courses.ts
index 8875efb..110698a 100644
--- a/src/libs/courses.ts
+++ b/src/libs/courses.ts
@@ -2,10 +2,20 @@ import directus from "./directus";
 import { readItems, type Query } from "@directus/sdk";
 import type { CodyopsCourses, Courses } from "../types/codyops-courses";
 
+const isDev = import.meta.env.DEV; // Astro's way to check for development mode
+
 export const courses = await directus.request(
   readItems<CodyopsCourses, 'codyops_courses', Query<CodyopsCourses, Courses>>("codyops_courses", {
         fields: [
-            '*',
+            'id',
+            'name',
+            'level',
+            'category',
+            'cloud',
+            'image',
+            'description',
+            'features',
+            'status',
             {
               codyops_careers: [
                 {
@@ -32,7 +42,11 @@ export const courses = await directus.request(
                     'video'
                 ]
             }
-        ]}
+        ],
+        filter: {
+          status: isDev ? { '_neq': 'archived' } : { '_eq': 'published' }
+        },
+      }
     )
 );