diff --git a/android/gradle.properties b/android/gradle.properties
index d87fe4c499..42df810fad 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -25,7 +25,7 @@ kotlinVersion=1.3.50
 minSdkVersion=23
 compileSdkVersion=30
 targetSdkVersion=30
-buildToolsVersion=30.0.3
+buildToolsVersion=31.0.0
 supportLibVersion=28.0.0
 # This should match version from nix/mobile/android/maven-and-npm-deps/maven/default.nix
 gradlePluginVersion=3.5.4
diff --git a/nix/pkgs.nix b/nix/pkgs.nix
index a21cf1f258..a1a0c619cc 100644
--- a/nix/pkgs.nix
+++ b/nix/pkgs.nix
@@ -13,8 +13,8 @@ let
     name = "nixpkgs-source";
     owner = "NixOS";
     repo = "nixpkgs";
-    rev = "76f53eef48cc6c340ed063c117aac75c4652627c";
-    sha256 = "0a2wn0ryq0ngd3ybc3ag70dp9z1x4w1jgy6qr4dzfnzbnn3s5246";
+    rev = "65135081f63ca2f5eaa9b7b54bfc7bf31502cfd6";
+    sha256 = "074lyh19x8xs8xqf4wwwl64870rpml96g7dhx1y09i81w5k29aga";
     # To get the compressed Nix sha256, use:
     # nix-prefetch-url --unpack https://github.com/${ORG}/nixpkgs/archive/${REV}.tar.gz
   };
diff --git a/nix/pkgs/android-sdk/compose.nix b/nix/pkgs/android-sdk/compose.nix
index 5cbf50b411..b05849dcca 100644
--- a/nix/pkgs/android-sdk/compose.nix
+++ b/nix/pkgs/android-sdk/compose.nix
@@ -5,25 +5,18 @@
 
 { stdenv, config, callPackage, androidenv, openjdk, mkShell }:
 
+# The "android-sdk-license" license is accepted
+# by setting android_sdk.accept_license = true.
 androidenv.composeAndroidPackages {
   toolsVersion = "26.1.1";
-  platformToolsVersion = "31.0.2";
-  buildToolsVersions = [ "30.0.3" ];
-  includeEmulator = false;
-  includeSources = false;
+  platformToolsVersion = "31.0.3";
+  buildToolsVersions = [ "31.0.0" ];
   platformVersions = [ "30" ];
-  includeSystemImages = false;
-  systemImageTypes = [ "default" ];
   cmakeVersions = [ "3.18.1" ];
-  includeNDK = true;
   ndkVersion = "22.1.7171670";
-  useGoogleAPIs = false;
-  useGoogleTVAddOns = false;
+  includeNDK = true;
   includeExtras = [
     "extras;android;m2repository"
     "extras;google;m2repository"
   ];
-  # The "android-sdk-license" license is accepted
-  # by setting android_sdk.accept_license = true.
-  extraLicenses = [];
 }