diff --git a/.github/workflows/fluffy_nightly_docker.yml b/.github/workflows/fluffy_nightly_docker.yml
index 9bd484cef..5ebe69915 100644
--- a/.github/workflows/fluffy_nightly_docker.yml
+++ b/.github/workflows/fluffy_nightly_docker.yml
@@ -1,7 +1,7 @@
 name: Fluffy nightly Docker build
 on:
   schedule:
-    - cron: "30 3 * * *"
+    - cron: "30 10 * * *"
   workflow_dispatch:
 
 jobs:
@@ -20,8 +20,6 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push a nightly Docker image
         run: |
-          REFNAME="${{ github.ref }}"
-          TAG="${REFNAME#refs/tags/}"
-          DOCKER_BUILDKIT=1 docker build -f ./fluffy/tools/docker/Dockerfile -t statusim/fluffy:amd64-${TAG} -t statusim/fluffy:amd64-latest .
-          docker push statusim/fluffy:amd64-${TAG}
-          docker push statusim/fluffy:amd64-latest
+          REFNAME="${{ github.ref_name }}"
+          DOCKER_BUILDKIT=1 docker build -f ./fluffy/tools/docker/Dockerfile -t statusim/fluffy:amd64-${REFNAME}-latest .
+          docker push statusim/fluffy:amd64-${REFNAME}-latest