diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 34cabaf4..0a5358db 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -66,7 +66,11 @@ jobs:
           echo "os: ubuntu" >goss_vars_${GH_RUNNER_IMAGE}.yaml
           echo "oscodename: ${{ matrix.release }}" >>goss_vars_${GH_RUNNER_IMAGE}.yaml
           echo "arch: ${{ matrix.platform }}" >>goss_vars_${GH_RUNNER_IMAGE}.yaml
+          # test the base
           GOSS_VARS=goss_vars_${GH_RUNNER_IMAGE}.yaml GOSS_FILE=goss_base.yaml GOSS_SLEEP=1 dgoss run --entrypoint /usr/bin/sleep -e RUNNER_NAME=test -e DEBUG_ONLY=true ${GH_RUNNER_IMAGE} 10
+          # test the final image but with all defaults
+          GOSS_VARS=goss_vars_${GH_RUNNER_IMAGE}.yaml GOSS_FILE=goss_full_defaults.yaml GOSS_SLEEP=1 dgoss run --entrypoint /usr/bin/sleep -e RUNNER_NAME=test -e DEBUG_ONLY=true ${GH_RUNNER_IMAGE} 10
+          # test the final image but with non-default values
           GOSS_VARS=goss_vars_${GH_RUNNER_IMAGE}.yaml GOSS_FILE=goss_full.yaml GOSS_SLEEP=1 dgoss run --entrypoint /usr/bin/sleep \
           -e DEBUG_ONLY=true \
           -e RUNNER_NAME=huzzah \
@@ -141,7 +145,11 @@ jobs:
           echo "os: debian" >goss_vars_${GH_RUNNER_IMAGE}.yaml
           echo "oscodename: ${{ matrix.release }}" >>goss_vars_${GH_RUNNER_IMAGE}.yaml
           echo "arch: ${{ matrix.platform }}" >>goss_vars_${GH_RUNNER_IMAGE}.yaml
+          # test the base
           GOSS_VARS=goss_vars_${GH_RUNNER_IMAGE}.yaml GOSS_FILE=goss_base.yaml GOSS_SLEEP=1 dgoss run --entrypoint /usr/bin/sleep -e RUNNER_NAME=test -e DEBUG_ONLY=true ${GH_RUNNER_IMAGE} 10
+          # test the final image but with all defaults
+          GOSS_VARS=goss_vars_${GH_RUNNER_IMAGE}.yaml GOSS_FILE=goss_full_defaults.yaml GOSS_SLEEP=1 dgoss run --entrypoint /usr/bin/sleep -e RUNNER_NAME=test -e DEBUG_ONLY=true ${GH_RUNNER_IMAGE} 10
+          # test the final image but with non-default values
           GOSS_VARS=goss_vars_${GH_RUNNER_IMAGE}.yaml GOSS_FILE=goss_full.yaml GOSS_SLEEP=1 dgoss run --entrypoint /usr/bin/sleep \
           -e DEBUG_ONLY=true \
           -e RUNNER_NAME=huzzah \
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 49f50a42..c86bd402 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -69,7 +69,11 @@ jobs:
           echo "os: ubuntu" >goss_vars_${GH_RUNNER_IMAGE}.yaml
           echo "oscodename: ${{ matrix.release }}" >>goss_vars_${GH_RUNNER_IMAGE}.yaml
           echo "arch: ${{ matrix.platform }}" >>goss_vars_${GH_RUNNER_IMAGE}.yaml
+          # test the base
           GOSS_VARS=goss_vars_${GH_RUNNER_IMAGE}.yaml GOSS_FILE=goss_base.yaml GOSS_SLEEP=1 dgoss run --entrypoint /usr/bin/sleep -e RUNNER_NAME=test -e DEBUG_ONLY=true ${GH_RUNNER_IMAGE} 10
+          # test the final image but with all defaults
+          GOSS_VARS=goss_vars_${GH_RUNNER_IMAGE}.yaml GOSS_FILE=goss_full_defaults.yaml GOSS_SLEEP=1 dgoss run --entrypoint /usr/bin/sleep -e RUNNER_NAME=test -e DEBUG_ONLY=true ${GH_RUNNER_IMAGE} 10
+          # test the final image but with non-default values
           GOSS_VARS=goss_vars_${GH_RUNNER_IMAGE}.yaml GOSS_FILE=goss_full.yaml GOSS_SLEEP=1 dgoss run --entrypoint /usr/bin/sleep \
           -e DEBUG_ONLY=true \
           -e RUNNER_NAME=huzzah \
@@ -148,7 +152,11 @@ jobs:
           echo "os: debian" >goss_vars_${GH_RUNNER_IMAGE}.yaml
           echo "oscodename: ${{ matrix.release }}" >>goss_vars_${GH_RUNNER_IMAGE}.yaml
           echo "arch: ${{ matrix.platform }}" >>goss_vars_${GH_RUNNER_IMAGE}.yaml
+          # test the base
           GOSS_VARS=goss_vars_${GH_RUNNER_IMAGE}.yaml GOSS_FILE=goss_base.yaml GOSS_SLEEP=1 dgoss run --entrypoint /usr/bin/sleep -e RUNNER_NAME=test -e DEBUG_ONLY=true ${GH_RUNNER_IMAGE} 10
+          # test the final image but with all defaults
+          GOSS_VARS=goss_vars_${GH_RUNNER_IMAGE}.yaml GOSS_FILE=goss_full_defaults.yaml GOSS_SLEEP=1 dgoss run --entrypoint /usr/bin/sleep -e RUNNER_NAME=test -e DEBUG_ONLY=true ${GH_RUNNER_IMAGE} 10
+          # test the final image but with non-default values
           GOSS_VARS=goss_vars_${GH_RUNNER_IMAGE}.yaml GOSS_FILE=goss_full.yaml GOSS_SLEEP=1 dgoss run --entrypoint /usr/bin/sleep \
           -e DEBUG_ONLY=true \
           -e RUNNER_NAME=huzzah \
diff --git a/goss_base.yaml b/goss_base.yaml
index 7d3f4b7b..ec70b938 100644
--- a/goss_base.yaml
+++ b/goss_base.yaml
@@ -87,23 +87,3 @@ group:
     runner:
         exists: true
         gid: 121
-command:
-    /entrypoint.sh something:
-        exit-status: 0
-        stdout:
-            - REPO_URL required for repo runners
-            - Runner reusage is disabled
-            - ""
-            - 'Disable automatic registration: false'
-            - 'Random runner suffix: true'
-            - 'Runner name: test'
-            - 'Runner workdir: /_work/test'
-            - 'Labels: default'
-            - 'Runner Group: Default'
-            - 'Github Host: github.com'
-            - Run as root:true
-            - 'Start docker: false'
-            - Running something
-            - ""
-        stderr: ""
-        timeout: 2000
diff --git a/goss_full_defaults.yaml b/goss_full_defaults.yaml
new file mode 100644
index 00000000..ad3c87f4
--- /dev/null
+++ b/goss_full_defaults.yaml
@@ -0,0 +1,20 @@
+command:
+    /entrypoint.sh something:
+        exit-status: 0
+        stdout:
+            - REPO_URL required for repo runners
+            - Runner reusage is disabled
+            - ""
+            - 'Disable automatic registration: false'
+            - 'Random runner suffix: true'
+            - 'Runner name: test'
+            - 'Runner workdir: /_work/test'
+            - 'Labels: default'
+            - 'Runner Group: Default'
+            - 'Github Host: github.com'
+            - Run as root:true
+            - 'Start docker: false'
+            - Running something
+            - ""
+        stderr: ""
+        timeout: 2000