diff --git a/_includes/post-cards.html b/_includes/post-cards.html
index 7f59de6..403b5f6 100644
--- a/_includes/post-cards.html
+++ b/_includes/post-cards.html
@@ -6,7 +6,7 @@
           <div class="d-none d-md-flex col-md-7 col-lg-6 col-xl-5">
             <a href="{{ post.url | relative_url }}">
               <img
-                src="{{ post.image | post_asset_path: post | fallback_path: '/assets/img/card-image-placeholder.png' | relative_url }}"
+                src="{{ post.image | relative_url }}"
                 class="rounded-start object-fit-cover w-100 h-100"
                 alt="{{ post.image_alt | default: 'Bilete for innlegget' }}"
               >
diff --git a/_layouts/post.html b/_layouts/post.html
index 405e846..42a79d3 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -18,7 +18,7 @@ <h1 class="post-title p-name" itemprop="name headline">{{ page.title | escape }}
   <div class="position-relative popout-lg-medium popout-xl-large px-0 py-1 py-md-3 py-lg-3 py-xl-5 text-center">
     <img
       class="u-featured img-fluid"
-      src="{{ page.image | post_asset_path | fallback_path: '/assets/img/card-image-placeholder.png' | relative_url }}"
+      src="{{ page.image | relative_url }}"
       alt=""
     >
   </div>
@@ -54,7 +54,7 @@ <h3>Relaterte innlegg</h3>
           >
             <img
               class="card-img-top"
-              src="{{ related_post.image | post_asset_path | fallback_path: '/assets/img/card-image-placeholder.png' | relative_url }}"
+              src="{{ related_post.image | relative_url }}"
               alt="Bilete for {{ related_post.title | escape }}"
             >
             <div class="card-body p-2">
diff --git a/_plugins/modify_post_image_paths.rb b/_plugins/modify_post_image_paths.rb
new file mode 100644
index 0000000..1784bcd
--- /dev/null
+++ b/_plugins/modify_post_image_paths.rb
@@ -0,0 +1,26 @@
+module Jekyll
+  class ModifyPostImagePaths < Generator
+    priority :high
+
+    def generate(site)
+      site.posts.docs.each do |post|
+        if post.data['image']
+          # don't modify absolute URLs
+          if post.data['image'].start_with?('http')
+            next
+          end
+
+          asset_dir = if post['draft']
+            "assets/attachments/drafts/#{post['slug']}"
+          else
+            "assets/attachments/#{post['date'].strftime('%Y/%m/%d')}/#{post['slug']}"
+          end
+
+          post.data['image'] = "/#{asset_dir}/#{post.data['image']}"
+        else
+          post.data['image'] = "/assets/img/card-image-placeholder.png"
+        end
+      end
+    end
+  end
+end