diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 909fac15..e29f83af 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -132,16 +132,18 @@ jobs:
           platforms: ${{ matrix.platforms }}
           push: true
           tags: bpatrik/pigallery2:experimental-${{ matrix.container }}
-      - name: Push nightly on new master commit
+      - name: Push edge on new master commit
         # github.ref:  branches the format is refs/heads/<branch_name>  PRs and Tags are different
-        if: ${{github.ref == 'refs/heads/master' }} 
+        if: ${{github.ref == 'refs/heads/master' }}
         uses: docker/build-push-action@v3
         with:
           context: .
           file: docker/${{ matrix.container }}/Dockerfile.build
           platforms: ${{ matrix.platforms }}
           push: true
-          tags: bpatrik/pigallery2:nightly-${{ matrix.container }}
+          tags: |
+            bpatrik/pigallery2:edge-${{ matrix.container }}
+            bpatrik/pigallery2:nightly-${{ matrix.container }}
       - name: Push release on new Tag
         if: ${{ startsWith(github.ref_type , 'tag') &&  !github.event.issue.pull_request &&  matrix.container != 'debian-bullseye'}}
         uses: docker/build-push-action@v3
@@ -151,7 +153,7 @@ jobs:
           platforms: ${{ matrix.platforms }}
           push: true
           tags: |
-            bpatrik/pigallery2:nightly-${{ matrix.container }}
+            bpatrik/pigallery2:edge-${{ matrix.container }}
             bpatrik/pigallery2:${{ github.ref_name }}-${{ matrix.container }}
             bpatrik/pigallery2:latest-${{ matrix.container }}
       - name: Push latest on new Tag
@@ -163,7 +165,7 @@ jobs:
           platforms: ${{ matrix.platforms }}
           push: true
           tags: |
-            bpatrik/pigallery2:nightly-${{ matrix.container }}
+            bpatrik/pigallery2:edge-${{ matrix.container }}
             bpatrik/pigallery2:${{ github.ref_name }}-${{ matrix.container }}
             bpatrik/pigallery2:latest-${{ matrix.container }}
             bpatrik/pigallery2:${{ github.ref_name }}
diff --git a/docker/README.md b/docker/README.md
index 4654b865..7b02ec0c 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -4,7 +4,8 @@ You can use [docker](https://docs.docker.com/install/) to run PiGallery2. See al
 available tags:
  - `v*` (stable): built from the release with the same version name.
  - `latest` (stable): same as the latest `v*`, built with debian buster
- - `nightly` : built from the current state of `master`. This might break from time to time. 
+ - `edge` : built from the current state of `master`. This might break from time to time.
+ - `nightly` : Deprecated. Rename to `edge`. See #708. 
 
 **Note**: Some changes may require database reset or config changes, see [#317](https://github.com/bpatrik/pigallery2/issues/317) (If you want to reduce the frequency of those, use stable builds (`latest`)
 
diff --git a/package-lock.json b/package-lock.json
index 418e4dc3..1dcd9354 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "pigallery2",
-  "version": "1.9.6-nightly",
+  "version": "1.9.6-edge",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/src/frontend/app/ui/frame/frame.component.html b/src/frontend/app/ui/frame/frame.component.html
index 557a7d1c..f655a21e 100644
--- a/src/frontend/app/ui/frame/frame.component.html
+++ b/src/frontend/app/ui/frame/frame.component.html
@@ -1,4 +1,8 @@
 <ngx-loading-bar [includeSpinner]="false" color="#337ab7" height="3px"></ngx-loading-bar>
+<div class="alert alert-danger" role="alert">
+  You are using the :nightly docker tag. nightly is renamed to :edge and discontinued.
+  <a href="https://github.com/bpatrik/pigallery2/issues/708">See #708</a>.
+</div>
 <div #navContainer class="navbar-container auto-hide-navbar"
      [class.navbar-keep-top]="navbarKeepTop || fixNavbarOnTop"
      [class.hide-navbar]="!navbarKeepTop && shouldHideNavbar"