diff --git a/config/common_versions.yml b/config/common_versions.yml
index 4966ab81e1..7e9c9cf2de 100644
--- a/config/common_versions.yml
+++ b/config/common_versions.yml
@@ -1,5 +1,5 @@
-title: v1.1.11
+title: v1.1.12
 components:
   key-cert-provisioner:
     image: tigera/key-cert-provisioner
-    version: v1.1.11
+    version: v1.1.12
diff --git a/config/enterprise_versions.yml b/config/enterprise_versions.yml
index 9d5a0f3ff7..7aa20b898f 100644
--- a/config/enterprise_versions.yml
+++ b/config/enterprise_versions.yml
@@ -1,147 +1,147 @@
 # Components defined here are required to be kept in sync with hack/gen-versions/enterprise.go.tpl
-title: v3.16.3
+title: v3.16.4
 components:
   libcalico-go:
-    version: v3.16.3
+    version: v3.16.4
   cnx-manager:
     image: tigera/cnx-manager
-    version: v3.16.3
+    version: v3.16.4
   voltron:
     image: tigera/voltron
-    version: v3.16.3
+    version: v3.16.4
   cnx-apiserver:
     image: tigera/cnx-apiserver
-    version: v3.16.3
+    version: v3.16.4
   cnx-queryserver:
     image: tigera/cnx-queryserver
-    version: v3.16.3
+    version: v3.16.4
   cnx-kube-controllers:
     image: tigera/kube-controllers
-    version: v3.16.3
+    version: v3.16.4
   typha:
     image: tigera/typha
-    version: v3.16.3
+    version: v3.16.4
   cnx-node:
     image: tigera/cnx-node
-    version: v3.16.3
+    version: v3.16.4
   fluentd:
     image: tigera/fluentd
-    version: v3.16.3
+    version: v3.16.4
   fluentd-windows:
     image: tigera/fluentd-windows
-    version: v3.16.3
+    version: v3.16.4
   es-proxy:
     image: tigera/es-proxy
-    version: v3.16.3
+    version: v3.16.4
   es-gateway:
     image: tigera/es-gateway
-    version: v3.16.3
+    version: v3.16.4
   dex:
     image: tigera/dex
-    version: v3.16.3
+    version: v3.16.4
   eck-kibana:
     version: 7.17.13
   kibana:
     image: tigera/kibana
-    version: v3.16.3
+    version: v3.16.4
   eck-elasticsearch:
     version: 7.17.13
   elasticsearch:
     image: tigera/elasticsearch
-    version: v3.16.3
+    version: v3.16.4
   elastic-tsee-installer:
     image: tigera/intrusion-detection-job-installer
-    version: v3.16.3
+    version: v3.16.4
   es-curator:
     image: tigera/es-curator
-    version: v3.16.3
+    version: v3.16.4
   intrusion-detection-controller:
     image: tigera/intrusion-detection-controller
-    version: v3.16.3
+    version: v3.16.4
   anomaly_detection_jobs:
     image: tigera/anomaly_detection_jobs
-    version: v3.16.3
+    version: v3.16.4
   anomaly-detection-api:
     image: tigera/anomaly-detection-api
-    version: v3.16.3
+    version: v3.16.4
   compliance-controller:
     image: tigera/compliance-controller
-    version: v3.16.3
+    version: v3.16.4
   compliance-reporter:
     image: tigera/compliance-reporter
-    version: v3.16.3
+    version: v3.16.4
   compliance-snapshotter:
     image: tigera/compliance-snapshotter
-    version: v3.16.3
+    version: v3.16.4
   compliance-server:
     image: tigera/compliance-server
-    version: v3.16.3
+    version: v3.16.4
   compliance-benchmarker:
     image: tigera/compliance-benchmarker
-    version: v3.16.3
+    version: v3.16.4
   guardian:
     image: tigera/guardian
-    version: v3.16.3
+    version: v3.16.4
   tigera-cni:
     image: tigera/cni
