diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4757bbed59..27d933cdc7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -81,10 +81,14 @@ jobs:
           BUILD_TAGS=()
           # Have tags for tracking builds during pull request
           SHA_SHORT="${GITHUB_SHA::7}"
-          COMMIT_TAGS+=("pr-${{ github.event.number }}-${MAJOR_VERSION}")
-          COMMIT_TAGS+=("${SHA_SHORT}-${MAJOR_VERSION}")
 
-          BUILD_TAGS=("${MAJOR_VERSION}" "${MAJOR_VERSION}-${TIMESTAMP}")
+          # Using clever bash string templating, https://stackoverflow.com/q/40771781
+          # don't make malformed tags if $MAJOR_VERSION is empty (base-image didn't include proper labels) --
+          COMMIT_TAGS+=("pr-${{ github.event.number }}${MAJOR_VERSION:+-$MAJOR_VERSION}")
+          COMMIT_TAGS+=("${SHA_SHORT}${MAJOR_VERSION:+-$MAJOR_VERSION}")
+
+          BUILD_TAGS=("${MAJOR_VERSION}" "${MAJOR_VERSION:+$MAJOR_VERSION-}${TIMESTAMP}")
+          # --
 
           BUILD_TAGS+=("${TIMESTAMP}")
           BUILD_TAGS+=("latest")
@@ -125,7 +129,7 @@ jobs:
         uses: ASzc/change-string-case-action@v5
         with:
           string: ${{ env.IMAGE_REGISTRY }}
-      
+
       - name: Lowercase Image
         id: image_case
         uses: ASzc/change-string-case-action@v5
@@ -176,7 +180,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       # Sign container
-      - uses: sigstore/cosign-installer@v3.1.1
+      - uses: sigstore/cosign-installer@v3.1.2
         if: github.event_name != 'pull_request' && github.ref == 'refs/heads/live'
 
       - name: Sign container image
diff --git a/Containerfile b/Containerfile
index c44b588761..4af34544a8 100644
--- a/Containerfile
+++ b/Containerfile
@@ -30,9 +30,6 @@ COPY usr /usr
 # Copy public key
 COPY cosign.pub /usr/share/ublue-os/cosign.pub
 
-# Copy base signing config
-COPY usr/etc/containers /usr/etc/
-
 # Copy greetd & systemd configs
 COPY etc /etc
 
diff --git a/README.md b/README.md
index f666b731e5..3d106ee7e2 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ For more info, check out the [uBlue homepage](https://universal-blue.org/) and t
 
 ## Getting started
 
-See the [Make Your Own -page in the documentation](https://universal-blue.org/tinker/make-your-own/) for quick setup instructions for setting up your own repository based on this template.
+See the [Make Your Own-page in the documentation](https://universal-blue.org/tinker/make-your-own/) for quick setup instructions for setting up your own repository based on this template.
 
 Don't worry, it only requires some basic knowledge about using the terminal and git.
 
@@ -155,4 +155,5 @@ After doing that, you'll be able to run the following commands:
 - `just nix-me-up` - Install Nix with dnkmmr69420's Nix Silverblue install script
 - `just update` - Update rpm-ostree, flatpaks, and distroboxes in one command
 
-Check the [just website](https://just.systems) for tips on modifying and adding your own recipes.
\ No newline at end of file
+Check the [just website](https://just.systems) for tips on modifying and adding your own recipes.
+