diff --git a/changelog/security/2023-02-23-nvidia-drivers-525.85.12.md b/changelog/security/2023-02-23-nvidia-drivers-525.85.12.md
new file mode 100644
index 00000000000..347f2b2d705
--- /dev/null
+++ b/changelog/security/2023-02-23-nvidia-drivers-525.85.12.md
@@ -0,0 +1 @@
+- nvidia-drivers ([CVE-2022-31607](https://nvd.nist.gov/vuln/detail/CVE-2022-31607), [CVE-2022-31608](https://nvd.nist.gov/vuln/detail/CVE-2022-31608), [CVE-2022-31615](https://nvd.nist.gov/vuln/detail/CVE-2022-31615), [CVE-2022-34665](https://nvd.nist.gov/vuln/detail/CVE-2022-34665), [CVE-2022-34666](https://nvd.nist.gov/vuln/detail/CVE-2022-34666), [CVE-2022-34670](https://nvd.nist.gov/vuln/detail/CVE-2022-34670), [CVE-2022-34673](https://nvd.nist.gov/vuln/detail/CVE-2022-34673), [CVE-2022-34674](https://nvd.nist.gov/vuln/detail/CVE-2022-34674), [CVE-2022-34676](https://nvd.nist.gov/vuln/detail/CVE-2022-34676), [CVE-2022-34677](https://nvd.nist.gov/vuln/detail/CVE-2022-34677), [CVE-2022-34678](https://nvd.nist.gov/vuln/detail/CVE-2022-34678), [CVE-2022-34679](https://nvd.nist.gov/vuln/detail/CVE-2022-34679), [CVE-2022-34680](https://nvd.nist.gov/vuln/detail/CVE-2022-34680), [CVE-2022-34682](https://nvd.nist.gov/vuln/detail/CVE-2022-34682), [CVE-2022-34684](https://nvd.nist.gov/vuln/detail/CVE-2022-34684), [CVE-2022-42254](https://nvd.nist.gov/vuln/detail/CVE-2022-42254), [CVE-2022-42255](https://nvd.nist.gov/vuln/detail/CVE-2022-42255), [CVE-2022-42256](https://nvd.nist.gov/vuln/detail/CVE-2022-42256), [CVE-2022-42257](https://nvd.nist.gov/vuln/detail/CVE-2022-42257), [CVE-2022-42258](https://nvd.nist.gov/vuln/detail/CVE-2022-42258), [CVE-2022-42259](https://nvd.nist.gov/vuln/detail/CVE-2022-42259), [CVE-2022-42260](https://nvd.nist.gov/vuln/detail/CVE-2022-42260), [CVE-2022-42261](https://nvd.nist.gov/vuln/detail/CVE-2022-42261), [CVE-2022-42263](https://nvd.nist.gov/vuln/detail/CVE-2022-42263), [CVE-2022-42264](https://nvd.nist.gov/vuln/detail/CVE-2022-42264), [CVE-2022-42265](https://nvd.nist.gov/vuln/detail/CVE-2022-42265))
diff --git a/changelog/updates/2023-02-23-nvidia-drivers-525.85.12.md b/changelog/updates/2023-02-23-nvidia-drivers-525.85.12.md
new file mode 100644
index 00000000000..6b2c994c913
--- /dev/null
+++ b/changelog/updates/2023-02-23-nvidia-drivers-525.85.12.md
@@ -0,0 +1 @@
+- nvidia-drivers ([525.85.12](https://docs.nvidia.com/datacenter/tesla/tesla-release-notes-525-85-12/index.html))
diff --git a/coreos-base/coreos/coreos-0.0.1.ebuild b/coreos-base/coreos/coreos-0.0.1.ebuild
index 78f1ee5523a..58312085e57 100644
--- a/coreos-base/coreos/coreos-0.0.1.ebuild
+++ b/coreos-base/coreos/coreos-0.0.1.ebuild
@@ -199,7 +199,7 @@ RDEPEND="${RDEPEND}
 	sys-power/acpid
 	sys-process/lsof
 	sys-process/procps
-	x11-drivers/nvidia-metadata
+	x11-drivers/nvidia-drivers
 "
 
 # OEM specific bits that need to go in USR
diff --git a/coreos-base/oem-azure/files/base/base.ign b/coreos-base/oem-azure/files/base/base.ign
index 5c359a94103..f222e5180a6 100644
--- a/coreos-base/oem-azure/files/base/base.ign
+++ b/coreos-base/oem-azure/files/base/base.ign
@@ -11,14 +11,6 @@
           "source": "oem:///units/waagent.service"
         },
         "mode": 292
-      },
-      {
-        "filesystem": "root",
-        "path": "/etc/systemd/system/nvidia.service",
-        "contents": {
-          "source": "oem:///units/nvidia.service"
-        },
-        "mode": 292
       }
     ]
   },
@@ -27,10 +19,6 @@
       {
         "name": "waagent.service",
         "enabled": true
-      },
-      {
-        "name": "nvidia.service",
-        "enabled": true
       }
     ]
   }
diff --git a/coreos-base/oem-azure/oem-azure-2.6.0.2-r1.ebuild b/coreos-base/oem-azure/oem-azure-2.6.0.2-r1.ebuild
index 575bba64670..02c43490679 100644
--- a/coreos-base/oem-azure/oem-azure-2.6.0.2-r1.ebuild
+++ b/coreos-base/oem-azure/oem-azure-2.6.0.2-r1.ebuild
@@ -17,7 +17,6 @@ S="${WORKDIR}"
 
 RDEPEND="
   ~app-emulation/wa-linux-agent-${PV}
