diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/by-name/vp/vpcs/package.nix
similarity index 80%
rename from pkgs/applications/virtualization/vpcs/default.nix
rename to pkgs/by-name/vp/vpcs/package.nix
index 15f769ef9698..0b8582c54a47 100644
--- a/pkgs/applications/virtualization/vpcs/default.nix
+++ b/pkgs/by-name/vp/vpcs/package.nix
@@ -1,8 +1,9 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, testers
-, vpcs
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  testers,
+  vpcs,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -12,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "GNS3";
     repo = "vpcs";
-    rev = "v${finalAttrs.version}";
+    rev = "refs/tags/v${finalAttrs.version}";
     hash = "sha256-OKi4sC4fmKtkJkkpHZ6OfeIDaBafVrJXGXh1R6gLPFY=";
   };
 
@@ -26,22 +27,16 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postBuild
   '';
 
-  installPhase = ''
-    runHook preInstall
-
+  postInstall = ''
     install -D -m555 vpcs $out/bin/vpcs
     install -D -m444 ../man/vpcs.1 $out/share/man/man1/vpcs.1
-
-    runHook postInstall
   '';
 
   enableParallelBuilding = true;
 
-  passthru = {
-    tests.version = testers.testVersion {
-      package = vpcs;
-      command = "vpcs -v";
-    };
+  passthru.tests.version = testers.testVersion {
+    package = vpcs;
+    command = "vpcs -v";
   };
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b57916434ed..0515125e06fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33731,8 +33731,6 @@ with pkgs;
 
   vivictpp = callPackage ../applications/video/vivictpp { };
 
-  vpcs = callPackage ../applications/virtualization/vpcs { };
-
   primusLib = callPackage ../tools/X11/primus/lib.nix {
     nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; };
   };