diff --git a/wasm_plugin_basic_docker_repository/main.tf b/wasm_plugin_basic_docker_repository/main.tf
index 159631af..c524b509 100644
--- a/wasm_plugin_basic_docker_repository/main.tf
+++ b/wasm_plugin_basic_docker_repository/main.tf
@@ -18,7 +18,7 @@ resource "google_network_services_wasm_plugin" "wasm_plugin" {
   versions {
     version_name = "v1"
     description = "v1 version of my wasm plugin"
-    image_uri = "us-central1-docker.pkg.dev/${data.google_project.project.name}/{index $.Vars "repository_name"}/{index $.Vars "plugin_package_name"}:prod"
+    image_uri = "us-central1-docker.pkg.dev/${data.google_project.project.name}/my-artifact-registry-docker-repository-${local.name_suffix}/my-wasm-plugin-data-${local.name_suffix}:prod"
 
     labels = {
       test_label =  "test_value"
diff --git a/wasm_plugin_basic_generic_repository/main.tf b/wasm_plugin_basic_generic_repository/main.tf
index 481c8162..4d57084d 100644
--- a/wasm_plugin_basic_generic_repository/main.tf
+++ b/wasm_plugin_basic_generic_repository/main.tf
@@ -18,7 +18,7 @@ resource "google_network_services_wasm_plugin" "wasm_plugin" {
   versions {
     version_name = "v1"
     description = "v1 version of my wasm plugin"
-    image_uri = "projects/${data.google_project.project.name}/locations/us-central1/repositories/{index $.Vars "repository_name"}/genericArtifacts/{index $.Vars "plugin_package_name"}:v1"
+    image_uri = "projects/${data.google_project.project.name}/locations/us-central1/repositories/my-artifact-registry-generic-repository-${local.name_suffix}/genericArtifacts/my-wasm-plugin-data-${local.name_suffix}:v1"
 
     labels = {
       test_label =  "test_value"