diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 3c2c28c61..3354c713d 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+      - feature/*
   release:
     types:
       - created
@@ -41,35 +42,50 @@ jobs:
         tag:
           - ""
           - cpu
-          - cpu-ubuntu20.04
+          - cpu-ubuntu22.04
           - nvidia
+          - nvidia-ubuntu22.04
+          - cpu-ubuntu20.04
           - nvidia-ubuntu20.04
         include:
-          # Ubuntu 20.04
+          # Ubuntu 22.04
           - tag: ""
             target: runtime-env
-            base_image: ubuntu:20.04
-            base_runtime_image: ubuntu:20.04
+            base_image: ubuntu:22.04
+            base_runtime_image: ubuntu:22.04
             onnxruntime_version: 1.13.1
             platforms: linux/amd64,linux/arm64/v8
           - tag: cpu
             target: runtime-env
-            base_image: ubuntu:20.04
-            base_runtime_image: ubuntu:20.04
+            base_image: ubuntu:22.04
+            base_runtime_image: ubuntu:22.04
             onnxruntime_version: 1.13.1
             platforms: linux/amd64,linux/arm64/v8
-          - tag: cpu-ubuntu20.04
+          - tag: cpu-ubuntu22.04
             target: runtime-env
-            base_image: ubuntu:20.04
-            base_runtime_image: ubuntu:20.04
+            base_image: ubuntu:22.04
+            base_runtime_image: ubuntu:22.04
             onnxruntime_version: 1.13.1
             platforms: linux/amd64,linux/arm64/v8
           - tag: nvidia
             target: runtime-nvidia-env
-            base_image: ubuntu:20.04
+            base_image: ubuntu:22.04
             base_runtime_image: nvidia/cuda:11.6.2-cudnn8-runtime-ubuntu20.04
             onnxruntime_version: 1.13.1
             platforms: linux/amd64
+          - tag: nvidia-ubuntu22.04
+            target: runtime-nvidia-env
+            base_image: ubuntu:22.04
+            base_runtime_image: nvidia/cuda:11.6.2-cudnn8-runtime-ubuntu20.04
+            onnxruntime_version: 1.13.1
+            platforms: linux/amd64
+          # Ubuntu 20.04
+          - tag: cpu-ubuntu20.04
+            target: runtime-env
+            base_image: ubuntu:20.04
+            base_runtime_image: ubuntu:20.04
+            onnxruntime_version: 1.13.1
+            platforms: linux/amd64,linux/arm64/v8
           - tag: nvidia-ubuntu20.04
             target: runtime-nvidia-env
             base_image: ubuntu:20.04
@@ -131,6 +147,7 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           file: ./Dockerfile
           build-args: |
+            --progress plain
             BASE_IMAGE=${{ matrix.base_image }}
             BASE_RUNTIME_IMAGE=${{ matrix.base_runtime_image }}
             PYTHON_VERSION=${{ env.PYTHON_VERSION }}
diff --git a/.github/workflows/release-test-docker.yml b/.github/workflows/release-test-docker.yml
index 61019b2fd..fbe5789c9 100644
--- a/.github/workflows/release-test-docker.yml
+++ b/.github/workflows/release-test-docker.yml
@@ -30,6 +30,7 @@ jobs:
         tag:
           - ""
           - cpu
+          - cpu-ubuntu22.04
           - cpu-ubuntu20.04
 
     steps:
diff --git a/Dockerfile b/Dockerfile
index caa70d783..90a2f9e07 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -144,7 +144,7 @@ RUN <<EOF
         tk-dev \
         libffi-dev \
         liblzma-dev \
-        python-openssl \
+        python3-openssl \
         git
     apt-get clean
     rm -rf /var/lib/apt/lists/*