diff --git a/.github/workflows/ubi8-openjdk-11-runtime.yml b/.github/workflows/ubi8-openjdk-11-runtime.yml
deleted file mode 100644
index ca062066..00000000
--- a/.github/workflows/ubi8-openjdk-11-runtime.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: OpenJDK 11 Runtime Image CI
-on: [push, pull_request]
-env:
-  LANG: en_US.UTF-8
-  CEKIT_VERSION: 4.3.0
-  S2I_URI: https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
-jobs:
-  openjdkci:
-    name: OpenJDK Runtime Build and Test
-    runs-on: ubuntu-18.04
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - name: Verify latest UBI image is present
-        run: |
-          docker pull registry.access.redhat.com/ubi8/ubi-minimal:latest
-          docker image ls | grep ubi8
-      - name: Setup required system packages
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y krb5-multidev virtualenv
-      - name: Setup virtualenv and install cekit and required packages
-        run: |
-          mkdir ~/cekit${{ env.CEKIT_VERSION }}
-          virtualenv -p python3.6 ~/cekit${{ env.CEKIT_VERSION }}
-          . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          pip3 install cekit==${{ env.CEKIT_VERSION }} docker docker-squash odcs behave lxml
-      - name: Build
-        run: |
-          . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          cekit -v --descriptor ubi8-openjdk-11-runtime.yaml build docker
-          docker image ls
-
-# even though we don't run any S2I tests for the runtime images, the test suite
-# will fail to start if the s2i binary is not present.
-      - name: install s2i binary
-        run: |
-          echo ===== Installing s2i from ${{ env.S2I_URL }} =====
-          mkdir /tmp/s2i/ && cd /tmp/s2i/
-          wget ${{ env.S2I_URI }}
-          tar xvf source-to-image*.gz
-          sudo mv s2i /usr/bin
-          which s2i
-          s2i version
-
-      - name: Behave Tests
-        run: |
-          . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          cekit -v --descriptor ubi8-openjdk-11-runtime.yaml test behave
diff --git a/.github/workflows/ubi8-openjdk-11.yml b/.github/workflows/ubi8-openjdk-11.yml
deleted file mode 100644
index e258a460..00000000
--- a/.github/workflows/ubi8-openjdk-11.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: OpenJDK 11 S2I Image CI
-on: [push, pull_request]
-env:
-  LANG: en_US.UTF-8
-  CEKIT_VERSION: 4.3.0
-  S2I_URI: https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
-jobs:
-  openjdkci:
-    name: OpenJDK S2I Build and Test
-    runs-on: ubuntu-18.04
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - name: Verify latest UBI image is present
-        run: |
-          docker pull registry.access.redhat.com/ubi8/ubi-minimal:latest
-          docker image ls | grep ubi8
-      - name: Setup required system packages
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y krb5-multidev virtualenv
-      - name: Setup virtualenv and install cekit and required packages
-        run: |
-          mkdir ~/cekit${{ env.CEKIT_VERSION }}
-          virtualenv -p python3.6 ~/cekit${{ env.CEKIT_VERSION }}
-          . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          pip3 install cekit==${{ env.CEKIT_VERSION }} docker docker-squash odcs behave lxml
-      - name: Build
-        run: |
-          . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          cekit -v --descriptor ubi8-openjdk-11.yaml build docker
-          docker image ls
-      - name: install s2i binary
-        run: |
-          echo ===== Installing s2i from ${{ env.S2I_URL }} =====
-          mkdir /tmp/s2i/ && cd /tmp/s2i/
-          wget ${{ env.S2I_URI }}
-          tar xvf source-to-image*.gz
-          sudo mv s2i /usr/bin
-          which s2i
-          s2i version
-      - name: Behave Tests
-        run: |
-          . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          cekit -v --descriptor ubi8-openjdk-11.yaml test behave
diff --git a/.github/workflows/ubi8-openjdk-17-runtime.yml b/.github/workflows/ubi8-openjdk-17-runtime.yml
deleted file mode 100644
index d6512de9..00000000
--- a/.github/workflows/ubi8-openjdk-17-runtime.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: OpenJDK 17 Runtime Image CI
-on: [push, pull_request]
-env:
-  LANG: en_US.UTF-8
-  CEKIT_VERSION: 4.3.0
-  S2I_URI: https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
-jobs:
-  openjdkci:
-    name: OpenJDK Runtime Build and Test
-    runs-on: ubuntu-18.04
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - name: Verify latest UBI image is present
-        run: |
-          docker pull registry.access.redhat.com/ubi8/ubi-minimal:latest
-          docker image ls | grep ubi8
-      - name: Setup required system packages
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y krb5-multidev virtualenv
-      - name: Setup virtualenv and install cekit and required packages
-        run: |
-          mkdir ~/cekit${{ env.CEKIT_VERSION }}
-          virtualenv -p python3.6 ~/cekit${{ env.CEKIT_VERSION }}
-          . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          pip3 install cekit==${{ env.CEKIT_VERSION }} docker docker-squash odcs behave lxml
-      - name: Build
-        run: |
-          . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          cekit -v --descriptor ubi8-openjdk-17-runtime.yaml build docker
-          docker image ls
-
-# even though we don't run any S2I tests for the runtime images, the test suite
-# will fail to start if the s2i binary is not present.
-      - name: install s2i binary
-        run: |
-          echo ===== Installing s2i from ${{ env.S2I_URL }} =====
-          mkdir /tmp/s2i/ && cd /tmp/s2i/
-          wget ${{ env.S2I_URI }}
-          tar xvf source-to-image*.gz
-          sudo mv s2i /usr/bin
-          which s2i
-          s2i version
-
-      - name: Behave Tests
-        run: |
-          . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          cekit -v --descriptor ubi8-openjdk-17-runtime.yaml test behave
diff --git a/.github/workflows/ubi8-openjdk-17.yml b/.github/workflows/ubi8-openjdk-17.yml
deleted file mode 100644
index a8d7eed1..00000000
--- a/.github/workflows/ubi8-openjdk-17.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: OpenJDK 17 S2I Image CI
-on: [push, pull_request]
-env:
-  LANG: en_US.UTF-8
-  CEKIT_VERSION: 4.3.0
-  S2I_URI: https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
-jobs:
-  openjdkci:
-    name: OpenJDK S2I Build and Test
-    runs-on: ubuntu-18.04
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - name: Verify latest UBI image is present
-        run: |
-          docker pull registry.access.redhat.com/ubi8/ubi-minimal:latest
-          docker image ls | grep ubi8
-      - name: Setup required system packages
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y krb5-multidev virtualenv
-      - name: Setup virtualenv and install cekit and required packages
-        run: |
-          mkdir ~/cekit${{ env.CEKIT_VERSION }}
-          virtualenv -p python3.6 ~/cekit${{ env.CEKIT_VERSION }}
-          . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          pip3 install cekit==${{ env.CEKIT_VERSION }} docker docker-squash odcs behave lxml
-      - name: Build
-        run: |
-          . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          cekit -v --descriptor ubi8-openjdk-17.yaml build docker
-          docker image ls
-      - name: install s2i binary
-        run: |
-          echo ===== Installing s2i from ${{ env.S2I_URL }} =====
-          mkdir /tmp/s2i/ && cd /tmp/s2i/
-          wget ${{ env.S2I_URI }}
-          tar xvf source-to-image*.gz
-          sudo mv s2i /usr/bin
-          which s2i
-          s2i version
-      - name: Behave Tests
-        run: |
-          . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          cekit -v --descriptor ubi8-openjdk-17.yaml test behave
diff --git a/.github/workflows/ubi8-openjdk-8-runtime.yml b/.github/workflows/ubi8-openjdk-8-runtime.yml
deleted file mode 100644
index 45959058..00000000
--- a/.github/workflows/ubi8-openjdk-8-runtime.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: OpenJDK 8 Runtime Image CI
-on: [push, pull_request]
-env:
-  LANG: en_US.UTF-8
-  CEKIT_VERSION: 4.3.0
-  S2I_URI: https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
-jobs:
-  openjdkci:
-    name: OpenJDK Runtime Build and Test
-    runs-on: ubuntu-18.04
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - name: Verify latest UBI image is present
-        run: |
-          docker pull registry.access.redhat.com/ubi8/ubi-minimal:latest
-          docker image ls | grep ubi8
-      - name: Setup required system packages
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y krb5-multidev virtualenv
-      - name: Setup virtualenv and install cekit and required packages
-        run: |
-          mkdir ~/cekit${{ env.CEKIT_VERSION }}
-          virtualenv -p python3.6 ~/cekit${{ env.CEKIT_VERSION }}
-          . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          pip3 install cekit==${{ env.CEKIT_VERSION }} docker docker-squash odcs behave lxml
-      - name: Build
-        run: |
-          . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          cekit -v --descriptor ubi8-openjdk-8-runtime.yaml build docker
-          docker image ls
-
-# even though we don't run any S2I tests for the runtime images, the test suite
-# will fail to start if the s2i binary is not present.
-      - name: install s2i binary
-        run: |
-          echo ===== Installing s2i from ${{ env.S2I_URL }} =====
-          mkdir /tmp/s2i/ && cd /tmp/s2i/
-          wget ${{ env.S2I_URI }}
-          tar xvf source-to-image*.gz
-          sudo mv s2i /usr/bin
-          which s2i
-          s2i version
-
-      - name: Behave Tests
-        run: |
-          . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          cekit -v --descriptor ubi8-openjdk-8-runtime.yaml test behave
diff --git a/.github/workflows/ubi8-openjdk-8.yml b/.github/workflows/ubi8-openjdk-8.yml
deleted file mode 100644
index 7a06c84e..00000000
--- a/.github/workflows/ubi8-openjdk-8.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: OpenJDK 8 S2I Image CI
-on: [push, pull_request]
-env:
-  LANG: en_US.UTF-8
-  CEKIT_VERSION: 4.3.0
-  S2I_URI: https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
-jobs:
-  openjdkci:
-    name: OpenJDK S2I Build and Test
-    runs-on: ubuntu-18.04
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - name: Verify latest UBI image is present
-        run: |
-          docker pull registry.access.redhat.com/ubi8/ubi-minimal:latest
-          docker image ls | grep ubi8
-      - name: Setup required system packages
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y krb5-multidev virtualenv
-      - name: Setup virtualenv and install cekit and required packages
-        run: |
-          mkdir ~/cekit${{ env.CEKIT_VERSION }}
-          virtualenv -p python3.6 ~/cekit${{ env.CEKIT_VERSION }}
-          . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          pip3 install cekit==${{ env.CEKIT_VERSION }} docker docker-squash odcs behave lxml
-      - name: Build
-        run: |
-          . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          cekit -v --descriptor ubi8-openjdk-8.yaml build docker
-          docker image ls
-      - name: install s2i binary
-        run: |
-          echo ===== Installing s2i from ${{ env.S2I_URL }} =====
-          mkdir /tmp/s2i/ && cd /tmp/s2i/
-          wget ${{ env.S2I_URI }}
-          tar xvf source-to-image*.gz
-          sudo mv s2i /usr/bin
-          which s2i
-          s2i version
-      - name: Behave Tests
-        run: |
-          . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          cekit -v --descriptor ubi8-openjdk-8.yaml test behave