diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index 9e20ab7..246cf5e 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -10,7 +10,9 @@
       "Bash(rm /Users/tasi/Work/TTG/teletypegames/apps/frontend/src/pages/catalog/\\\\[name\\\\].astro)",
       "Bash(npm install *)",
       "Bash(npx vue-tsc *)",
-      "Bash(npx vite *)"
+      "Bash(npx vite *)",
+      "Bash(xargs ls -la)",
+      "Bash(xargs ls)"
     ]
   }
 }
diff --git a/apps/api/app/admin/members.rb b/apps/api/app/admin/members.rb
index d25a7f6..1801628 100644
--- a/apps/api/app/admin/members.rb
+++ b/apps/api/app/admin/members.rb
@@ -34,7 +34,7 @@ ActiveAdmin.register Member do
         f.input :motto
         f.input :avatar_filename,
                 hint: "Fallback image filename (e.g. mr.zero.png) — only used when no image is selected above."
-        f.input :image, as: :select,
+        f.input :image_id, as: :select, label: "Image",
                         collection: Image.order(:original_filename).map { |img| [img.original_filename, img.id] },
                         include_blank: "— no image (use avatar_filename) —"
       end
@@ -49,7 +49,7 @@ ActiveAdmin.register Member do
       f.input :motto
       f.input :avatar_filename,
               hint: "Fallback image filename (e.g. mr.zero.png) — only used when no image is selected above."
-      f.input :image, as: :select,
+      f.input :image_id, as: :select, label: "Image",
                       collection: Image.order(:original_filename).map { |img| [img.original_filename, img.id] },
                       include_blank: "— no image (use avatar_filename) —"
     end
diff --git a/apps/api/app/admin/softwares.rb b/apps/api/app/admin/softwares.rb
index 39ad895..2e9b3f7 100644
--- a/apps/api/app/admin/softwares.rb
+++ b/apps/api/app/admin/softwares.rb
@@ -44,7 +44,7 @@ ActiveAdmin.register Software do
         f.input :status,   as: :select, collection: %w[development demo released archived]
         f.input :highlighted
         f.input :license
-        f.input :image,    as: :select,
+        f.input :image_id, as: :select, label: "Image",
                            collection: Image.order(:original_filename).map { |img| [img.original_filename, img.id] },
                            include_blank: "— no image —"
         f.input :desc,  as: :text, input_html: { rows: 4 }
@@ -82,7 +82,7 @@ ActiveAdmin.register Software do
       f.input :status,   as: :select, collection: %w[development demo released archived]
       f.input :highlighted
       f.input :license
-      f.input :image,    as: :select,
+      f.input :image_id, as: :select, label: "Image",
                          collection: Image.order(:original_filename).map { |img| [img.original_filename, img.id] },
                          include_blank: "— no image —"
       f.input :desc,  as: :text, input_html: { rows: 4 }