diff --git a/front/src/components/Queue.vue b/front/src/components/Queue.vue
index 0cf5e92d2..bf7167502 100644
--- a/front/src/components/Queue.vue
+++ b/front/src/components/Queue.vue
@@ -305,8 +305,8 @@ if (!isWebGLSupported) {
                 @click.stop.prevent=""
               >
                 <Pill>
-                  <template #image v-if="ac.artist.attachment_cover">
-                    <img v-lazy="ac.artist.attachment_cover?.urls.medium_square_crop">
+                  <template #image v-if="ac.artist.cover">
+                    <img v-lazy="ac.artist.cover?.urls.medium_square_crop">
                   </template>
                   {{ ac.credit ?? t('components.Queue.meta.unknownArtist') }}
                 </Pill>
diff --git a/front/src/components/artist/Card.vue b/front/src/components/artist/Card.vue
index 497f29aa9..4b4b73c89 100644
--- a/front/src/components/artist/Card.vue
+++ b/front/src/components/artist/Card.vue
@@ -22,7 +22,7 @@ const props = defineProps<Props>()
 const { artist } = props
 
 const cover = computed(() => {
-  const artistCover = artist.attachment_cover ?? undefined
+  const artistCover = artist.cover ?? undefined
 
   const albumCover = albums.value?.find(
     (album: Album) => album.cover?.urls
diff --git a/front/src/components/audio/ArtistCreditLabel.vue b/front/src/components/audio/ArtistCreditLabel.vue
index c0ea32e57..4b634ff37 100644
--- a/front/src/components/audio/ArtistCreditLabel.vue
+++ b/front/src/components/audio/ArtistCreditLabel.vue
@@ -32,8 +32,8 @@ const getRoute = (ac: ArtistCredit) => {
         :to="getRoute(ac)"
       >
         <img
-          v-if="ac.index === 0 && ac.artist.attachment_cover && ac.artist.attachment_cover.urls.original"
-          v-lazy="store.getters['instance/absoluteUrl'](ac.artist.attachment_cover.urls.medium_square_crop)"
+          v-if="ac.index === 0 && ac.artist.cover && ac.artist.cover.urls.original"
+          v-lazy="store.getters['instance/absoluteUrl'](ac.artist.cover.urls.medium_square_crop)"
           alt=""
           :class="[{circular: ac.artist.content_category != 'podcast'}]"
         >
diff --git a/front/src/components/audio/ArtistLabel.vue b/front/src/components/audio/ArtistLabel.vue
index 254fb9866..e7244f805 100644
--- a/front/src/components/audio/ArtistLabel.vue
+++ b/front/src/components/audio/ArtistLabel.vue
@@ -24,8 +24,8 @@ const route = computed(() => props.artist.channel
     :to="route"
   >
     <img
-      v-if="artist.attachment_cover && artist.attachment_cover.urls.original"
-      v-lazy="store.getters['instance/absoluteUrl'](artist.attachment_cover.urls.medium_square_crop)"
+      v-if="artist.cover && artist.cover.urls.original"
+      v-lazy="store.getters['instance/absoluteUrl'](artist.cover.urls.medium_square_crop)"
       alt=""
       :class="[{circular: artist.content_category != 'podcast'}]"
     >
diff --git a/front/src/components/audio/artist/Card.vue b/front/src/components/audio/artist/Card.vue
index dcafe8656..b31a27b75 100644
--- a/front/src/components/audio/artist/Card.vue
+++ b/front/src/components/audio/artist/Card.vue
@@ -17,9 +17,9 @@ const { t } = useI18n()
 
 const props = defineProps<Props>()
 
-const cover = computed(() => !props.artist.attachment_cover?.urls.original
+const cover = computed(() => !props.artist.cover?.urls.original
   ? props.artist.albums.find(album => !!album.cover?.urls.original)?.cover
-  : props.artist.attachment_cover
+  : props.artist.cover
 )
 
 const store = useStore()
diff --git a/front/src/components/audio/podcast/MobileRow.vue b/front/src/components/audio/podcast/MobileRow.vue
index 620efbf23..4e21fc31e 100644
--- a/front/src/components/audio/podcast/MobileRow.vue
+++ b/front/src/components/audio/podcast/MobileRow.vue
@@ -86,7 +86,7 @@ const actionsButtonLabel = computed(() => t('components.audio.podcast.MobileRow.
         class="ui artist-track mini image"
       >
       <img
-        v-else-if="!!track.artist_credit.length && track.artist_credit[0].artist.attachment_cover"
+        v-else-if="!!track.artist_credit.length && track.artist_credit[0].artist.cover"
         v-lazy="getArtistCoverUrl(track.artist_credit)"
         alt=""
         class="ui artist-track mini image"
diff --git a/front/src/components/audio/podcast/Modal.vue b/front/src/components/audio/podcast/Modal.vue
index 65794d8bc..efeffa4f1 100644
--- a/front/src/components/audio/podcast/Modal.vue
+++ b/front/src/components/audio/podcast/Modal.vue
@@ -122,7 +122,7 @@ const labels = computed(() => ({
           class="ui centered image"
         >
         <img
-          v-else-if="!!track.artist_credit?.length && track.artist_credit[0].artist.attachment_cover"
+          v-else-if="!!track.artist_credit?.length && track.artist_credit[0].artist.cover"
           v-lazy="
             getArtistCoverUrl(track.artist_credit)
           "
diff --git a/front/src/components/audio/podcast/Row.vue b/front/src/components/audio/podcast/Row.vue
index d9a758822..c98c7493c 100644
--- a/front/src/components/audio/podcast/Row.vue
+++ b/front/src/components/audio/podcast/Row.vue
@@ -97,7 +97,7 @@ await fetchData()
         class="ui artist-track mini image"
       >
       <img
-        v-else-if="track.artist_credit.length && track.artist_credit[0].artist.attachment_cover"
+        v-else-if="track.artist_credit.length && track.artist_credit[0].artist.cover"
         v-lazy="getArtistCoverUrl(track.artist_credit)"
         alt=""
         class="ui artist-track mini image"
diff --git a/front/src/components/audio/track/Modal.vue b/front/src/components/audio/track/Modal.vue
index f0ffc3cc2..39e1a6fe8 100644
--- a/front/src/components/audio/track/Modal.vue
+++ b/front/src/components/audio/track/Modal.vue
@@ -114,7 +114,7 @@ const labels = computed(() => ({
           class="ui centered image"
         >
         <img
-          v-else-if="!!track.artist_credit.length && track.artist_credit[0].artist.attachment_cover"
+          v-else-if="!!track.artist_credit.length && track.artist_credit[0].artist.cover"
           v-lazy="getArtistCoverUrl(track.artist_credit)"
           alt=""
           class="ui centered image"
diff --git a/front/src/components/audio/track/Row.vue b/front/src/components/audio/track/Row.vue
index 8e7d44f8a..2cde48cda 100644
--- a/front/src/components/audio/track/Row.vue
+++ b/front/src/components/audio/track/Row.vue
@@ -139,8 +139,8 @@ const hover = ref(false)
         class="ui artist-track mini image"
       >
       <img
-        v-else-if="showArt && track.artist_credit?.length && track.artist_credit[0].artist.attachment_cover?.urls.original"
-        v-lazy="store.getters['instance/absoluteUrl'](track.artist_credit[0].artist.attachment_cover.urls.medium_square_crop) "
+        v-else-if="showArt && track.artist_credit?.length && track.artist_credit[0].artist.cover?.urls.original"
+        v-lazy="store.getters['instance/absoluteUrl'](track.artist_credit[0].artist.cover.urls.medium_square_crop) "
         alt=""
         class="ui artist-track mini image"
       >
diff --git a/front/src/components/library/AlbumBase.vue b/front/src/components/library/AlbumBase.vue
index 250a40fa0..dfb53d483 100644
--- a/front/src/components/library/AlbumBase.vue
+++ b/front/src/components/library/AlbumBase.vue
@@ -164,10 +164,10 @@ const remove = async () => {
           class="channel-image"
         />
         <img
-          v-else-if="object.artist_credit && object.artist_credit[0] && object.artist_credit[0].artist.attachment_cover"
+          v-else-if="object.artist_credit && object.artist_credit[0] && object.artist_credit[0].artist.cover"
           :alt="object.artist_credit[0].artist.name"
           class="channel-image"
-          v-lazy="object.artist_credit[0].artist.attachment_cover.urls.large_square_crop"
+          v-lazy="object.artist_credit[0].artist.cover.urls.large_square_crop"
           />
         <img
           v-else
diff --git a/front/src/components/library/ArtistBase.vue b/front/src/components/library/ArtistBase.vue
index 269d4403b..e5c8cf60d 100644
--- a/front/src/components/library/ArtistBase.vue
+++ b/front/src/components/library/ArtistBase.vue
@@ -58,7 +58,7 @@ const publicLibraries = computed(() => libraries.value?.filter(library => librar
 
 
 const cover =  computed(() => {
-  const artistCover: Cover | undefined = object.value?.attachment_cover
+  const artistCover: Cover | undefined = object.value?.cover
 
   const albumCover: Cover | undefined = object.value?.albums
     .find(album => album.cover?.urls.large_square_crop)?.cover
diff --git a/front/src/composables/audio/queue.ts b/front/src/composables/audio/queue.ts
index 0ea1797d1..9e44a5595 100644
--- a/front/src/composables/audio/queue.ts
+++ b/front/src/composables/audio/queue.ts
@@ -125,7 +125,7 @@ export const useQueue = createGlobalState(() => {
       coverUrl: (
         track.cover?.urls.original ||
         track.album.cover?.urls.original ||
-        track.artist_credit[0].artist.attachment_cover?.urls.original ||
+        track.artist_credit[0].artist.cover?.urls.original ||
         new URL('../../assets/audio/default-cover.png', import.meta.url).href
       ).toString(),
       sources: track.uploads.map(upload => ({
diff --git a/front/src/composables/moderation/useEditConfigs.ts b/front/src/composables/moderation/useEditConfigs.ts
index 27385d0d7..35327525e 100644
--- a/front/src/composables/moderation/useEditConfigs.ts
+++ b/front/src/composables/moderation/useEditConfigs.ts
@@ -79,6 +79,7 @@ export default (): Configs => {
         description,
         {
           id: 'release_date',
+          // TODO: Change type to date and offer date select input in form
           type: 'text',
           required: false,
           label: t('composables.moderation.useEditConfigs.album.releaseDate'),
diff --git a/front/src/utils/utils.ts b/front/src/utils/utils.ts
index 6ad78b41e..69bee741d 100644
--- a/front/src/utils/utils.ts
+++ b/front/src/utils/utils.ts
@@ -41,8 +41,8 @@ export function getArtistCoverUrl (artistCredits: ArtistCredit[]): string | unde
 
 const getSimpleArtistCover = ( artist: SimpleArtist ) =>
   ( field: 'original' | 'small_square_crop' | 'medium_square_crop' | 'large_square_crop' ) =>
-    artist.attachment_cover ?
-      ( field in artist.attachment_cover ? artist.attachment_cover.urls[field] : null )
+    artist.cover ?
+      ( field in artist.cover ? artist.cover.urls[field] : null )
       : null
 
 /** Returns the absolute Url of this artist's cover on this instance