diff --git a/.github/workflows/app-builder.yaml b/.github/workflows/app-builder.yaml
index 3bcbfd00d..0f84153b6 100644
--- a/.github/workflows/app-builder.yaml
+++ b/.github/workflows/app-builder.yaml
@@ -113,10 +113,11 @@ jobs:
         id: bake
         with:
           files: |
-            ./docker-bake.hcl
+            ./apps/${{ inputs.app }}/docker-bake.hcl
             cwd://${{ runner.temp }}/docker-metadata-action-bake.json
           set: |
             *.args.VENDOR=${{ github.repository_owner }}
+            *.context=./apps/${{ inputs.app }}
             *.cache-from=${{ format('type=registry,ref=ghcr.io/{0}/build_cache:{1}-{2},mode=max', github.repository_owner, inputs.app, steps.target.outputs.arch) }}
             *.cache-to=${{ inputs.release && format('type=registry,ref=ghcr.io/{0}/build_cache:{1}-{2},mode=max,compression=zstd,force-compression=true', github.repository_owner, inputs.app, steps.target.outputs.arch) || '' }}
             *.labels.org.opencontainers.image.title=${{ inputs.app }}
@@ -127,9 +128,7 @@ jobs:
             ${{ inputs.release && format('*.output=type=image,name=ghcr.io/{0}/{1},push-by-digest=true,name-canonical=true,push=true', github.repository_owner, inputs.app) || '*.output=type=docker' }}
             *.platform=${{ matrix.platform }}
             *.tags=
-          source: .
           targets: image
-          workdir: ./apps/${{ inputs.app }}
 
       - if: ${{ ! inputs.release }}
         name: Run Application Tests
diff --git a/apps/komodo-periphery/Dockerfile b/apps/komodo-periphery/Dockerfile
index 7915a7bee..3c91514ba 100644
--- a/apps/komodo-periphery/Dockerfile
+++ b/apps/komodo-periphery/Dockerfile
@@ -15,6 +15,6 @@ RUN apk add --no-cache curl unzip tar \
 
 FROM ghcr.io/moghtech/komodo-periphery:${VERSION}
 USER root
-RUN addgroup --system --gid 2000 komodo && adduser --system --uid 2000 --home /app --ingroup komodo komodo && chown -R 2000:2000 /app
+RUN addgroup --system --gid 2000 komodo && adduser --system --uid 2000 --home /app --ingroup komodo komodo && mkdir -p /config && chown -R 2000:2000 /app /config
 COPY --from=builder --chown=2000:2000 --chmod=755 /op /usr/local/bin/op
 COPY --from=builder --chown=2000:2000 --chmod=755 /fnox /usr/local/bin/fnox
diff --git a/apps/komodo-periphery/docker-bake.hcl b/apps/komodo-periphery/docker-bake.hcl
index 91ded1f4e..103fef861 100644
--- a/apps/komodo-periphery/docker-bake.hcl
+++ b/apps/komodo-periphery/docker-bake.hcl
@@ -2,7 +2,7 @@ target "docker-metadata-action" {}
 
 variable "VERSION" {
   // renovate: datasource=github-releases depName=moghtech/komodo versioning=loose
-  default = "1.19.5"
+  default = "2.1.1"
 }
 
 group "default" {
diff --git a/apps/komodo-periphery/tests.yaml b/apps/komodo-periphery/tests.yaml
index 410f4a287..a5eb77474 100644
--- a/apps/komodo-periphery/tests.yaml
+++ b/apps/komodo-periphery/tests.yaml
@@ -1,11 +1,21 @@
 ---
-# yaml-language-server: $schema=https://raw.githubusercontent.com/goss-org/goss/master/docs/schema.yaml
-process:
-  EmbyServer:
-    running: true
-port:
-  tcp6:8096:
-    listening: true
-http:
-  http://localhost:8096:
-    status: 200
+# yaml-language-server: $schema=https://raw.githubusercontent.com/GoogleContainerTools/container-structure-test/master/schema.json
+schemaVersion: "2.0.0"
+fileExistenceTests:
+  - name: 1Password CLI
+    path: /usr/local/bin/op
+    shouldExist: true
+    permissions: "-rwxr-xr-x"
+    uid: 2000
+    gid: 2000
+  - name: fnox
+    path: /usr/local/bin/fnox
+    shouldExist: true
+    permissions: "-rwxr-xr-x"
+    uid: 2000
+    gid: 2000
+commandTests:
+  - name: op version
+    command: op
+    args: ["--version"]
+    exitCode: 0
diff --git a/apps/komodo/Dockerfile b/apps/komodo/Dockerfile
index a88b6d512..9a6f53858 100644
--- a/apps/komodo/Dockerfile
+++ b/apps/komodo/Dockerfile
@@ -13,6 +13,6 @@ RUN apk add --no-cache curl \
 
 FROM ghcr.io/moghtech/komodo-core:${VERSION}
 USER root
-RUN addgroup --system --gid 2000 komodo && adduser --system --uid 2000 --home /app --ingroup komodo komodo && chown -R 2000:2000 /app
+RUN addgroup --system --gid 2000 komodo && adduser --system --uid 2000 --home /app --ingroup komodo komodo && mkdir -p /config && chown -R 2000:2000 /app /config
 COPY --from=builder --chown=2000:2000 --chmod=755 /op /usr/local/bin/op
 USER 2000:2000
diff --git a/apps/komodo/docker-bake.hcl b/apps/komodo/docker-bake.hcl
index 91ded1f4e..103fef861 100644
--- a/apps/komodo/docker-bake.hcl
+++ b/apps/komodo/docker-bake.hcl
@@ -2,7 +2,7 @@ target "docker-metadata-action" {}
 
 variable "VERSION" {
   // renovate: datasource=github-releases depName=moghtech/komodo versioning=loose
-  default = "1.19.5"
+  default = "2.1.1"
 }
 
 group "default" {
diff --git a/apps/komodo/tests.yaml b/apps/komodo/tests.yaml
index 410f4a287..6608ffb6c 100644
--- a/apps/komodo/tests.yaml
+++ b/apps/komodo/tests.yaml
@@ -1,11 +1,15 @@
 ---
-# yaml-language-server: $schema=https://raw.githubusercontent.com/goss-org/goss/master/docs/schema.yaml
-process:
-  EmbyServer:
-    running: true
-port:
-  tcp6:8096:
-    listening: true
-http:
-  http://localhost:8096:
-    status: 200
+# yaml-language-server: $schema=https://raw.githubusercontent.com/GoogleContainerTools/container-structure-test/master/schema.json
+schemaVersion: "2.0.0"
+fileExistenceTests:
+  - name: 1Password CLI
+    path: /usr/local/bin/op
+    shouldExist: true
+    permissions: "-rwxr-xr-x"
+    uid: 2000
+    gid: 2000
+commandTests:
+  - name: op version
+    command: op
+    args: ["--version"]
+    exitCode: 0