diff --git a/endpoints/verbs.py b/endpoints/verbs.py
index 091af8841..38cea8ff2 100644
--- a/endpoints/verbs.py
+++ b/endpoints/verbs.py
@@ -247,6 +247,12 @@ def os_arch_checker(os, arch):
       return False
 
     architecture = image_json.get('architecture', 'amd64')
+
+    # Note: Some older Docker images have 'x86_64' rather than 'amd64'.
+    # We allow the conversion here.
+    if architecture == 'x86_64' and operating_system == 'linux':
+      architecture = 'amd64'
+
     if architecture != arch:
       return False