diff --git a/.github/workflows/update-readme.yaml b/.github/workflows/update-readme.yaml
index 0e9b7c84..12f66d4b 100644
--- a/.github/workflows/update-readme.yaml
+++ b/.github/workflows/update-readme.yaml
@@ -20,8 +20,8 @@ jobs:
           - {prefix: 'rstudio-', repository: 'workbench', readme_path: './workbench/README.md'}
           - {prefix: 'rstudio-', repository: 'connect', readme_path: './connect/README.md'}
           - {prefix: 'rstudio-', repository: 'connect-content-init', readme_path: './connect-content-init/README.md'}
-          - {prefix: '', repository: 'content-base', readme_path: './content/base/README.md'}
-          - {prefix: '', repository: 'content-pro', readme_path: './content/pro/README.md'}
+          - {prefix: '', repository: 'content-base', readme_path: './content/README.md'}
+          - {prefix: '', repository: 'content-pro', readme_path: './content/README.md'}
           - {prefix: 'rstudio-', repository: 'package-manager', readme_path: './package-manager/README.md'}
           - {prefix: '', repository: 'r-session-complete', readme_path: './r-session-complete/README.md'}
           - {prefix: 'rstudio-', repository: 'workbench-for-microsoft-azure-ml', readme_path: './workbench-for-microsoft-azure-ml/README.md'}
diff --git a/Justfile b/Justfile
index c1d075f4..4d10100b 100644
--- a/Justfile
+++ b/Justfile
@@ -7,8 +7,8 @@ sed_vars := if os() == "macos" { "-i ''" } else { "-i" }
 
 BUILDX_PATH := ""
 
-RSC_VERSION := "2024.12.0"
-RSPM_VERSION := "2024.11.0-7"
+RSC_VERSION := "2025.04.0"
+RSPM_VERSION := "2025.04.0-4"
 RSW_VERSION := "2024.12.1+563.pro5"
 
 DRIVERS_VERSION := "2023.05.0"
