diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b2b18252..da646164 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -146,7 +146,7 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name    = "foo"
-  image   = docker_image.foo.latest
+  image   = docker_image.foo.image_id
 }
 ```
 
diff --git a/README.md b/README.md
index a2c0130b..059aced2 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ resource "docker_image" "nginx" {
 # -> same as 'docker run --name nginx -p8080:80 -d nginx:latest'
 resource "docker_container" "nginx" {
   name    = "nginx"
-  image   = docker_image.nginx.latest
+  image   = docker_image.nginx.image_id
 
   ports {
     external = 8080
diff --git a/docs/index.md b/docs/index.md
index 76b0dcd5..2d4a9039 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -41,7 +41,7 @@ resource "docker_image" "ubuntu" {
 
 # Create a container
 resource "docker_container" "foo" {
-  image = docker_image.ubuntu.latest
+  image = docker_image.ubuntu.image_id
   name  = "foo"
 }
 ```
@@ -61,7 +61,7 @@ resource "docker_image" "ubuntu" {
 
 # Create a container
 resource "docker_container" "foo" {
-  image = docker_image.ubuntu.latest
+  image = docker_image.ubuntu.image_id
   name  = "foo"
 }
 ```
diff --git a/docs/resources/container.md b/docs/resources/container.md
index 75ac5da7..2a82f822 100644
--- a/docs/resources/container.md
+++ b/docs/resources/container.md
@@ -16,7 +16,7 @@ Manages the lifecycle of a Docker container.
 # Start a container
 resource "docker_container" "ubuntu" {
   name  = "foo"
-  image = docker_image.ubuntu.latest
+  image = docker_image.ubuntu.image_id
 }
 
 # Find the latest Ubuntu precise image.
diff --git a/examples/provider/provider-tf12.tf b/examples/provider/provider-tf12.tf
index 016b06e2..75e3dfaf 100644
--- a/examples/provider/provider-tf12.tf
+++ b/examples/provider/provider-tf12.tf
@@ -10,6 +10,6 @@ resource "docker_image" "ubuntu" {
 
 # Create a container
 resource "docker_container" "foo" {
-  image = docker_image.ubuntu.latest
+  image = docker_image.ubuntu.image_id
   name  = "foo"
 }
diff --git a/examples/provider/provider-tf13.tf b/examples/provider/provider-tf13.tf
index 52facc4c..45441791 100644
--- a/examples/provider/provider-tf13.tf
+++ b/examples/provider/provider-tf13.tf
@@ -18,6 +18,6 @@ resource "docker_image" "ubuntu" {
 
 # Create a container
 resource "docker_container" "foo" {
-  image = docker_image.ubuntu.latest
+  image = docker_image.ubuntu.image_id
   name  = "foo"
 }
diff --git a/examples/resources/docker_container/resource.tf b/examples/resources/docker_container/resource.tf
index d7f2bd21..52394f3f 100644
--- a/examples/resources/docker_container/resource.tf
+++ b/examples/resources/docker_container/resource.tf
@@ -1,7 +1,7 @@
 # Start a container
 resource "docker_container" "ubuntu" {
   name  = "foo"
-  image = docker_image.ubuntu.latest
+  image = docker_image.ubuntu.image_id
 }
 
 # Find the latest Ubuntu precise image.
diff --git a/internal/provider/resource_docker_container_test.go b/internal/provider/resource_docker_container_test.go
index 53636ff3..d94738f4 100644
--- a/internal/provider/resource_docker_container_test.go
+++ b/internal/provider/resource_docker_container_test.go
@@ -964,7 +964,7 @@ func TestAccDockerContainer_multipleUploadContentsConfig(t *testing.T) {
 				
 				resource "docker_container" "foo" {
 					name     = "tf-test"
-					image    = docker_image.foo.latest
+					image    = docker_image.foo.image_id
 					must_run = "false"
 				
 					upload {
@@ -995,7 +995,7 @@ func TestAccDockerContainer_noUploadContentsConfig(t *testing.T) {
 				
 				resource "docker_container" "foo" {
 					name     = "tf-test"
-					image    = docker_image.foo.latest
+					image    = docker_image.foo.image_id
 					must_run = "false"
 				
 					upload {
diff --git a/testdata/resources/docker_container/testAccDockerContainer2NetworksConfig.tf b/testdata/resources/docker_container/testAccDockerContainer2NetworksConfig.tf
index 90b26f7b..fd3d2840 100644
--- a/testdata/resources/docker_container/testAccDockerContainer2NetworksConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainer2NetworksConfig.tf
@@ -13,7 +13,7 @@ resource "docker_network" "test_network_2" {
 
 resource "docker_container" "foo" {
   name          = "tf-test"
-  image         = docker_image.foo.latest
+  image         = docker_image.foo.image_id
   network_mode  = docker_network.test_network_1.name
   networks      = [docker_network.test_network_2.name]
   network_alias = ["tftest-container"]
@@ -21,7 +21,7 @@ resource "docker_container" "foo" {
 
 resource "docker_container" "bar" {
   name          = "tf-test-bar"
-  image         = docker_image.foo.latest
+  image         = docker_image.foo.image_id
   network_mode  = "bridge"
   networks      = [docker_network.test_network_2.name]
   network_alias = ["tftest-container-foo"]
diff --git a/testdata/resources/docker_container/testAccDockerContainerAttachConfig.tf b/testdata/resources/docker_container/testAccDockerContainerAttachConfig.tf
index 11b9d044..695fb251 100644
--- a/testdata/resources/docker_container/testAccDockerContainerAttachConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerAttachConfig.tf
@@ -4,7 +4,7 @@ resource "docker_image" "foo" {
 }
 resource "docker_container" "foo" {
   name     = "tf-test"
-  image    = docker_image.foo.latest
+  image    = docker_image.foo.image_id
   command  = ["/bin/sh", "-c", "for i in $(seq 1 15); do sleep 1; done"]
   attach   = true
   must_run = false
diff --git a/testdata/resources/docker_container/testAccDockerContainerConfig.tf b/testdata/resources/docker_container/testAccDockerContainerConfig.tf
index cf33bd6c..32875922 100644
--- a/testdata/resources/docker_container/testAccDockerContainerConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerConfig.tf
@@ -4,5 +4,5 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
 }
diff --git a/testdata/resources/docker_container/testAccDockerContainerCustomizedConfig.tf b/testdata/resources/docker_container/testAccDockerContainerCustomizedConfig.tf
index 8c38f9cb..4cc14a5c 100644
--- a/testdata/resources/docker_container/testAccDockerContainerCustomizedConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerCustomizedConfig.tf
@@ -4,7 +4,7 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name                  = "tf-test"
-  image                 = docker_image.foo.latest
+  image                 = docker_image.foo.image_id
   entrypoint            = ["/bin/bash", "-c", "cat /proc/kmsg"]
   user                  = "root:root"
   restart               = "on-failure"
diff --git a/testdata/resources/docker_container/testAccDockerContainerDeviceConfig.tf b/testdata/resources/docker_container/testAccDockerContainerDeviceConfig.tf
index 3f183e3b..c7599854 100644
--- a/testdata/resources/docker_container/testAccDockerContainerDeviceConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerDeviceConfig.tf
@@ -4,7 +4,7 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
 
   devices {
     host_path      = "/dev/zero"
diff --git a/testdata/resources/docker_container/testAccDockerContainerExitCodeConfig.tf b/testdata/resources/docker_container/testAccDockerContainerExitCodeConfig.tf
index 2fd88b22..8426fb7c 100644
--- a/testdata/resources/docker_container/testAccDockerContainerExitCodeConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerExitCodeConfig.tf
@@ -4,7 +4,7 @@ resource "docker_image" "foo" {
 }
 resource "docker_container" "foo" {
   name     = "tf-test"
-  image    = docker_image.foo.latest
+  image    = docker_image.foo.image_id
   command  = ["/bin/sh", "-c", "exit 123"]
   attach   = true
   must_run = false
diff --git a/testdata/resources/docker_container/testAccDockerContainerGroupAddIdConfig.tf b/testdata/resources/docker_container/testAccDockerContainerGroupAddIdConfig.tf
index 8fd616eb..2aab81df 100644
--- a/testdata/resources/docker_container/testAccDockerContainerGroupAddIdConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerGroupAddIdConfig.tf
@@ -4,7 +4,7 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
 
   group_add = [
     100
diff --git a/testdata/resources/docker_container/testAccDockerContainerGroupAddMultipleConfig.tf b/testdata/resources/docker_container/testAccDockerContainerGroupAddMultipleConfig.tf
index da78d530..bb35656a 100644
--- a/testdata/resources/docker_container/testAccDockerContainerGroupAddMultipleConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerGroupAddMultipleConfig.tf
@@ -4,7 +4,7 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
 
   group_add = [
     1,
diff --git a/testdata/resources/docker_container/testAccDockerContainerGroupAddNameConfig.tf b/testdata/resources/docker_container/testAccDockerContainerGroupAddNameConfig.tf
index 08d6715a..9b732ac5 100644
--- a/testdata/resources/docker_container/testAccDockerContainerGroupAddNameConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerGroupAddNameConfig.tf
@@ -4,7 +4,7 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
 
   group_add = [
     "users"
diff --git a/testdata/resources/docker_container/testAccDockerContainerHealthcheckConfig.tf b/testdata/resources/docker_container/testAccDockerContainerHealthcheckConfig.tf
index 44287418..5e270915 100644
--- a/testdata/resources/docker_container/testAccDockerContainerHealthcheckConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerHealthcheckConfig.tf
@@ -5,7 +5,7 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
 
   healthcheck {
     test         = ["CMD", "/bin/true"]
diff --git a/testdata/resources/docker_container/testAccDockerContainerInitConfig.tf b/testdata/resources/docker_container/testAccDockerContainerInitConfig.tf
index b87cc498..732faf51 100644
--- a/testdata/resources/docker_container/testAccDockerContainerInitConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerInitConfig.tf
@@ -4,6 +4,6 @@ resource "docker_image" "fooinit" {
 
 resource "docker_container" "fooinit" {
   name  = "tf-test"
-  image = docker_image.fooinit.latest
+  image = docker_image.fooinit.image_id
   init  = true
 }
diff --git a/testdata/resources/docker_container/testAccDockerContainerInternalPortConfig.tf b/testdata/resources/docker_container/testAccDockerContainerInternalPortConfig.tf
index 2f146059..7fccb7ce 100644
--- a/testdata/resources/docker_container/testAccDockerContainerInternalPortConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerInternalPortConfig.tf
@@ -5,7 +5,7 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
 
   ports {
     internal = 80
diff --git a/testdata/resources/docker_container/testAccDockerContainerLogsConfig.tf b/testdata/resources/docker_container/testAccDockerContainerLogsConfig.tf
index 2f0882d9..f9cc19a5 100644
--- a/testdata/resources/docker_container/testAccDockerContainerLogsConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerLogsConfig.tf
@@ -5,7 +5,7 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name     = "tf-test"
-  image    = docker_image.foo.latest
+  image    = docker_image.foo.image_id
   command  = ["/bin/sh", "-c", "for i in $(seq 1 10); do echo \"$i\"; done"]
   attach   = true
   logs     = true
diff --git a/testdata/resources/docker_container/testAccDockerContainerMountsConfig.tf b/testdata/resources/docker_container/testAccDockerContainerMountsConfig.tf
index 07c7b991..4cdfc0d1 100644
--- a/testdata/resources/docker_container/testAccDockerContainerMountsConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerMountsConfig.tf
@@ -8,7 +8,7 @@ resource "docker_volume" "foo_mounts" {
 
 resource "docker_container" "foo_mounts" {
   name  = "tf-test"
-  image = docker_image.foo_mounts.latest
+  image = docker_image.foo_mounts.image_id
 
   mounts {
     target    = "/mount/test"
diff --git a/testdata/resources/docker_container/testAccDockerContainerMultipleInternalPortConfig.tf b/testdata/resources/docker_container/testAccDockerContainerMultipleInternalPortConfig.tf
index 43f418df..5a3d62cf 100644
--- a/testdata/resources/docker_container/testAccDockerContainerMultipleInternalPortConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerMultipleInternalPortConfig.tf
@@ -5,7 +5,7 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
 
   ports {
     internal = 80
diff --git a/testdata/resources/docker_container/testAccDockerContainerMultiplePortConfig.tf b/testdata/resources/docker_container/testAccDockerContainerMultiplePortConfig.tf
index a372782f..73701485 100644
--- a/testdata/resources/docker_container/testAccDockerContainerMultiplePortConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerMultiplePortConfig.tf
@@ -5,7 +5,7 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
 
   ports {
     internal = 80
diff --git a/testdata/resources/docker_container/testAccDockerContainerNetworksDualStackAddressConfig.tf b/testdata/resources/docker_container/testAccDockerContainerNetworksDualStackAddressConfig.tf
index e63d44a8..aec8490a 100644
--- a/testdata/resources/docker_container/testAccDockerContainerNetworksDualStackAddressConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerNetworksDualStackAddressConfig.tf
@@ -16,7 +16,7 @@ resource "docker_image" "foo" {
 }
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
   networks_advanced {
     name         = docker_network.test.name
     ipv4_address = "10.0.1.123"
diff --git a/testdata/resources/docker_container/testAccDockerContainerNetworksIPv4AddressConfig.tf b/testdata/resources/docker_container/testAccDockerContainerNetworksIPv4AddressConfig.tf
index 1fa28c95..ad120a4b 100644
--- a/testdata/resources/docker_container/testAccDockerContainerNetworksIPv4AddressConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerNetworksIPv4AddressConfig.tf
@@ -10,7 +10,7 @@ resource "docker_image" "foo" {
 }
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
   networks_advanced {
     name         = docker_network.test.name
     ipv4_address = "10.0.1.123"
diff --git a/testdata/resources/docker_container/testAccDockerContainerNetworksIPv6AddressConfig.tf b/testdata/resources/docker_container/testAccDockerContainerNetworksIPv6AddressConfig.tf
index 62fbd86e..bdd39ba6 100644
--- a/testdata/resources/docker_container/testAccDockerContainerNetworksIPv6AddressConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerNetworksIPv6AddressConfig.tf
@@ -12,7 +12,7 @@ resource "docker_image" "foo" {
 }
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
   networks_advanced {
     name         = docker_network.test.name
     ipv6_address = "fd00:0:0:0::123"
diff --git a/testdata/resources/docker_container/testAccDockerContainerNoStartConfig.tf b/testdata/resources/docker_container/testAccDockerContainerNoStartConfig.tf
index 22264785..2cb64e35 100644
--- a/testdata/resources/docker_container/testAccDockerContainerNoStartConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerNoStartConfig.tf
@@ -5,7 +5,7 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name     = "tf-test"
-  image    = docker_image.foo.latest
+  image    = docker_image.foo.image_id
   start    = false
   must_run = false
 }
diff --git a/testdata/resources/docker_container/testAccDockerContainerPortConfig.tf b/testdata/resources/docker_container/testAccDockerContainerPortConfig.tf
index 49d67fe1..0539012e 100644
--- a/testdata/resources/docker_container/testAccDockerContainerPortConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerPortConfig.tf
@@ -5,7 +5,7 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
 
   ports {
     internal = 80
diff --git a/testdata/resources/docker_container/testAccDockerContainerPrivateImage.tf b/testdata/resources/docker_container/testAccDockerContainerPrivateImage.tf
index 6f5accec..2ca08c04 100644
--- a/testdata/resources/docker_container/testAccDockerContainerPrivateImage.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerPrivateImage.tf
@@ -15,5 +15,5 @@ resource "docker_image" "foo" {
 resource "docker_container" "foo" {
   provider = "docker.private"
   name     = "tf-test"
-  image    = docker_image.foo.latest
+  image    = docker_image.foo.image_id
 }
diff --git a/testdata/resources/docker_container/testAccDockerContainerReadOnlyConfig.tf b/testdata/resources/docker_container/testAccDockerContainerReadOnlyConfig.tf
index 378e841a..902e838d 100644
--- a/testdata/resources/docker_container/testAccDockerContainerReadOnlyConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerReadOnlyConfig.tf
@@ -4,7 +4,7 @@ resource "docker_image" "foo" {
 }
 resource "docker_container" "foo" {
   name      = "tf-test"
-  image     = docker_image.foo.latest
+  image     = docker_image.foo.image_id
   command   = ["/bin/sleep", "15"]
   read_only = true
 }
diff --git a/testdata/resources/docker_container/testAccDockerContainerRmConfig.tf b/testdata/resources/docker_container/testAccDockerContainerRmConfig.tf
index 0238df91..3e337d6b 100644
--- a/testdata/resources/docker_container/testAccDockerContainerRmConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerRmConfig.tf
@@ -4,7 +4,7 @@ resource "docker_image" "foo" {
 }
 resource "docker_container" "foo" {
   name    = "tf-test"
-  image   = docker_image.foo.latest
+  image   = docker_image.foo.image_id
   command = ["/bin/sleep", "15"]
   rm      = true
 }
diff --git a/testdata/resources/docker_container/testAccDockerContainerSTDIN_Config.tf b/testdata/resources/docker_container/testAccDockerContainerSTDIN_Config.tf
index 98352f51..ec461f59 100644
--- a/testdata/resources/docker_container/testAccDockerContainerSTDIN_Config.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerSTDIN_Config.tf
@@ -4,6 +4,6 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name       = "tf-test"
-  image      = docker_image.foo.latest
+  image      = docker_image.foo.image_id
   stdin_open = true
 }
diff --git a/testdata/resources/docker_container/testAccDockerContainerSysctlsConfig.tf b/testdata/resources/docker_container/testAccDockerContainerSysctlsConfig.tf
index d0d255b6..a9e07bb5 100644
--- a/testdata/resources/docker_container/testAccDockerContainerSysctlsConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerSysctlsConfig.tf
@@ -4,7 +4,7 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
 
   sysctls = {
     "net.ipv4.ip_forward" = "1"
diff --git a/testdata/resources/docker_container/testAccDockerContainerTTYConfig.tf b/testdata/resources/docker_container/testAccDockerContainerTTYConfig.tf
index 0b53935f..9b4f94a3 100644
--- a/testdata/resources/docker_container/testAccDockerContainerTTYConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerTTYConfig.tf
@@ -4,6 +4,6 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
   tty   = true
 }
diff --git a/testdata/resources/docker_container/testAccDockerContainerTmpfsConfig.tf b/testdata/resources/docker_container/testAccDockerContainerTmpfsConfig.tf
index 57425acf..dcc54f30 100644
--- a/testdata/resources/docker_container/testAccDockerContainerTmpfsConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerTmpfsConfig.tf
@@ -4,7 +4,7 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
 
   tmpfs = {
     "/mount/tmpfs" = "rw,noexec,nosuid"
diff --git a/testdata/resources/docker_container/testAccDockerContainerUpdateConfig.tf b/testdata/resources/docker_container/testAccDockerContainerUpdateConfig.tf
index 2f8e2b92..8afd996b 100644
--- a/testdata/resources/docker_container/testAccDockerContainerUpdateConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerUpdateConfig.tf
@@ -4,7 +4,7 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
 
   restart         = "on-failure"
   max_retry_count = 5
diff --git a/testdata/resources/docker_container/testAccDockerContainerUploadBase64Config.tf b/testdata/resources/docker_container/testAccDockerContainerUploadBase64Config.tf
index 1c3f429c..0d10a549 100644
--- a/testdata/resources/docker_container/testAccDockerContainerUploadBase64Config.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerUploadBase64Config.tf
@@ -5,7 +5,7 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
 
   upload {
     content_base64 = base64encode("894fc3f56edf2d3a4c5fb5cb71df910f958a2ed8")
diff --git a/testdata/resources/docker_container/testAccDockerContainerUploadConfig.tf b/testdata/resources/docker_container/testAccDockerContainerUploadConfig.tf
index 4b04fa96..410699b3 100644
--- a/testdata/resources/docker_container/testAccDockerContainerUploadConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerUploadConfig.tf
@@ -5,7 +5,7 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
 
   upload {
     content    = "foo"
diff --git a/testdata/resources/docker_container/testAccDockerContainerUploadSourceConfig.tf b/testdata/resources/docker_container/testAccDockerContainerUploadSourceConfig.tf
index 5b157c39..30339544 100644
--- a/testdata/resources/docker_container/testAccDockerContainerUploadSourceConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerUploadSourceConfig.tf
@@ -5,7 +5,7 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
 
   upload {
     source     = "%s"
diff --git a/testdata/resources/docker_container/testAccDockerContainerUploadSourceHashConfig.tf b/testdata/resources/docker_container/testAccDockerContainerUploadSourceHashConfig.tf
index ee5822d9..b553783d 100644
--- a/testdata/resources/docker_container/testAccDockerContainerUploadSourceHashConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerUploadSourceHashConfig.tf
@@ -5,7 +5,7 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
 
   upload {
     source      = "%s"
diff --git a/testdata/resources/docker_container/testAccDockerContainerVolumeConfig.tf b/testdata/resources/docker_container/testAccDockerContainerVolumeConfig.tf
index 647ec5f3..568bf90e 100644
--- a/testdata/resources/docker_container/testAccDockerContainerVolumeConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerVolumeConfig.tf
@@ -8,7 +8,7 @@ resource "docker_volume" "foo" {
 
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
 
   volumes {
     volume_name    = docker_volume.foo.name
diff --git a/testdata/resources/docker_container/testAccDockerContainerWith2BridgeNetworkConfig.tf b/testdata/resources/docker_container/testAccDockerContainerWith2BridgeNetworkConfig.tf
index 44ed36b7..6226e99c 100644
--- a/testdata/resources/docker_container/testAccDockerContainerWith2BridgeNetworkConfig.tf
+++ b/testdata/resources/docker_container/testAccDockerContainerWith2BridgeNetworkConfig.tf
@@ -12,7 +12,7 @@ resource "docker_image" "foo" {
 
 resource "docker_container" "foo" {
   name  = "tf-test"
-  image = docker_image.foo.latest
+  image = docker_image.foo.image_id
   networks = [
     docker_network.tftest.name,
     docker_network.tftest_2.name
diff --git a/testdata/resources/docker_image/testAccDockerImageName.tf b/testdata/resources/docker_image/testAccDockerImageName.tf
index 76fa09e3..0c759dd7 100644
--- a/testdata/resources/docker_image/testAccDockerImageName.tf
+++ b/testdata/resources/docker_image/testAccDockerImageName.tf
@@ -6,7 +6,7 @@ resource "docker_container" "foo" {
   depends_on = [
     docker_image.ubuntu
   ]
-  image   = docker_image.ubuntu.latest
+  image   = docker_image.ubuntu.image_id
   name    = "foobar"
   command = ["sh", "-c", "while true ;do wait ;done"]
 }