diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix
similarity index 84%
rename from pkgs/applications/misc/bottles/default.nix
rename to pkgs/by-name/bo/bottles-unwrapped/package.nix
index bc9d3cb2e444..c6aa927e1c02 100644
--- a/pkgs/applications/misc/bottles/default.nix
+++ b/pkgs/by-name/bo/bottles-unwrapped/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   fetchFromGitHub,
-  gitUpdater,
   python3Packages,
   blueprint-compiler,
   meson,
@@ -25,17 +24,18 @@
   mangohud,
   vkbasalt-cli,
   vmtouch,
+  nix-update-script,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "bottles-unwrapped";
-  version = "51.13";
+  version = "51.15";
 
   src = fetchFromGitHub {
     owner = "bottlesdevs";
     repo = "bottles";
-    rev = version;
-    hash = "sha256-ZcUevGY81H3ATTk390ojBp/4zBE2Lui7Qa+Qe8B0XL4=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-HjGAeIh9s7xWBy35Oj66tCtgKCd/DpHg1sMPsdjWKDs=";
   };
 
   patches = [ ./vulkan_icd.patch ];
@@ -102,18 +102,19 @@ python3Packages.buildPythonApplication rec {
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
-  passthru.updateScript = gitUpdater { };
+  passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Easy-to-use wineprefix manager";
     homepage = "https://usebottles.com/";
     downloadPage = "https://github.com/bottlesdevs/Bottles/releases";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
       psydvl
       shamilton
+      Gliczy
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     mainProgram = "bottles";
   };
 }
diff --git a/pkgs/applications/misc/bottles/vulkan_icd.patch b/pkgs/by-name/bo/bottles-unwrapped/vulkan_icd.patch
similarity index 100%
rename from pkgs/applications/misc/bottles/vulkan_icd.patch
rename to pkgs/by-name/bo/bottles-unwrapped/vulkan_icd.patch
diff --git a/pkgs/applications/misc/bottles/fhsenv.nix b/pkgs/by-name/bo/bottles/package.nix
similarity index 100%
rename from pkgs/applications/misc/bottles/fhsenv.nix
rename to pkgs/by-name/bo/bottles/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e81e5a54b2e..8d3336e68e02 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13568,10 +13568,6 @@ with pkgs;
 
   bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans { };
 
-  bottles = callPackage ../applications/misc/bottles/fhsenv.nix { };
-
-  bottles-unwrapped = callPackage ../applications/misc/bottles { };
-
   breezy = with python3Packages; toPythonApplication breezy;
 
   cage = callPackage ../applications/window-managers/cage {