diff --git a/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs b/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs
index f4f8ff4..7554c14 100644
--- a/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs
+++ b/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs
@@ -39,7 +39,7 @@ namespace Musify.Application.PlayLists.Handlers
 
             var setPictureResult = request.Picture is null
                 ? Result.Success()
-                : await SetPicture(playList, request.Picture, cancellationToken);
+                : await UploadPicture(playList, request.Picture, cancellationToken);
 
             if (!setPictureResult.IsSuccess)
                 return setPictureResult;
@@ -51,13 +51,13 @@ namespace Musify.Application.PlayLists.Handlers
             return Result.Created(PlayListResponse.FromEntity(playList));
         }
 
-        async Task<Result> SetPicture(PlayList playList, IFileData picture, CancellationToken cancellationToken)
+        async Task<Result> UploadPicture(PlayList playList, IFileData picture, CancellationToken cancellationToken)
         {
             var imageId = Guid.NewGuid();
-            var pictureName = $"{imageId}{picture.FileType}";
-            var originalImageStorageKey = Path.Join(playListConfiguration.Routes.OriginalPictures, pictureName);
+            var pictureName = imageId + picture.FileType;
+            var pictureStorageKey = Path.Join(playListConfiguration.Routes.OriginalPictures, pictureName);
 
-            var uploadResult = await UploadFile(picture, originalImageStorageKey, cancellationToken);
+            var uploadResult = await UploadFile(picture, pictureStorageKey, cancellationToken);
 
             if (!uploadResult.IsSuccess)
             {
@@ -69,7 +69,7 @@ namespace Musify.Application.PlayLists.Handlers
 
             try
             {
-                await PublishUpdateEvent(originalImageStorageKey, playList, cancellationToken);
+                await PublishUpdateEvent(pictureStorageKey, playList, cancellationToken);
             }
             catch (Exception exception)
             {
diff --git a/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs b/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs
index b85f857..b682bbe 100644
--- a/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs
+++ b/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs
@@ -65,7 +65,7 @@ namespace Musify.Application.PlayLists.Handlers
             }
 
             var newImageId = Guid.NewGuid();
-            var pictureName = $"{newImageId}{request.NewPicture.FileType}";
+            var pictureName = newImageId + request.NewPicture.FileType;
             var newImageStorageKey = Path.Join(playListConfiguration.Routes.OriginalPictures, pictureName);
 
             var uploadResult = await UploadFile(request.NewPicture, newImageStorageKey, cancellationToken);
diff --git a/Application/Tracks/Handler/CreateTrackCommandHandler.cs b/Application/Tracks/Handler/CreateTrackCommandHandler.cs
index 6b0b7b1..2270ddc 100644
--- a/Application/Tracks/Handler/CreateTrackCommandHandler.cs
+++ b/Application/Tracks/Handler/CreateTrackCommandHandler.cs
@@ -25,7 +25,7 @@ namespace Musify.Application.Tracks.Handler
                 return Result.NotFound($"User with id {request.UserId} not found");
             }
 
-            var originalPictureKeyName = $"{Guid.NewGuid() }.{request.Picture.FileType}";
+            var originalPictureKeyName = Path.Combine(trackConfiguration.Routes.OriginalPictures, Guid.NewGuid() + request.Picture.FileType);
             var track = new Track
             {
                 Title = request.Title,
@@ -42,7 +42,8 @@ namespace Musify.Application.Tracks.Handler
                 return Result.Error($"Failed to upload picture for track {request.Title}");
             }
 
-            var audioKeyName = Path.Combine(trackConfiguration.Routes.Audios, $"{Guid.NewGuid() }.{request.Audio.FileType}");
+
+            var audioKeyName = Path.Combine(trackConfiguration.Routes.Audios, Guid.NewGuid() + request.Audio.FileType);
             var audioUploadResult = await UploadFile(request.Audio, audioKeyName, cancellationToken);
             if (!audioUploadResult.IsSuccess)
             {