diff --git a/pkgs/misc/opcua-client-gui/default.nix b/pkgs/by-name/op/opcua-client-gui/package.nix
similarity index 87%
rename from pkgs/misc/opcua-client-gui/default.nix
rename to pkgs/by-name/op/opcua-client-gui/package.nix
index 3e94817640d9..edadf283ec2e 100644
--- a/pkgs/misc/opcua-client-gui/default.nix
+++ b/pkgs/by-name/op/opcua-client-gui/package.nix
@@ -6,7 +6,7 @@
   makeDesktopItem,
   copyDesktopItems,
   desktopToDarwinBundle,
-  wrapQtAppsHook,
+  qt5,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -17,13 +17,17 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "FreeOpcUa";
     repo = "opcua-client-gui";
-    rev = version;
+    tag = version;
     hash = "sha256-0BH1Txr3z4a7iFcsfnovmBUreXMvIX2zpZa8QivQVx8=";
   };
 
+  buildInputs = [
+    qt5.qtwayland
+  ];
+
   nativeBuildInputs = [
     copyDesktopItems
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
 
@@ -39,9 +43,6 @@ python3Packages.buildPythonApplication rec {
     pyqtgraph
   ];
 
-  #This test uses a deprecated libarby, when updating the package check if the test was updated as well
-  doCheck = false;
-
   desktopItems = [
     (makeDesktopItem {
       name = "opcua-client";
diff --git a/pkgs/applications/misc/playonlinux/0001-fix-locale.patch b/pkgs/by-name/pl/playonlinux/0001-fix-locale.patch
similarity index 100%
rename from pkgs/applications/misc/playonlinux/0001-fix-locale.patch
rename to pkgs/by-name/pl/playonlinux/0001-fix-locale.patch
diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/by-name/pl/playonlinux/package.nix
similarity index 91%
rename from pkgs/applications/misc/playonlinux/default.nix
rename to pkgs/by-name/pl/playonlinux/package.nix
index 725474759d98..392ad5b1d38d 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/by-name/pl/playonlinux/package.nix
@@ -1,8 +1,8 @@
 {
   lib,
-  stdenv,
+  stdenv_32bit,
   makeWrapper,
-  fetchurl,
+  fetchFromGitHub,
   cabextract,
   gettext,
   gnupg,
@@ -33,7 +33,7 @@
 }:
 
 let
-  version = "4.4";
+  stdenv = stdenv_32bit;
 
   binpath = lib.makeBinPath [
     cabextract
@@ -80,13 +80,15 @@ let
   );
 
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "playonlinux";
-  inherit version;
+  version = "4.4-unstable-2025-11-07";
 
-  src = fetchurl {
-    url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz";
-    sha256 = "0n40927c8cnjackfns68zwl7h4d7dvhf7cyqdkazzwwx4k2xxvma";
+  src = fetchFromGitHub {
+    owner = "PlayOnLinux";
+    repo = "POL-POM-4";
+    rev = "a91f598837b3d77ead6f418ec300fd4d284fdfa4";
+    hash = "sha256-rFZ1+30aOgNH4G+i08lfy7dCoYmN7VFlG48zxHpXOQQ=";
   };
 
   patches = [
@@ -173,4 +175,4 @@ stdenv.mkDerivation {
     ];
     mainProgram = "playonlinux";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a2fbc38bd0c..16a555a6950d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11373,8 +11373,6 @@ with pkgs;
 
   ninja_1_11 = callPackage ../by-name/ni/ninja/package.nix { ninjaRelease = "1.11"; };
 
-  opcua-client-gui = libsForQt5.callPackage ../misc/opcua-client-gui { };
-
   ostinato = libsForQt5.callPackage ../applications/networking/ostinato {
     protobuf = protobuf_21;
   };
@@ -11391,8 +11389,6 @@ with pkgs;
 
   pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { };
 
-  playonlinux = callPackage ../applications/misc/playonlinux { stdenv = stdenv_32bit; };
-
   pleroma-bot = python3Packages.callPackage ../development/python-modules/pleroma-bot { };
 
   pnglatex = with python3Packages; toPythonApplication pnglatex;