-    version: v3.16.3
+    version: v3.16.4
   cloud-controllers:
     image: tigera/cloud-controllers
-    version: v3.16.3
+    version: v3.16.4
   elasticsearch-metrics:
     image: tigera/elasticsearch-metrics
-    version: v3.16.3
+    version: v3.16.4
   packetcapture:
     image: tigera/packetcapture
-    version: v3.16.3
+    version: v3.16.4
   # coreos-prometheus holds the version of prometheus built for tigera/prometheus,
   # which prometheus operator uses to validate.
   coreos-prometheus:
     version: v2.32.0
   prometheus:
     image: tigera/prometheus
-    version: v3.16.3
+    version: v3.16.4
   # coreos-prometheus holds the version of alertmanager built for tigera/alertmanager,
   # which prometheus operator uses to validate.
   coreos-alertmanager:
     version: v0.23.0
   alertmanager:
     image: tigera/alertmanager
-    version: v3.16.3
+    version: v3.16.4
   tigera-prometheus-service:
     image: tigera/prometheus-service
-    version: v3.16.3
+    version: v3.16.4
   deep-packet-inspection:
     image: tigera/deep-packet-inspection
-    version: v3.16.3
+    version: v3.16.4
   windows-upgrade:
     image: tigera/calico-windows-upgrade
-    version: v3.16.3
+    version: v3.16.4
   flexvol:
     image: tigera/pod2daemon-flexvol
-    version: v3.16.3
+    version: v3.16.4
   csi:
     image: tigera/csi
-    version: v3.16.3
+    version: v3.16.4
   csi-node-driver-registrar:
     image: tigera/node-driver-registrar
-    version: v3.16.3
+    version: v3.16.4
   # The components below are third-party images that have been retagged under
   # quay.io/tigera so all enterprise images come from the same repository and org.
   elasticsearch-operator:
     image: tigera/eck-operator
-    version: v3.16.3
+    version: v3.16.4
   eck-elasticsearch-operator:
     version: 2.6.1
   l7-collector:
     image: tigera/l7-collector
-    version: v3.16.3
+    version: v3.16.4
   envoy:
     image: tigera/envoy
-    version: v3.16.3
+    version: v3.16.4
   dikastes:
     image: tigera/dikastes
-    version: v3.16.3
+    version: v3.16.4
   egress-gateway:
     image: tigera/egress-gateway
-    version: v3.16.3
+    version: v3.16.4
diff --git a/hack/gen-versions/main.go b/hack/gen-versions/main.go
index 52e2dd8968..672fe5f5c4 100644
--- a/hack/gen-versions/main.go
+++ b/hack/gen-versions/main.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2022 Tigera, Inc. All rights reserved.
+// Copyright (c) 2020-2023 Tigera, Inc. All rights reserved.
 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import (
 
 const (
 	defaultCalicoRegistry     = "docker.io"
-	defaultEnterpriseRegistry = "gcr.io/unique-caldron-775/cnx"
+	defaultEnterpriseRegistry = "quay.io"
 
 	eeVersionsTpl     = "enterprise.go.tpl"
 	osVersionsTpl     = "calico.go.tpl"
diff --git a/pkg/components/common.go b/pkg/components/common.go
index 8eef195ba7..998e379e9d 100644
--- a/pkg/components/common.go
+++ b/pkg/components/common.go
@@ -16,7 +16,7 @@ package components
 
 var (
 	ComponentCSRInitContainer = component{
-		Version: "v1.1.11",
+		Version: "v1.1.12",
 		Image:   "tigera/key-cert-provisioner",
 	}
 	CommonImages = []component{
diff --git a/pkg/components/enterprise.go b/pkg/components/enterprise.go
index 88b32b5907..a62656e422 100644
--- a/pkg/components/enterprise.go
+++ b/pkg/components/enterprise.go
@@ -18,40 +18,40 @@
 package components
 
 var (
-	EnterpriseRelease string = "v3.16.3"
+	EnterpriseRelease string = "v3.16.4"
 
 	ComponentAPIServer = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/cnx-apiserver",
 	}
 
 	ComponentComplianceBenchmarker = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/compliance-benchmarker",
 	}
 
 	ComponentComplianceController = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/compliance-controller",
 	}
 
 	ComponentComplianceReporter = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/compliance-reporter",
 	}
 
 	ComponentComplianceServer = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/compliance-server",
 	}
 
 	ComponentComplianceSnapshotter = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/compliance-snapshotter",
 	}
 
 	ComponentDeepPacketInspection = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/deep-packet-inspection",
 	}
 
