diff --git a/buildifier/Dockerfile b/buildifier/Dockerfile
index 366d89ae54..ea226c2c25 100644
--- a/buildifier/Dockerfile
+++ b/buildifier/Dockerfile
@@ -1,11 +1,5 @@
 FROM python:alpine
 
-# Latest release from: https://github.com/bazelbuild/buildtools/releases
-RUN apk add curl && \
-    curl -Lo /usr/local/bin/buildifier https://github.com/bazelbuild/buildtools/releases/download/0.22.0/buildifier && \
-    chown root:root /usr/local/bin/buildifier && \
-    chmod 0755 /usr/local/bin/buildifier
-
 COPY --chown=root:root buildifier.py /usr/local/bin/buildifier.py
 
 ENTRYPOINT [ "/usr/local/bin/buildifier.py" ]
diff --git a/buildifier/buildifier.py b/buildifier/buildifier.py
index 2d30f82c26..f8930f6cf7 100755
--- a/buildifier/buildifier.py
+++ b/buildifier/buildifier.py
@@ -153,7 +153,7 @@ def get_release_urls(release):
     buildifier_assets = [
         a
         for a in release["assets"]
-        if a["name"] in ("buildifier", "buildifier-linux-amd64")
+        if a["name"] in ("buildifier", "buildifier-linux-amd64", "buildifier.linux")
     ]
     if not buildifier_assets:
         raise Exception(
@@ -203,25 +203,15 @@ def main(argv=None):
 
     buildifier_binary = "buildifier"
     display_url = BUILDIFIER_DEFAULT_DISPLAY_URL
-    version = os.environ.get(VERSION_ENV_VAR)
-    if version:
-        eprint("+++ :github: Downloading Buildifier version '{}'".format(version))
-        try:
-            version, display_url, download_url = get_buildifier_info(version)
-            eprint("Downloading Buildifier {} from {}".format(version, download_url))
-            buildifier_binary = download_buildifier(download_url)
-        except Exception as ex:
-            print_error("downloading Buildifier", str(ex))
-            return 1
-
-    # Determine Buildifier version if the user did not request a specific version.
-    if not version:
-        eprint("+++ :female-detective: Detecting Buildifier version")
-        version_result = run_buildifier(
-            buildifier_binary, ["--version"], what="Version info"
-        )
-        match = BUILDIFIER_VERSION_PATTERN.search(version_result.stdout)
-        version = match.group(1) if match and match.group(1) != "redacted" else None
+    version = os.environ.get(VERSION_ENV_VAR, "latest")
+    eprint("+++ :github: Downloading Buildifier version '{}'".format(version))
+    try:
+        version, display_url, download_url = get_buildifier_info(version)
+        eprint("Downloading Buildifier {} from {}".format(version, download_url))
+        buildifier_binary = download_buildifier(download_url)
+    except Exception as ex:
+        print_error("downloading Buildifier", str(ex))
+        return 1
 
     flags = ["--mode=check", "--lint=warn"]
     warnings = os.getenv(WARNINGS_ENV_VAR)