-  x11-drivers/nvidia-drivers
 "
 
 src_prepare() {
diff --git a/coreos-base/oem-ec2-compat/files/base/base-ec2.ign b/coreos-base/oem-ec2-compat/files/base/base-ec2.ign
index 6a189540392..ed81e827ee5 100644
--- a/coreos-base/oem-ec2-compat/files/base/base-ec2.ign
+++ b/coreos-base/oem-ec2-compat/files/base/base-ec2.ign
@@ -12,10 +12,6 @@
         "name": "amazon-ssm-agent.service",
         "enabled": true,
         "contents": "[Unit]\nDescription=amazon-ssm-agent\nAfter=network-online.target\n\n[Service]\nType=simple\nWorkingDirectory=/usr/share/oem\nExecStart=/usr/share/oem/bin/amazon-ssm-agent\nKillMode=process\nRestart=on-failure\nRestartForceExitStatus=SIGPIPE\nRestartSec=15min\n\n[Install]\nWantedBy=multi-user.target\n"
-      },
-      {
-        "name": "nvidia.service",
-        "enabled": true
       }
     ]
   },
@@ -44,14 +40,6 @@
           "source": "oem:///eks/bootstrap.sh"
         },
         "mode": 493
-      },
-      {
-        "filesystem": "root",
-        "path": "/etc/systemd/system/nvidia.service",
-        "contents": {
-          "source": "oem:///units/nvidia.service"
-        },
-        "mode": 292
       }
     ]
   }
diff --git a/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r2.ebuild b/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r2.ebuild
index 468d56b36b7..3abc453fa44 100644
--- a/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r2.ebuild
+++ b/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r2.ebuild
@@ -16,7 +16,6 @@ REQUIRED_USE="^^ ( ec2 openstack brightbox )"
 RDEPEND="
 	ec2? ( app-emulation/amazon-ssm-agent )
 	coreos-base/flatcar-eks
-	x11-drivers/nvidia-drivers
 "
 
 # no source directory
diff --git a/coreos-base/update_engine/update_engine-9999.ebuild b/coreos-base/update_engine/update_engine-9999.ebuild
index 297549bd82a..f456be64643 100644
--- a/coreos-base/update_engine/update_engine-9999.ebuild
+++ b/coreos-base/update_engine/update_engine-9999.ebuild
@@ -8,7 +8,7 @@ CROS_WORKON_REPO="https://github.com"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
-	CROS_WORKON_COMMIT="c6f566d47d8949632f7f43871eb8d5c625af3209" # flatcar-master
+	CROS_WORKON_COMMIT="c6f566d47d8949632f7f43871eb8d5c625af3209" # nvidia-PR
 	KEYWORDS="amd64 arm64"
 fi
 
diff --git a/coreos-devel/board-packages/board-packages-0.0.1.ebuild b/coreos-devel/board-packages/board-packages-0.0.1.ebuild
index 0be0428a6b9..eba6f039482 100644
--- a/coreos-devel/board-packages/board-packages-0.0.1.ebuild
+++ b/coreos-devel/board-packages/board-packages-0.0.1.ebuild
@@ -35,5 +35,4 @@ RDEPEND="
 	coreos-base/coreos-dev
 	coreos-base/flatcar-eks
 	dev-lang/python-oem
-	x11-drivers/nvidia-drivers
 	"
diff --git a/x11-drivers/nvidia-drivers/files/units/nvidia.service b/x11-drivers/nvidia-drivers/files/units/nvidia.service
index e9050d36028..1b36dfe873c 100644
--- a/x11-drivers/nvidia-drivers/files/units/nvidia.service
+++ b/x11-drivers/nvidia-drivers/files/units/nvidia.service
@@ -7,7 +7,7 @@ After=network-online.target
 Type=simple
 Restart=no
 Environment=PATH=/opt/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
-ExecStart=/usr/share/oem/bin/setup-nvidia
+ExecStart=/usr/lib/nvidia/bin/setup-nvidia
 
 [Install]
 WantedBy=multi-user.target
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.85.12.ebuild
similarity index 76%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-525.85.12.ebuild
index 6c97871b498..886e5d9b1f5 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.85.12.ebuild
@@ -16,13 +16,12 @@ IUSE=""
 S="${WORKDIR}"
 
 RDEPEND="
-	=x11-drivers/nvidia-metadata-${PV}
+  =x11-drivers/nvidia-metadata-${PV}
 "
 
 src_install() {
-  insinto "/usr/share/oem"
-  doins -r "${FILESDIR}/units"
-  exeinto "/usr/share/oem/bin"
+  systemd_dounit "${FILESDIR}/units/nvidia.service"
+  exeinto "/usr/lib/nvidia/bin"
   doexe "${FILESDIR}/bin/install-nvidia"
   doexe "${FILESDIR}/bin/setup-nvidia"
 }
diff --git a/x11-drivers/nvidia-metadata/files/nvidia-metadata b/x11-drivers/nvidia-metadata/files/nvidia-metadata
index 4b4b86094a1..b050d15f1b5 100644
--- a/x11-drivers/nvidia-metadata/files/nvidia-metadata
+++ b/x11-drivers/nvidia-metadata/files/nvidia-metadata
@@ -1,2 +1,2 @@
-NVIDIA_DRIVER_VERSION=510.73.05
+NVIDIA_DRIVER_VERSION=525.85.12
 NVIDIA_PRODUCT_TYPE=tesla
diff --git a/x11-drivers/nvidia-metadata/nvidia-metadata-510.73.05.ebuild b/x11-drivers/nvidia-metadata/nvidia-metadata-525.85.12.ebuild
similarity index 100%
rename from x11-drivers/nvidia-metadata/nvidia-metadata-510.73.05.ebuild
rename to x11-drivers/nvidia-metadata/nvidia-metadata-525.85.12.ebuild