diff --git a/Makefile b/Makefile
index 26f219f..e24006d 100644
--- a/Makefile
+++ b/Makefile
@@ -212,9 +212,7 @@ upload-container-image:
 ifndef version
 	$(error version variable must be set)
 else
-	docker build --platform linux/arm64,linux/amd64 -t gcr.io/gadget-core-production/dateilager:$(version) -t gcr.io/gadget-core-production/dateilager:latest .
-	docker push gcr.io/gadget-core-production/dateilager:$(version)
-	docker push gcr.io/gadget-core-production/dateilager:latest
+	docker build --platform linux/arm64,linux/amd64 --push -t gcr.io/gadget-core-production/dateilager:$(version) -t gcr.io/gadget-core-production/dateilager:latest .
 endif
 
 upload-prerelease-container-image:
diff --git a/flake.nix b/flake.nix
index 8e5f810..1125981 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,7 +37,7 @@
           callPackage = pkgs.newScope (flake.packages // { inherit lib callPackage; });
         in
         {
-          packages =  {
+          packages = {
             ## DateiLager development scripts
 
             clean = callPackage ./development/nix/scripts/clean.nix { };
@@ -54,6 +54,8 @@
 
             postgresql = pkgs.postgresql_14;
 
+            google-cloud-sdk = pkgs.google-cloud-sdk;
+
             golangci-lint = pkgs.golangci-lint;
 
             glibcLocales = pkgs.glibcLocales;
@@ -77,6 +79,7 @@
               flake.packages.clean
               flake.packages.golangci-lint
               flake.packages.glibcLocales
+              flake.packages.google-cloud-sdk
               git
               protobuf
               protoc-gen-go
@@ -91,7 +94,7 @@
 
               # silence ginko deprecations -- they come from the csi test suite that we don't control
               export ACK_GINKGO_DEPRECATIONS=1.16.5
-          '';
+            '';
           };
         }
       )));