diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 799c083..320f28c 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -69,9 +69,9 @@ jobs:
     steps:
       - name: Compute image tag names
         run: |
-          # Set the full version tag (e.g., 2.5.13-otsf-v5.0.0)
+          # Set the full version tag (e.g., 2.6.0-v1.0.0)
           echo "IMAGE_TAG=$(echo $GITHUB_REF_NAME)" >> $GITHUB_ENV
-          # Extract the software version (e.g., 2.5.13-otsf) and add -latest
+          # Extract the software version (e.g., 2.6.0-v1.0.0) and add -latest
           echo "LATEST_TAG=$(echo $GITHUB_REF_NAME | sed 's/-v[0-9]\+\.[0-9]\+\.[0-9]\+/-latest/')" >> $GITHUB_ENV
       - name: Checkout code
         uses: actions/checkout@v4
diff --git a/bundler/Dockerfile b/bundler/Dockerfile
index 89a760b..6ba45ac 100644
--- a/bundler/Dockerfile
+++ b/bundler/Dockerfile
@@ -1,4 +1,4 @@
-ARG OBA_VERSION=2.5.13-otsf
+ARG OBA_VERSION=2.6.0
 
 ##############
 # Go Builder #
diff --git a/oba/Dockerfile b/oba/Dockerfile
index dca73a8..3071925 100644
--- a/oba/Dockerfile
+++ b/oba/Dockerfile
@@ -1,4 +1,4 @@
-ARG OBA_VERSION=2.5.13-otsf
+ARG OBA_VERSION=2.6.0
 ARG POSTGRESQL_CONNECTOR_VERSION=42.7.4
 ARG MYSQL_CONNECTOR_VERSION=8.4.0
 
@@ -59,8 +59,7 @@ RUN ./retrieve_maven_artifacts.sh
 FROM tomcat:8.5.100-jdk11-temurin AS server
 
 ENV GTFS_TIDY_ARGS=${GTFS_TIDY_ARGS}
-ARG OBA_VERSION=2.5.13-otsf
-
+ARG OBA_VERSION=2.6.0
 
 ENV POSTGRESQL_CONNECTOR_VERSION=${POSTGRESQL_CONNECTOR_VERSION}
 ENV MYSQL_CONNECTOR_VERSION=${MYSQL_CONNECTOR_VERSION}
diff --git a/render.yaml b/render.yaml
index ee10f7a..340f9a2 100644
--- a/render.yaml
+++ b/render.yaml
@@ -3,7 +3,7 @@ services:
     name: OneBusAway API Server
     runtime: image
     image:
-      url: docker.io/opentransitsoftwarefoundation/onebusaway-api-webapp:2.5.13-otsf-v3.0.0
+      url: docker.io/opentransitsoftwarefoundation/onebusaway-api-webapp:2.6.0-v1.0.0
     region: oregon
     plan: standard
     numInstances: 1