diff --git a/jib-core/src/main/java/com/google/cloud/tools/jib/api/DockerInfoDetails.java b/jib-core/src/main/java/com/google/cloud/tools/jib/api/DockerInfoDetails.java
index d904b550fd..fa486c40f9 100644
--- a/jib-core/src/main/java/com/google/cloud/tools/jib/api/DockerInfoDetails.java
+++ b/jib-core/src/main/java/com/google/cloud/tools/jib/api/DockerInfoDetails.java
@@ -20,7 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.cloud.tools.jib.json.JsonTemplate;
 
-/** Contains the os and architecture from {@code docker info}. */
+/** Contains docker info details outputted by {@code docker info}. */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class DockerInfoDetails implements JsonTemplate {
 
diff --git a/jib-core/src/test/java/com/google/cloud/tools/jib/docker/CliDockerClientTest.java b/jib-core/src/test/java/com/google/cloud/tools/jib/docker/CliDockerClientTest.java
index ac9b17ffa9..a88539f8c0 100644
--- a/jib-core/src/test/java/com/google/cloud/tools/jib/docker/CliDockerClientTest.java
+++ b/jib-core/src/test/java/com/google/cloud/tools/jib/docker/CliDockerClientTest.java
@@ -123,6 +123,24 @@ public void testInfo_fail() throws InterruptedException {
         .contains("'docker info' command failed with error: error");
   }
 
+  @Test
+  public void testInfo_returnsUnknownKeys() throws InterruptedException, IOException {
+    String dockerInfoJson = "{ \"unknownOS\": \"windows\"," + "\"unknownArchitecture\": \"arm64\"}";
+    DockerClient testDockerClient =
+        new CliDockerClient(
+            subcommand -> {
+              assertThat(subcommand).containsExactly("info", "-f", "{{json .}}");
+              return mockProcessBuilder;
+            });
+    Mockito.when(mockProcess.waitFor()).thenReturn(0);
+    Mockito.when(mockProcess.getInputStream())
+        .thenReturn(new ByteArrayInputStream(dockerInfoJson.getBytes()));
+
+    DockerInfoDetails infoDetails = testDockerClient.info();
+    assertThat(infoDetails.getArchitecture()).isEmpty();
+    assertThat(infoDetails.getOsType()).isEmpty();
+  }
+
   @Test
   public void testLoad() throws IOException, InterruptedException {
     DockerClient testDockerClient =