@@ -64,17 +64,17 @@ var (
 	}
 
 	ComponentElasticTseeInstaller = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/intrusion-detection-job-installer",
 	}
 
 	ComponentElasticsearch = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/elasticsearch",
 	}
 
 	ComponentElasticsearchFIPS = component{
-		Version: "v3.16.3-fips",
+		Version: "v3.16.4-fips",
 		Image:   "tigera/elasticsearch",
 	}
 
@@ -83,97 +83,97 @@ var (
 	}
 
 	ComponentElasticsearchOperator = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/eck-operator",
 	}
 
 	ComponentEsCurator = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/es-curator",
 	}
 
 	ComponentEsProxy = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/es-proxy",
 	}
 
 	ComponentESGateway = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/es-gateway",
 	}
 
 	ComponentFluentd = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/fluentd",
 	}
 
 	ComponentFluentdWindows = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/fluentd-windows",
 	}
 
 	ComponentGuardian = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/guardian",
 	}
 
 	ComponentIntrusionDetectionController = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/intrusion-detection-controller",
 	}
 
 	ComponentAnomalyDetectionJobs = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/anomaly_detection_jobs",
 	}
 
 	ComponentAnomalyDetectionAPI = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/anomaly-detection-api",
 	}
 
 	ComponentKibana = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/kibana",
 	}
 
 	ComponentManager = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/cnx-manager",
 	}
 
 	ComponentDex = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/dex",
 	}
 
 	ComponentManagerProxy = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/voltron",
 	}
 
 	ComponentPacketCapture = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/packetcapture",
 	}
 
 	ComponentEgressGateway = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/egress-gateway",
 	}
 
 	ComponentL7Collector = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/l7-collector",
 	}
 
 	ComponentEnvoyProxy = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/envoy",
 	}
 
 	ComponentDikastes = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/dikastes",
 	}
 
@@ -182,12 +182,12 @@ var (
 	}
 
 	ComponentPrometheus = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/prometheus",
 	}
 
 	ComponentTigeraPrometheusService = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/prometheus-service",
 	}
 
@@ -196,67 +196,67 @@ var (
 	}
 
 	ComponentPrometheusAlertmanager = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/alertmanager",
 	}
 
 	ComponentQueryServer = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/cnx-queryserver",
 	}
 
 	ComponentTigeraKubeControllers = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/kube-controllers",
 	}
 
 	ComponentTigeraNode = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/cnx-node",
 	}
 
 	ComponentTigeraTypha = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/typha",
 	}
 
 	ComponentTigeraCNI = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/cni",
 	}
 
 	ComponentTigeraCNIFIPS = component{
-		Version: "v3.16.3-fips",
+		Version: "v3.16.4-fips",
 		Image:   "tigera/cni",
 	}
 
 	ComponentCloudControllers = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/cloud-controllers",
 	}
 
 	ComponentElasticsearchMetrics = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/elasticsearch-metrics",
 	}
 
 	ComponentTigeraWindowsUpgrade = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/calico-windows-upgrade",
 	}
 
 	ComponentFlexVolumePrivate = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/pod2daemon-flexvol",
 	}
 
 	ComponentCSIPrivate = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/csi",
 	}
 
 	ComponentCSINodeDriverRegistrarPrivate = component{
-		Version: "v3.16.3",
+		Version: "v3.16.4",
 		Image:   "tigera/node-driver-registrar",
 	}
 	// Only components that correspond directly to images should be included in this list,