diff --git a/.github/workflows/docker-common.yml b/.github/workflows/docker-common.yml
index b0e8b6a9e..d0f3d913c 100644
--- a/.github/workflows/docker-common.yml
+++ b/.github/workflows/docker-common.yml
@@ -14,7 +14,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ["16-bullseye", "18-bullseye"]
+        NODE_VERSION: ["18"]
+        SUPERVISOR: ['', '.s6']
     steps:
       - name: Check out the repo
         uses: actions/checkout@v2
@@ -41,13 +42,13 @@ jobs:
       - name: Build and push Docker image (scrypted-common)
         uses: docker/build-push-action@v2
         with:
-          build-args: BASE=${{ matrix.node }}
+          build-args: NODE_VERSION=${{ matrix.NODE_VERSION }}
           context: docker/
-          file: docker/Dockerfile.common
+          file: docker/Dockerfile.common${{ matrix.SUPERVISOR }}
           platforms: linux/amd64,linux/arm64,linux/armhf
           push: true
           tags: |
-            koush/scrypted-common:${{ matrix.node }}
-            ${{ matrix.node == '16-bullseye' && 'koush/scrypted-common:latest' || '' }}
+            koush/scrypted-common:${{ matrix.NODE_VERSION }}${{ matrix.SUPERVISOR }}
+#            ${{ matrix.NODE_VERSION == '16-bullseye' && 'koush/scrypted-common:latest' || '' }}
           cache-from: type=gha
           cache-to: type=gha,mode=max