diff --git a/autogen/main/masq.tf.tmpl b/autogen/main/masq.tf.tmpl
index 33d9dee31b..59551d7fdb 100644
--- a/autogen/main/masq.tf.tmpl
+++ b/autogen/main/masq.tf.tmpl
@@ -20,7 +20,7 @@
 /******************************************
   Create ip-masq-agent confimap
  *****************************************/
-resource "kubernetes_config_map" "ip_masq_agent" {
+resource "kubernetes_config_map_v1" "ip_masq_agent" {
   count = var.configure_ip_masq ? 1 : 0
 
   metadata {
@@ -48,4 +48,4 @@ EOF
     {% endif %}
   ]
 }
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/masq.tf b/masq.tf
index cbb862d720..11f1e8f898 100644
--- a/masq.tf
+++ b/masq.tf
@@ -19,7 +19,7 @@
 /******************************************
   Create ip-masq-agent confimap
  *****************************************/
-resource "kubernetes_config_map" "ip_masq_agent" {
+resource "kubernetes_config_map_v1" "ip_masq_agent" {
   count = var.configure_ip_masq ? 1 : 0
 
   metadata {
diff --git a/modules/beta-private-cluster-update-variant/masq.tf b/modules/beta-private-cluster-update-variant/masq.tf
index cbb862d720..11f1e8f898 100644
--- a/modules/beta-private-cluster-update-variant/masq.tf
+++ b/modules/beta-private-cluster-update-variant/masq.tf
@@ -19,7 +19,7 @@
 /******************************************
   Create ip-masq-agent confimap
  *****************************************/
-resource "kubernetes_config_map" "ip_masq_agent" {
+resource "kubernetes_config_map_v1" "ip_masq_agent" {
   count = var.configure_ip_masq ? 1 : 0
 
   metadata {
diff --git a/modules/beta-private-cluster/masq.tf b/modules/beta-private-cluster/masq.tf
index cbb862d720..11f1e8f898 100644
--- a/modules/beta-private-cluster/masq.tf
+++ b/modules/beta-private-cluster/masq.tf
@@ -19,7 +19,7 @@
 /******************************************
   Create ip-masq-agent confimap
  *****************************************/
-resource "kubernetes_config_map" "ip_masq_agent" {
+resource "kubernetes_config_map_v1" "ip_masq_agent" {
   count = var.configure_ip_masq ? 1 : 0
 
   metadata {
diff --git a/modules/beta-public-cluster-update-variant/masq.tf b/modules/beta-public-cluster-update-variant/masq.tf
index cbb862d720..11f1e8f898 100644
--- a/modules/beta-public-cluster-update-variant/masq.tf
+++ b/modules/beta-public-cluster-update-variant/masq.tf
@@ -19,7 +19,7 @@
 /******************************************
   Create ip-masq-agent confimap
  *****************************************/
-resource "kubernetes_config_map" "ip_masq_agent" {
+resource "kubernetes_config_map_v1" "ip_masq_agent" {
   count = var.configure_ip_masq ? 1 : 0
 
   metadata {
diff --git a/modules/beta-public-cluster/masq.tf b/modules/beta-public-cluster/masq.tf
index cbb862d720..11f1e8f898 100644
--- a/modules/beta-public-cluster/masq.tf
+++ b/modules/beta-public-cluster/masq.tf
@@ -19,7 +19,7 @@
 /******************************************
   Create ip-masq-agent confimap
  *****************************************/
-resource "kubernetes_config_map" "ip_masq_agent" {
+resource "kubernetes_config_map_v1" "ip_masq_agent" {
   count = var.configure_ip_masq ? 1 : 0
 
   metadata {
diff --git a/modules/gke-standard-cluster/metadata.yaml b/modules/gke-standard-cluster/metadata.yaml
index a9ebc3d30d..9ef9812c12 100644
--- a/modules/gke-standard-cluster/metadata.yaml
+++ b/modules/gke-standard-cluster/metadata.yaml
@@ -1123,9 +1123,9 @@ spec:
     roles:
       - level: Project
         roles:
+          - roles/container.admin
           - roles/iam.serviceAccountUser
           - roles/compute.admin
-          - roles/container.admin
     services:
       - compute.googleapis.com
       - container.googleapis.com
diff --git a/modules/private-cluster-update-variant/masq.tf b/modules/private-cluster-update-variant/masq.tf
index cbb862d720..11f1e8f898 100644
--- a/modules/private-cluster-update-variant/masq.tf
+++ b/modules/private-cluster-update-variant/masq.tf
@@ -19,7 +19,7 @@
 /******************************************
   Create ip-masq-agent confimap
  *****************************************/
-resource "kubernetes_config_map" "ip_masq_agent" {
+resource "kubernetes_config_map_v1" "ip_masq_agent" {
   count = var.configure_ip_masq ? 1 : 0
 
   metadata {
diff --git a/modules/private-cluster/masq.tf b/modules/private-cluster/masq.tf
index cbb862d720..11f1e8f898 100644
--- a/modules/private-cluster/masq.tf
+++ b/modules/private-cluster/masq.tf
@@ -19,7 +19,7 @@
 /******************************************
   Create ip-masq-agent confimap
  *****************************************/
-resource "kubernetes_config_map" "ip_masq_agent" {
+resource "kubernetes_config_map_v1" "ip_masq_agent" {
   count = var.configure_ip_masq ? 1 : 0
 
   metadata {