diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 65817d57..e45e1dfc 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -37,15 +37,15 @@ jobs:
         run: |
           ARCHITECTURE=${{ matrix.architecture }}
           echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
-          echo ::set-output name=title::${GITHUB_REPOSITORY,,}:${GITHUB_REF//refs\/heads\//}
+          echo ::set-output name=title::${GITHUB_REPOSITORY,,}:${{ github.ref_name }}
           echo ::set-output name=revision::${GITHUB_SHA}
-          echo ::set-output name=source::${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY,,}/tree/${GITHUB_REF//refs\/heads\//}
+          echo ::set-output name=source::${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY,,}/tree/${{ github.ref_name }}
           echo ::set-output name=vendor::${{ github.repository_owner }}
           echo ::set-output name=url::${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY,,}/blob/master/README.md
           echo ::set-output name=VERSION::${{ github.event.release.tag_name }}
           echo ::set-output name=platform::${ARCHITECTURE//-/\/}
-          echo ::set-output name=cache::${GITHUB_REPOSITORY,,}:${GITHUB_REF//refs\/heads\//}-cache-${{ matrix.architecture }}
-          echo ::set-output name=tag::${GITHUB_REPOSITORY,,}:${GITHUB_REF//refs\/heads\//}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER}-${{ matrix.architecture }}
+          echo ::set-output name=cache::${GITHUB_REPOSITORY,,}:${{ github.ref_name }}-cache-${{ matrix.architecture }}
+          echo ::set-output name=tag::${GITHUB_REPOSITORY,,}:${{ github.ref_name }}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER}-${{ matrix.architecture }}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -122,7 +122,7 @@ jobs:
           DOCKER_CLI_EXPERIMENTAL: enabled
         run: |
           IMAGE=${{ matrix.registry }}/${GITHUB_REPOSITORY,,}
-          TAG=${GITHUB_REF//refs\/heads\//}
+          TAG=${{ github.ref_name }}
           SOURCE=${IMAGE}:${TAG}-${GITHUB_SHA:0:7}-${GITHUB_RUN_NUMBER}
           VERSION=${{ steps.prep.outputs.VERSION }}
           [[ -f linux-amd64.Dockerfile ]]  && AMD64=${SOURCE}-linux-amd64
diff --git a/resources/landing-page/css/custom.css b/resources/landing-page/css/custom.css
index a2f04186..26b2a5c8 100644
--- a/resources/landing-page/css/custom.css
+++ b/resources/landing-page/css/custom.css
@@ -66,11 +66,10 @@ section {
 
 /* slightly transparent fallback for Firefox (not supporting backdrop-filter) */
 @supports not ((-webkit-backdrop-filter: none) or (backdrop-filter: none)) {
-
     #mainNav,
     #mainNav.navbar-scrolled {
         box-shadow: none;
-        background-color: rgba(0, 0, 0, 0.9);
+        background-color: rgba(var(--accent-color), 1);
     }
 }
 #mainNav .navbar-nav .nav-item .nav-link {
@@ -83,6 +82,11 @@ section {
     opacity: .8;
 }
 @media (min-width: 992px) {
+    @supports not ((-webkit-backdrop-filter: none) or (backdrop-filter: none)) {
+        #mainNav {
+            background-color: rgba(var(--accent-color), 0.95) !important;
+        }
+    }
     #mainNav {
         box-shadow: none;
         background-color: rgba(var(--accent-color), 0.25);