diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix
index 32ef248ca854..294746ae9a36 100644
--- a/pkgs/tools/misc/cloud-utils/default.nix
+++ b/pkgs/tools/misc/cloud-utils/default.nix
@@ -1,26 +1,46 @@
-{ lib, stdenv, fetchurl, makeWrapper
-, gawk, gnused, util-linux, file
-, wget, python3, qemu-utils
-, e2fsprogs, cdrkit
-, gptfdisk }:
-
+{ lib
+, stdenv
+, fetchFromGitHub
+, gitUpdater
+, makeWrapper
+, gawk
+, gnused
+, util-linux
+, file
+, wget
+, python3
+, qemu-utils
+, e2fsprogs
+, cdrkit
+, gptfdisk
+}:
 let
   # according to https://packages.debian.org/sid/cloud-image-utils + https://packages.debian.org/sid/admin/cloud-guest-utils
   guestDeps = [
-    e2fsprogs gptfdisk gawk gnused util-linux
+    e2fsprogs
+    gptfdisk
+    gawk
+    gnused
+    util-linux
   ];
   binDeps = guestDeps ++ [
-    wget file qemu-utils cdrkit
+    wget
+    file
+    qemu-utils
+    cdrkit
   ];
-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
   # NOTICE: if you bump this, make sure to run
   # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops
   # growpart is needed in initrd in nixos/system/boot/grow-partition.nix
   pname = "cloud-utils";
-  version = "0.32";
-  src = fetchurl {
-    url = "https://launchpad.net/cloud-utils/trunk/${version}/+download/cloud-utils-${version}.tar.gz";
-    sha256 = "0xxdi55lzw7j91zfajw7jhd2ilsqj2dy04i9brlk8j3pvb5ma8hk";
+  version = "0.33";
+  src = fetchFromGitHub {
+    owner = "canonical";
+    repo = "cloud-utils";
+    rev = "refs/tags/${version}";
+    hash = "sha256-YqfkmYclPZu6Mc2bFYxtiuH7uvfa3V4YlD0aHuKn1hw=";
   };
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ python3 ];
@@ -29,7 +49,7 @@ in stdenv.mkDerivation rec {
   # $guest output contains all executables needed for cloud-init and $out the rest + $guest
   # This is similar to debian's package split into cloud-image-utils and cloud-guest-utils
   # The reason is to reduce the closure size
-  outputs = [ "out" "guest"];
+  outputs = [ "out" "guest" ];
 
   postFixup = ''
     moveToOutput bin/ec2metadata $guest
@@ -48,7 +68,11 @@ in stdenv.mkDerivation rec {
 
   dontBuild = true;
 
+  passthru.updateScript = gitUpdater { };
+
   meta = with lib; {
+    description = "Useful set of utilities for interacting with a cloud";
+    homepage = "https://github.com/canonical/cloud-utils";
     platforms = platforms.unix;
     license = licenses.gpl3;
   };