diff --git a/connect-content-init/Dockerfile.ubuntu2204 b/connect-content-init/Dockerfile.ubuntu2204
index db984892..e1525f5c 100644
--- a/connect-content-init/Dockerfile.ubuntu2204
+++ b/connect-content-init/Dockerfile.ubuntu2204
@@ -9,7 +9,7 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends ca-certificates curl && \
     rm -rf /var/lib/apt/lists/*
 
-ARG RSC_VERSION=2024.12.0
+ARG RSC_VERSION=2025.04.0
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN mkdir -p /rsc-staging && \
     RSC_VERSION_URL=$(echo -n "${RSC_VERSION}" | sed 's/+/%2B/g') && \
diff --git a/connect-content-init/README.md b/connect-content-init/README.md
index fd82891a..240d0a34 100644
--- a/connect-content-init/README.md
+++ b/connect-content-init/README.md
@@ -9,7 +9,7 @@
 
 # Supported tags and respective Dockerfile links
 
-* [`jammy`, `ubuntu2204`, `jammy-2024.12.0`, `ubuntu2204-2024.12.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
+* [`jammy`, `ubuntu2204`, `jammy-2025.04.0`, `ubuntu2204-2025.04.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
 
 # RStudio Connect Content Init Container
 
@@ -31,7 +31,7 @@ The version of the release package to use can be overridden with the
 `RSC_VERSION` build arg.
 
 ```console
-just build ubuntu2204 2024.12.0
+just build ubuntu2204 2025.04.0
 ```
 
 ## Testing
@@ -56,7 +56,7 @@ just test
 You can see the different layers that make up the image:
 
 ```console
-docker history rstudio/rstudio-connect-content-init-preview:2024.12.0-dev-326
+docker history rstudio/rstudio-connect-content-init-preview:2025.04.0-dev-326
 ```
 
 NOTE: almost all the image size is pandoc.
diff --git a/connect/.env b/connect/.env
index 3ecfbc3d..dbfd2a0a 100644
--- a/connect/.env
+++ b/connect/.env
@@ -1,4 +1,4 @@
-RSC_VERSION=2024.12.0
+RSC_VERSION=2025.04.0
 R_VERSION=4.2.3
 R_VERSION_ALT=4.1.3
 PYTHON_VERSION=3.9.17
diff --git a/connect/Dockerfile.ubuntu2204 b/connect/Dockerfile.ubuntu2204
index e957b5bd..9f2e6ff9 100644
--- a/connect/Dockerfile.ubuntu2204
+++ b/connect/Dockerfile.ubuntu2204
@@ -7,7 +7,7 @@ ARG R_VERSION=4.2.3
 ARG R_VERSION_ALT=4.1.3
 ARG PYTHON_VERSION=3.9.17
 ARG PYTHON_VERSION_ALT=3.8.17
-ARG RSC_VERSION=2024.12.0
+ARG RSC_VERSION=2025.04.0
 ARG QUARTO_VERSION=1.4.557
 ARG SCRIPTS_DIR=/opt/positscripts
 
diff --git a/connect/README.md b/connect/README.md
index dc71f79b..27d006f6 100644
--- a/connect/README.md
+++ b/connect/README.md
@@ -7,7 +7,7 @@
 
 # Supported tags and respective Dockerfile links
 
-* [`jammy`, `ubuntu2204`, `jammy-2024.12.0`, `ubuntu2204-2024.12.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
+* [`jammy`, `ubuntu2204`, `jammy-2025.04.0`, `ubuntu2204-2025.04.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/connect/Dockerfile.2204)
 
 # What is Posit Connect?
 
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 299d480d..59ac36b1 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -1,10 +1,10 @@
 ### Variable definitions ###
 variable CONNECT_VERSION {
-    default = "2024.12.0"
+    default = "2025.04.0"
 }
 
 variable PACKAGE_MANAGER_VERSION {
-    default = "2024.11.0-7"
+    default = "2025.04.0-4"
 }
 
 variable WORKBENCH_VERSION {
diff --git a/package-manager/.env b/package-manager/.env
index de744b5f..4b57f3b6 100644
--- a/package-manager/.env
+++ b/package-manager/.env
@@ -1,4 +1,4 @@
-RSPM_VERSION=2024.11.0-7
+RSPM_VERSION=2025.04.0-4
 R_VERSION=4.4.0
 R_VERSION_ALT=4.1.3
 PYTHON_VERSION=3.9.17
diff --git a/package-manager/Dockerfile.ubuntu2204 b/package-manager/Dockerfile.ubuntu2204
index d7570ae3..2006e745 100644
--- a/package-manager/Dockerfile.ubuntu2204
+++ b/package-manager/Dockerfile.ubuntu2204
@@ -18,7 +18,7 @@ RUN apt-get update -qq && apt-get install -y --no-install-recommends \
     apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
 
 # Download RStudio Package Manager ---------------------------------------------#
-ARG RSPM_VERSION=2024.11.0-7
+ARG RSPM_VERSION=2025.04.0-4
 ARG RSPM_DOWNLOAD_URL=https://cdn.rstudio.com/package-manager/deb/amd64
 RUN curl -fsSL -O ${RSPM_DOWNLOAD_URL}/rstudio-pm_${RSPM_VERSION}_amd64.deb \
     # Pre 7/25/23 packages
diff --git a/package-manager/README.md b/package-manager/README.md
index c458dd12..3668ae49 100644
--- a/package-manager/README.md
+++ b/package-manager/README.md
@@ -6,7 +6,7 @@
 
 # Supported tags and respective Dockerfile links
 
-* [`jammy`, `ubuntu2204`, `jammy-2024.08.2`, `ubuntu2204-2024.08.2`](https://github.com/rstudio/rstudio-docker-products/blob/main/package-manager/Dockerfile.ubuntu2204)
+* [`jammy`, `ubuntu2204`, `jammy-2025.04.0`, `ubuntu2204-2025.04.0`](https://github.com/rstudio/rstudio-docker-products/blob/main/package-manager/Dockerfile.ubuntu2204)
 
 # What is RStudio Package Manager?