diff --git a/.buildkite/pipeline-raw.yml b/.buildkite/pipeline-raw.yml
index 41b64a0ac..7b66f9b4f 100644
--- a/.buildkite/pipeline-raw.yml
+++ b/.buildkite/pipeline-raw.yml
@@ -53,7 +53,7 @@ steps:
    - eval "$SET_VERSION"
    - cd docker
    - ./docker-static-build.sh
-   - nix shell -f.. pkgs.upx -c upx tezos-*
+   - nix run -f.. pkgs.upx -c upx tezos-*
    artifact_paths:
      - ./docker/tezos-*
    agents:
diff --git a/nix/nix/sources.json b/nix/nix/sources.json
index f4f2948b2..56ee5a938 100644
--- a/nix/nix/sources.json
+++ b/nix/nix/sources.json
@@ -36,8 +36,8 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "opam-repository": {
-        "branch": "static-layers-1",
-        "ref": "static-layers-1",
+        "branch": "master",
+        "ref": "master",
         "repo": "https://gitlab.com/tezos/opam-repository",
         "rev": "845375388d477153b36344f69a23a1b34b2bf82e",
         "type": "git"