diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 992be23ca..7bd345ed3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,7 +50,7 @@ jobs:
        ${{ matrix.cmake-gen }}>
     runs-on: ubuntu-latest
     container:
-      image: olivevideoeditor/ci-olive:2022.1
+      image: olivevideoeditor/ci-olive:2022.2
 
     steps:
       - name: Checkout Source Code
diff --git a/docker/README.md b/docker/README.md
index c5a824194..fa0c08423 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -27,14 +27,14 @@ docker pull olivevideoeditor/ci-package-otio:0.14.1
 docker pull olivevideoeditor/ci-package-crashpad
 docker pull olivevideoeditor/ci-package-ffmpeg:5.0
 docker pull olivevideoeditor/ci-package-ocio:2022-2.1.1
-docker pull olivevideoeditor/ci-olive:2022.1
+docker pull olivevideoeditor/ci-olive:2022.2
 ```
 
 Use `ci-olive` image as local build container, by mounting working copy at
 `~/olive` into guest system at `/opt/olive/olive`:
 
 ```bash
-docker run --rm -it -v ~/olive:/opt/olive/olive olivevideoeditor/ci-olive:2022.1
+docker run --rm -it -v ~/olive:/opt/olive/olive olivevideoeditor/ci-olive:2022.2
 mkdir build
 cd build
 cmake .. -G Ninja
@@ -50,11 +50,11 @@ docker build -t olivevideoeditor/ci-package-otio:0.14.1 -f ci-otio/Dockerfile .
 docker build -t olivevideoeditor/ci-package-crashpad -f ci-crashpad/Dockerfile .
 docker build -t olivevideoeditor/ci-package-ffmpeg:5.0 -f ci-ffmpeg/Dockerfile .
 docker build -t olivevideoeditor/ci-package-ocio:2022-2.1.1 -f ci-ocio/Dockerfile .
-docker build -t olivevideoeditor/ci-olive:2022.1 -f ci-olive/Dockerfile .
+docker build -t olivevideoeditor/ci-olive:2022.2 -f ci-olive/Dockerfile .
 ```
 
-Note that `2022` in `ci-olive:2022.1` stands for the
-[VFX Reference Platform](http://vfxplatform.com/) calendar year and `1` for the
+Note that `2022` in `ci-olive:2022.2` stands for the
+[VFX Reference Platform](http://vfxplatform.com/) calendar year and `2` for the
 build image revision (should be incremented each time a new image is published).
 
 Publish images:
@@ -65,5 +65,5 @@ docker push olivevideoeditor/ci-package-otio:0.14.1
 docker push olivevideoeditor/ci-package-crashpad
 docker push olivevideoeditor/ci-package-ffmpeg:5.0
 docker push olivevideoeditor/ci-package-ocio:2022-2.1.1
-docker push olivevideoeditor/ci-olive:2022.1
+docker push olivevideoeditor/ci-olive:2022.2
 ```
diff --git a/docker/ci-olive/Dockerfile b/docker/ci-olive/Dockerfile
index b4fb4ac11..fab98dfc0 100644
--- a/docker/ci-olive/Dockerfile
+++ b/docker/ci-olive/Dockerfile
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # Build image (default):
-#  docker build -t olivevideoeditor/ci-olive:2022.1 -f ci-olive/Dockerfile .
+#  docker build -t olivevideoeditor/ci-olive:2022.2 -f ci-olive/Dockerfile .
 #
 # .n is the build image revision number. It should be incremented each time a
 # new image is published (also update the GitHub Actions workflow!).
diff --git a/docker/ci-otio/Dockerfile b/docker/ci-otio/Dockerfile
index 1c2bdc94f..794b5797d 100644
--- a/docker/ci-otio/Dockerfile
+++ b/docker/ci-otio/Dockerfile
@@ -9,6 +9,7 @@ ARG ASWF_PKG_ORG=aswftesting
 ARG CI_COMMON_VERSION=2
 ARG VFXPLATFORM_VERSION=2022
 ARG OTIO_VERSION=v0.14.1
+ARG CXX_STANDARD=17
 
 # We are currently not interested in the Python implementation and bindings
 #FROM ${ASWF_PKG_ORG}/ci-package-python:${VFXPLATFORM_VERSION} as ci-package-python
@@ -20,6 +21,7 @@ FROM ${OLIVE_ORG}/ci-common:${CI_COMMON_VERSION} as ci-otio
 ARG OLIVE_ORG
 ARG VFXPLATFORM_VERSION
 ARG OTIO_VERSION
+ARG CXX_STANDARD
 ARG PYTHON_VERSION=3.9
 
 LABEL maintainer="olivevideoeditor@gmail.com"
@@ -36,6 +38,7 @@ ENV OLIVE_ORG=${OLIVE_ORG} \
     CI_COMMON_VERSION=${CI_COMMON_VERSION} \
     VFXPLATFORM_VERSION=${VFXPLATFORM_VERSION} \
     OTIO_VERSION=${OTIO_VERSION} \
+    CXX_STANDARD=${CXX_STANDARD} \
     OLIVE_INSTALL_PREFIX=/usr/local
 #   PYTHONPATH=/usr/local/lib/python${PYTHON_VERSION}/site-packages:/usr/local/lib/python \
 
diff --git a/docker/scripts/build_otio.sh b/docker/scripts/build_otio.sh
index b232e35ab..56743a411 100644
--- a/docker/scripts/build_otio.sh
+++ b/docker/scripts/build_otio.sh
@@ -13,6 +13,7 @@ mkdir build
 cd build
 cmake .. -G "Ninja" \
   -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+  -DCMAKE_CXX_STANDARD="${CXX_STANDARD}" \
   -DCMAKE_INSTALL_PREFIX="${OLIVE_INSTALL_PREFIX}" \
   -DOTIO_PYTHON_INSTALL=OFF
 cmake --build .